sipwise
/
kamailio
mirror of https://github.com/sipwise/kamailio.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#57799 refresh patches

Browse Source 
Change-Id: I6f0c72125349812f1b99f59b1af7bacf3cc44bc0
mr12.0
Victor Seva 3 years ago
parent 9fc5c3ffb6
commit 0bde18bd0d
11 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File

2
debian/patches/debian/fix_export.patch vendored
Unescape View File

@ -7,7 +7,7 @@ Subject: fix_export
1 file changed, 2 insertions(+)
diff --git a/src/Makefile b/src/Makefile
index c2ce846..f1e1e0b 100644
index 7c78f6c..eb1a8c6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -139,6 +139,8 @@ endif

2
debian/patches/debian/no_INSTALL_file.patch vendored
Unescape View File

@ -7,7 +7,7 @@ Subject: no_INSTALL_file
1 file changed, 2 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 46847d0..c2ce846 100644
index 6c2b35b..7c78f6c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -858,8 +858,6 @@ install-modules-all: install-every-module install-every-module-doc

2
debian/patches/debian/no_lib64_on_64_bits.patch vendored
Unescape View File

@ -7,7 +7,7 @@ Subject: no_lib64_on_64_bits
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/Makefile.defs b/src/Makefile.defs
index da88735..be5e1a0 100644
index 4ff899c..3dcb470 100644
--- a/src/Makefile.defs
+++ b/src/Makefile.defs
@@ -458,15 +458,7 @@ endif

2
debian/patches/sipwise/add_lcr_rate_module.patch vendored
Unescape View File

@ -13,7 +13,7 @@ Subject: add_lcr_rate_module
create mode 100644 src/modules/lcr_rate/lcr_rate_mod.c
diff --git a/src/Makefile.groups b/src/Makefile.groups
index 7c426dd..69246a4 100644
index 15fec0d..87e624a 100644
--- a/src/Makefile.groups
+++ b/src/Makefile.groups
@@ -112,6 +112,9 @@ mod_list_sctp=sctp

2
debian/patches/sipwise/add_pcem_module.patch vendored
Unescape View File

@ -17,7 +17,7 @@ Subject: add_pcem_module
create mode 100644 src/modules/pcem/pcem_mod.h
diff --git a/src/Makefile.groups b/src/Makefile.groups
index e70dedb..7c426dd 100644
index 7d05dc1..15fec0d 100644
--- a/src/Makefile.groups
+++ b/src/Makefile.groups
@@ -30,8 +30,8 @@ mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

2
debian/patches/sipwise/add_presence_dfks_module.patch vendored
Unescape View File

@ -22,7 +22,7 @@ Subject: add_presence_dfks_module
create mode 100644 src/modules/presence_dfks/presence_dfks.h
diff --git a/src/Makefile.groups b/src/Makefile.groups
index 640e3fd..0a8d500 100644
index 4aee35f..ec0d8ac 100644
--- a/src/Makefile.groups
+++ b/src/Makefile.groups
@@ -121,7 +121,7 @@ mod_list_presence=presence presence_conference presence_dialoginfo \

2
debian/patches/sipwise/add_tcap_module.patch vendored
Unescape View File

@ -11,7 +11,7 @@ Subject: add_tcap_module
create mode 100644 src/modules/tcap/tcap_mod.c
diff --git a/src/Makefile.groups b/src/Makefile.groups
index 69246a4..640e3fd 100644
index 87e624a..4aee35f 100644
--- a/src/Makefile.groups
+++ b/src/Makefile.groups
@@ -217,6 +217,9 @@ mod_list_erlang=erlang

18
debian/patches/sipwise/cfgt-route-log.patch vendored
Unescape View File

@ -10,7 +10,7 @@ Subject: cfgt: route log
4 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c
index 683b39f..9470783 100644
index ed29d29..21433a3 100644
--- a/src/modules/cfgt/cfgt_int.c
+++ b/src/modules/cfgt/cfgt_int.c
@@ -1,6 +1,6 @@
@ -37,7 +37,7 @@ index 683b39f..9470783 100644
int not_sip = 0;
int _cfgt_get_filename(int msgid, str uuid, str *dest, int *dir);
@@ -462,6 +464,7 @@ int _cfgt_set_dump(struct sip_msg *msg, cfgt_node_p node, str *flow)
@@ -463,6 +465,7 @@ int _cfgt_set_dump(struct sip_msg *msg, cfgt_node_p node, str *flow)
{
int len;
char v;
@ -45,7 +45,7 @@ index 683b39f..9470783 100644
srjson_t *f, *vars;
if(node == NULL || flow == NULL)
@@ -493,6 +496,17 @@ int _cfgt_set_dump(struct sip_msg *msg, cfgt_node_p node, str *flow)
@@ -494,6 +497,17 @@ int _cfgt_set_dump(struct sip_msg *msg, cfgt_node_p node, str *flow)
return -1;
}
@ -63,7 +63,7 @@ index 683b39f..9470783 100644
f = srjson_CreateObject(&node->jdoc);
if(f == NULL) {
LM_ERR("cannot create json object\n");
@@ -505,6 +519,21 @@ int _cfgt_set_dump(struct sip_msg *msg, cfgt_node_p node, str *flow)
@@ -506,6 +520,21 @@ int _cfgt_set_dump(struct sip_msg *msg, cfgt_node_p node, str *flow)
return 0;
}
@ -85,7 +85,7 @@ index 683b39f..9470783 100644
void _cfgt_set_type(cfgt_str_list_p route, struct action *a)
{
switch(a->type) {
@@ -520,6 +549,8 @@ void _cfgt_set_type(cfgt_str_list_p route, struct action *a)
@@ -521,6 +550,8 @@ void _cfgt_set_type(cfgt_str_list_p route, struct action *a)
route->type = CFGT_DROP_E;
LM_DBG("set[%.*s]->CFGT_DROP_E\n", route->s.len, route->s.s);
}
@ -94,7 +94,7 @@ index 683b39f..9470783 100644
break;
case ROUTE_T:
route->type = CFGT_ROUTE;
@@ -534,6 +565,8 @@ void _cfgt_set_type(cfgt_str_list_p route, struct action *a)
@@ -535,6 +566,8 @@ void _cfgt_set_type(cfgt_str_list_p route, struct action *a)
LM_DBG("[%.*s] already set to CFGT_DROP_E[%d]\n", route->s.len,
route->s.s, a->type);
}
@ -103,7 +103,7 @@ index 683b39f..9470783 100644
break;
}
}
@@ -553,6 +586,7 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename)
@@ -554,6 +587,7 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename)
memset(node->route, 0, sizeof(cfgt_str_list_t));
node->flow_head = node->route;
node->route->type = CFGT_ROUTE;
@ -111,7 +111,7 @@ index 683b39f..9470783 100644
ret = 1;
} else {
LM_DBG("actual routename:[%.*s][%d]\n", node->route->s.len,
@@ -600,6 +634,7 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename)
@@ -601,6 +635,7 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename)
route->prev = node->route;
node->route->next = route;
node->route = route;
@ -119,7 +119,7 @@ index 683b39f..9470783 100644
_cfgt_set_type(node->route, a);
}
node->route->s.s = routename->s;
@@ -617,6 +652,8 @@ void _cfgt_del_routename(cfgt_node_p node)
@@ -618,6 +653,8 @@ void _cfgt_del_routename(cfgt_node_p node)
}
LM_DBG("del route[%.*s]\n", node->route->s.len, node->route->s.s);
node->route = node->route->prev;

8
debian/patches/sipwise/cfgt-skip_duplicate_dump.patch vendored
Unescape View File

@ -7,7 +7,7 @@ Subject: cfgt: don't dump same node
1 file changed, 40 insertions(+), 1 deletion(-)
diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c
index 4eda949..683b39f 100644
index 6314878..ed29d29 100644
--- a/src/modules/cfgt/cfgt_int.c
+++ b/src/modules/cfgt/cfgt_int.c
@@ -32,6 +32,7 @@
@ -18,7 +18,7 @@ index 4eda949..683b39f 100644
#include "cfgt_int.h"
#include "cfgt_json.h"
@@ -459,11 +460,25 @@ void _cfgt_print_node(cfgt_node_p node, int json)
@@ -460,11 +461,25 @@ void _cfgt_print_node(cfgt_node_p node, int json)
int _cfgt_set_dump(struct sip_msg *msg, cfgt_node_p node, str *flow)
{
@ -44,7 +44,7 @@ index 4eda949..683b39f 100644
vars = srjson_CreateObject(&node->jdoc);
if(vars == NULL) {
LM_ERR("cannot create json object\n");
@@ -762,11 +777,35 @@ int cfgt_msgin(sr_event_param_t *evp)
@@ -763,11 +778,35 @@ int cfgt_msgin(sr_event_param_t *evp)
return -1;
}
@ -80,7 +80,7 @@ index 4eda949..683b39f 100644
if(_cfgt_node) {
if(_cfgt_node->msgid == 0) {
LM_DBG("new node\n");
@@ -811,7 +850,7 @@ int cfgt_pre(struct sip_msg *msg, unsigned int flags, void *bar)
@@ -812,7 +851,7 @@ int cfgt_pre(struct sip_msg *msg, unsigned int flags, void *bar)
int cfgt_post(struct sip_msg *msg, unsigned int flags, void *bar)
{
str flowname = STR_NULL;

10
debian/patches/sipwise/cfgt-skip_unknown.patch vendored
Unescape View File

@ -9,7 +9,7 @@ Subject: cfgt: skip_unknown
3 files changed, 36 insertions(+)
diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c
index 489fdfe..4eda949 100644
index f484f02..6314878 100644
--- a/src/modules/cfgt/cfgt_int.c
+++ b/src/modules/cfgt/cfgt_int.c
@@ -43,6 +43,7 @@ cfgt_hash_p _cfgt_uuid = NULL;
@ -20,7 +20,7 @@ index 489fdfe..4eda949 100644
int not_sip = 0;
int _cfgt_get_filename(int msgid, str uuid, str *dest, int *dir);
@@ -384,6 +385,10 @@ void cfgt_save_node(cfgt_node_p node)
@@ -385,6 +386,10 @@ void cfgt_save_node(cfgt_node_p node)
str dest = STR_NULL;
int dir = 0;
struct stat sb;
@ -31,7 +31,7 @@ index 489fdfe..4eda949 100644
if(_cfgt_get_filename(node->msgid, node->uuid, &dest, &dir) < 0) {
LM_ERR("can't build filename\n");
return;
@@ -657,6 +662,9 @@ int cfgt_process_route(struct sip_msg *msg, struct action *a)
@@ -658,6 +663,9 @@ int cfgt_process_route(struct sip_msg *msg, struct action *a)
LM_ERR("node empty\n");
return -1;
}
@ -41,7 +41,7 @@ index 489fdfe..4eda949 100644
if(a->rname == NULL) {
LM_DBG("no routename. type:%d\n", a->type);
return 0;
@@ -805,6 +813,9 @@ int cfgt_post(struct sip_msg *msg, unsigned int flags, void *bar)
@@ -806,6 +814,9 @@ int cfgt_post(struct sip_msg *msg, unsigned int flags, void *bar)
str flowname = STR_NULL;
if(_cfgt_node) {
@ -51,7 +51,7 @@ index 489fdfe..4eda949 100644
LM_DBG("dump last flow\n");
if(_cfgt_node->route == NULL
&& strncmp(_cfgt_node->uuid.s, "unknown", 7) == 0)
@@ -843,6 +854,9 @@ int cfgt_msgout(sr_event_param_t *evp)
@@ -844,6 +855,9 @@ int cfgt_msgout(sr_event_param_t *evp)
}
if(_cfgt_node) {

2
debian/patches/sipwise/do-not-install-default-config.patch vendored
Unescape View File

@ -8,7 +8,7 @@ Subject: do-not-install-default-config
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index f1e1e0b..f0435b8 100644
index eb1a8c6..9cbc353 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -649,7 +649,7 @@ sunpkg:

Write Preview
Loading…
Cancel
Save