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

TT#18950 refresh patches

Browse Source 
> dpkg-source: info: applying upstream/dialog-check-if-dialog-exists-after-event-route-exec.patch
> patching file modules/dialog/dlg_handlers.c
> Hunk #1 succeeded at 1179 (offset -47 lines).
> Hunk #2 succeeded at 1276 (offset -47 lines).
> Hunk #3 FAILED at 1368.
> 1 out of 3 hunks FAILED
> dpkg-source: info: the patch has fuzz which is not allowed, or is malformed
> dpkg-source: info: if patch 'upstream/dialog-check-if-dialog-exists-after-event-route-exec.patch' is correctly applied by quilt, use 'quilt refresh' to update it

Change-Id: I61458d08945784b7e38fff598fa5aa6cb2c879da
changes/30/14430/1
Victor Seva 8 years ago
parent a2ef263cd8
commit 2c01279113
7 changed files with 30 additions and 74 deletions
Show Stats Download Patch File Download Diff File

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

@ -3,8 +3,8 @@ Author: Victor Seva <linuxmaniac@torreviejawireless.org>
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -370,15 +370,7 @@ ARCH:=$(HOST_ARCH)
endif
@@ -378,15 +378,7 @@ endif
$(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>)
-LIBDIR ?=

14
debian/patches/sipwise/dialog-RPC-dlg.dlg_list-_ctx-make-from_tag-parameter.patch vendored
Unescape View File

@ -8,11 +8,9 @@ Change-Id: Ia1c37ce6d8c4cbb2644697d3e1f735a298efe54b
modules/dialog/doc/dialog_admin.xml | 8 +++++++-
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c
index 7d56cfc..b1715ad 100644
--- a/modules/dialog/dialog.c
+++ b/modules/dialog/dialog.c
@@ -1593,18 +1593,24 @@ static void internal_rpc_print_dlgs(rpc_t *rpc, void *c, int with_context)
@@ -1601,18 +1601,24 @@ static void internal_rpc_print_dlgs(rpc_
* \param with_context if 1 then the dialog context will be also printed
*/
static void internal_rpc_print_single_dlg(rpc_t *rpc, void *c, int with_context) {
@ -40,7 +38,7 @@ index 7d56cfc..b1715ad 100644
internal_rpc_print_dlg(rpc, c, dlg, with_context);
}
}
@@ -1695,10 +1701,10 @@ static const char *rpc_print_dlgs_ctx_doc[2] = {
@@ -1703,10 +1709,10 @@ static const char *rpc_print_dlgs_ctx_do
"Print all dialogs with associated context", 0
};
static const char *rpc_print_dlg_doc[2] = {
@ -53,11 +51,9 @@ index 7d56cfc..b1715ad 100644
};
static const char *rpc_end_dlg_entry_id_doc[2] = {
"End a given dialog based on [h_entry] [h_id]", 0
diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml
index e5ff763..af06c38 100644
--- a/modules/dialog/doc/dialog_admin.xml
+++ b/modules/dialog/doc/dialog_admin.xml
@@ -2358,7 +2358,7 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)");
@@ -2357,7 +2357,7 @@ dlg_remote_profile("add", "caller", "tes
<title><varname>dlg.dlg_list</varname></title>
<para>
Lists the description of one dialog. The dialog identifiers are to be passed
@ -66,7 +62,7 @@ index e5ff763..af06c38 100644
</para>
<para>Name: <emphasis>dlg.dlg_list</emphasis></para>
<para>Parameters:</para>
@@ -2375,6 +2375,9 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)");
@@ -2374,6 +2374,9 @@ dlg_remote_profile("add", "caller", "tes
<programlisting format="linespecific">
serctl dlg.list abcdrssfrs122444@192.168.1.1 AAdfeEFF33
</programlisting>
@ -76,7 +72,7 @@ index e5ff763..af06c38 100644
</section>
<section>
@@ -2391,6 +2394,9 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)");
@@ -2390,6 +2393,9 @@ dlg_remote_profile("add", "caller", "tes
<programlisting format="linespecific">
serctl dlg.list_ctx abcdrssfrs122444@192.168.1.1 AAdfeEFF33
</programlisting>

8
debian/patches/sipwise/rtpengine_next_branch_parm.patch vendored
Unescape View File

@ -17,7 +17,7 @@
static int fixup_set_id(void ** param, int param_no);
static int set_rtpengine_set_f(struct sip_msg * msg, char * str1, char * str2);
static struct rtpp_set * select_rtpp_set(int id_set);
@@ -2170,6 +2171,8 @@ static int parse_flags(struct ng_flags_p
@@ -2166,6 +2167,8 @@ static int parse_flags(struct ng_flags_p
ng_flags->via = 3;
else if (str_eq(&val, "extra"))
ng_flags->via = -1;
@ -26,7 +26,7 @@
else
goto error;
goto next;
@@ -2239,6 +2242,8 @@ static bencode_item_t *rtpp_function_cal
@@ -2235,6 +2238,8 @@ static bencode_item_t *rtpp_function_cal
struct rtpp_node *node;
char *cp;
pv_value_t pv_val;
@ -35,7 +35,7 @@
/*** get & init basic stuff needed ***/
@@ -2311,12 +2316,30 @@ static bencode_item_t *rtpp_function_cal
@@ -2307,12 +2312,30 @@ static bencode_item_t *rtpp_function_cal
bencode_dictionary_add_str(ng_flags.dict, "call-id", &callid);
if (ng_flags.via) {
@ -72,7 +72,7 @@
if (ret == -1 || viabranch.len == 0) {
LM_ERR("can't get Via branch/extra ID\n");
goto error;
@@ -3189,7 +3212,7 @@ rtpengine_answer1_f(struct sip_msg *msg,
@@ -3178,7 +3201,7 @@ rtpengine_answer1_f(struct sip_msg *msg,
}
static int

4
debian/patches/sipwise/sca-fix-core-when-release_appearance-RPC-command-par.patch vendored
Unescape View File

@ -20,11 +20,9 @@ Change-Id: Ied94a9872fa41ee5d6432380c549076da2fd6239
modules/sca/sca_rpc.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/modules/sca/sca_rpc.c b/modules/sca/sca_rpc.c
index 5e6873b..cac8465 100644
--- a/modules/sca/sca_rpc.c
+++ b/modules/sca/sca_rpc.c
@@ -482,6 +482,11 @@ sca_rpc_release_appearance( rpc_t *rpc, void *ctx )
@@ -487,6 +487,11 @@ sca_rpc_release_appearance( rpc_t *rpc,
return;
}

29
debian/patches/sipwise/tm-deep-cloning-of-the-request-for-fake-environment.patch vendored
Unescape View File

@ -10,8 +10,6 @@ Subject: [PATCH] tm: deep cloning of the request for fake environment
modules/tm/t_suspend.c | 24 ++++++-----
4 files changed, 86 insertions(+), 64 deletions(-)
diff --git a/modules/tm/t_append_branches.c b/modules/tm/t_append_branches.c
index f745e755d..96cd40f78 100644
--- a/modules/tm/t_append_branches.c
+++ b/modules/tm/t_append_branches.c
@@ -49,8 +49,9 @@
@ -99,8 +97,6 @@ index f745e755d..96cd40f78 100644
if (likely(replies_locked)) {
replies_locked = 0;
diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c
index cf56de701..c407ec9a7 100644
--- a/modules/tm/t_reply.c
+++ b/modules/tm/t_reply.c
@@ -70,6 +70,7 @@
@ -111,7 +107,7 @@ index cf56de701..c407ec9a7 100644
#include "../../sr_compat.h"
#include "../../receive.h"
#include "../../onsend.h"
@@ -843,17 +844,20 @@ int fake_req_clone_str_helper(str *src, str *dst, char *txt)
@@ -843,17 +844,20 @@ int fake_req_clone_str_helper(str *src,
}
/**
@ -168,7 +164,7 @@ index cf56de701..c407ec9a7 100644
reset_new_uri(faked_req);
reset_dst_uri(faked_req);
@@ -916,9 +923,8 @@ void free_faked_req(struct sip_msg *faked_req, struct cell *t)
@@ -916,9 +923,8 @@ void free_faked_req(struct sip_msg *fake
/* free header's parsed structures that were added by failure handlers */
for( hdr=faked_req->headers ; hdr ; hdr=hdr->next ) {
if ( hdr->parsed && hdr_allocs_parse(hdr) &&
@ -180,7 +176,7 @@ index cf56de701..c407ec9a7 100644
* chunck -> it was added by failure funcs.-> free it as pkg */
DBG("DBG:free_faked_req: removing hdr->parsed %d\n",
hdr->type);
@@ -939,14 +945,17 @@ void free_faked_req(struct sip_msg *faked_req, struct cell *t)
@@ -939,14 +945,17 @@ void free_faked_req(struct sip_msg *fake
reset_ruid(faked_req);
reset_ua(faked_req);
msg_ldata_reset(faked_req);
@ -200,7 +196,7 @@ index cf56de701..c407ec9a7 100644
struct sip_msg *shmem_msg = t->uas.request;
int on_failure;
@@ -967,16 +976,18 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl,
@@ -967,16 +976,18 @@ int run_failure_handlers(struct cell *t,
return 1;
}
@ -222,7 +218,7 @@ index cf56de701..c407ec9a7 100644
}
if (on_failure) {
/* avoid recursion -- if failure_route forwards, and does not
@@ -985,22 +996,23 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl,
@@ -985,22 +996,23 @@ int run_failure_handlers(struct cell *t,
t->on_failure=0;
/* if continuing on timeout of a suspended transaction, reset the flag */
t->flags &= ~T_ASYNC_SUSPENDED;
@ -254,7 +250,7 @@ index cf56de701..c407ec9a7 100644
return 1;
}
@@ -1009,7 +1021,8 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl,
@@ -1009,7 +1021,8 @@ int run_failure_handlers(struct cell *t,
int run_branch_failure_handlers(struct cell *t, struct sip_msg *rpl,
int code, int extra_flags)
{
@ -264,7 +260,7 @@ index cf56de701..c407ec9a7 100644
struct sip_msg *shmem_msg = t->uas.request;
int on_branch_failure;
@@ -1030,37 +1043,40 @@ int run_branch_failure_handlers(struct cell *t, struct sip_msg *rpl,
@@ -1030,37 +1043,40 @@ int run_branch_failure_handlers(struct c
return 1;
}
@ -316,8 +312,6 @@ index cf56de701..c407ec9a7 100644
return 1;
}
diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h
index 91b2ac839..af99187e7 100644
--- a/modules/tm/t_reply.h
+++ b/modules/tm/t_reply.h
@@ -227,10 +227,10 @@ void t_drop_replies(int v);
@ -334,11 +328,9 @@ index 91b2ac839..af99187e7 100644
typedef int (*tget_picked_f)(void);
int t_get_picked_branch(void);
diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c
index 6bb25473b..27f54569a 100644
--- a/modules/tm/t_suspend.c
+++ b/modules/tm/t_suspend.c
@@ -166,7 +166,8 @@ int t_continue(unsigned int hash_index, unsigned int label,
@@ -167,7 +167,8 @@ int t_continue(unsigned int hash_index,
struct action *route)
{
struct cell *t;
@ -348,7 +340,7 @@ index 6bb25473b..27f54569a 100644
struct cancel_info cancel_data;
int branch;
struct ua_client *uac =NULL;
@@ -267,31 +268,34 @@ int t_continue(unsigned int hash_index, unsigned int label,
@@ -268,31 +269,34 @@ int t_continue(unsigned int hash_index,
*/
/* fake the request and the environment, like in failure_route */
@ -392,6 +384,3 @@ index 6bb25473b..27f54569a 100644
if (t->uas.status < 200) {
/* No final reply has been sent yet.
--
2.11.0

30
debian/patches/sipwise/utils-kamctl-refresh-dbschema.patch vendored
Unescape View File

@ -17,8 +17,6 @@ See #782
utils/kamctl/xhttp_pi/sca-table | 1 +
11 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/utils/kamctl/db_berkeley/kamailio/sca_subscriptions b/utils/kamctl/db_berkeley/kamailio/sca_subscriptions
index e95bce3..ee7f41a 100644
--- a/utils/kamctl/db_berkeley/kamailio/sca_subscriptions
+++ b/utils/kamctl/db_berkeley/kamailio/sca_subscriptions
@@ -1,5 +1,5 @@
@ -34,8 +32,6 @@ index e95bce3..ee7f41a 100644
METADATA_DEFAULTS
-NIL|NIL|NIL|0|0|0|0|NIL|NIL|NIL|NIL|NIL|NIL
+NIL|NIL|NIL|0|0|0|0|NIL|NIL|NIL|NIL|NIL|NIL|0
diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version
index 65f1371..f76e5ed 100644
--- a/utils/kamctl/db_berkeley/kamailio/version
+++ b/utils/kamctl/db_berkeley/kamailio/version
@@ -107,7 +107,7 @@ rtpengine|1
@ -47,8 +43,6 @@ index 65f1371..f76e5ed 100644
silo|
silo|8
sip_trace|
diff --git a/utils/kamctl/db_sqlite/sca-create.sql b/utils/kamctl/db_sqlite/sca-create.sql
index 67cefaa..09e98e6 100644
--- a/utils/kamctl/db_sqlite/sca-create.sql
+++ b/utils/kamctl/db_sqlite/sca-create.sql
@@ -12,11 +12,12 @@ CREATE TABLE sca_subscriptions (
@ -66,15 +60,11 @@ index 67cefaa..09e98e6 100644
-INSERT INTO version (table_name, table_version) values ('sca_subscriptions','1');
+INSERT INTO version (table_name, table_version) values ('sca_subscriptions','2');
diff --git a/utils/kamctl/dbtext/kamailio/sca_subscriptions b/utils/kamctl/dbtext/kamailio/sca_subscriptions
index b953d2a..d175560 100644
--- a/utils/kamctl/dbtext/kamailio/sca_subscriptions
+++ b/utils/kamctl/dbtext/kamailio/sca_subscriptions
@@ -1 +1 @@
-id(int,auto) subscriber(string) aor(string) event(int) expires(int) state(int) app_idx(int) call_id(string) from_tag(string) to_tag(string) record_route(string,null) notify_cseq(int) subscribe_cseq(int)
+id(int,auto) subscriber(string) aor(string) event(int) expires(int) state(int) app_idx(int) call_id(string) from_tag(string) to_tag(string) record_route(string,null) notify_cseq(int) subscribe_cseq(int) server_id(int)
diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version
index eb3f135..5a26e5b 100644
--- a/utils/kamctl/dbtext/kamailio/version
+++ b/utils/kamctl/dbtext/kamailio/version
@@ -48,7 +48,7 @@ rls_presentity:1
@ -86,8 +76,6 @@ index eb3f135..5a26e5b 100644
silo:8
sip_trace:4
speed_dial:2
diff --git a/utils/kamctl/mysql/sca-create.sql b/utils/kamctl/mysql/sca-create.sql
index 0f46808..3960156 100644
--- a/utils/kamctl/mysql/sca-create.sql
+++ b/utils/kamctl/mysql/sca-create.sql
@@ -12,11 +12,12 @@ CREATE TABLE `sca_subscriptions` (
@ -105,8 +93,6 @@ index 0f46808..3960156 100644
-INSERT INTO version (table_name, table_version) values ('sca_subscriptions','1');
+INSERT INTO version (table_name, table_version) values ('sca_subscriptions','2');
diff --git a/utils/kamctl/oracle/sca-create.sql b/utils/kamctl/oracle/sca-create.sql
index a91df4f..a9250fc 100644
--- a/utils/kamctl/oracle/sca-create.sql
+++ b/utils/kamctl/oracle/sca-create.sql
@@ -12,6 +12,7 @@ CREATE TABLE sca_subscriptions (
@ -128,8 +114,6 @@ index a91df4f..a9250fc 100644
-INSERT INTO version (table_name, table_version) values ('sca_subscriptions','1');
+INSERT INTO version (table_name, table_version) values ('sca_subscriptions','2');
diff --git a/utils/kamctl/postgres/sca-create.sql b/utils/kamctl/postgres/sca-create.sql
index dde0283..5792a73 100644
--- a/utils/kamctl/postgres/sca-create.sql
+++ b/utils/kamctl/postgres/sca-create.sql
@@ -12,11 +12,12 @@ CREATE TABLE sca_subscriptions (
@ -147,11 +131,9 @@ index dde0283..5792a73 100644
-INSERT INTO version (table_name, table_version) values ('sca_subscriptions','1');
+INSERT INTO version (table_name, table_version) values ('sca_subscriptions','2');
diff --git a/utils/kamctl/xhttp_pi/pi_framework.xml b/utils/kamctl/xhttp_pi/pi_framework.xml
index ddf2b2e..6cad290 100644
--- a/utils/kamctl/xhttp_pi/pi_framework.xml
+++ b/utils/kamctl/xhttp_pi/pi_framework.xml
@@ -709,6 +709,7 @@
@@ -708,6 +708,7 @@
<column><field>record_route</field><type>DB1_BLOB</type></column>
<column><field>notify_cseq</field><type>DB1_INT</type></column>
<column><field>subscribe_cseq</field><type>DB1_INT</type></column>
@ -159,7 +141,7 @@ index ddf2b2e..6cad290 100644
</db_table>
<!-- Declaration of sip_trace table-->
<db_table id="sip_trace">
@@ -3701,6 +3702,7 @@
@@ -3698,6 +3699,7 @@
<col><field>record_route</field></col>
<col><field>notify_cseq</field></col>
<col><field>subscribe_cseq</field></col>
@ -167,7 +149,7 @@ index ddf2b2e..6cad290 100644
</query_cols>
</cmd>
<cmd><cmd_name>add</cmd_name>
@@ -3719,6 +3721,7 @@
@@ -3716,6 +3718,7 @@
<col><field>record_route</field></col>
<col><field>notify_cseq</field></col>
<col><field>subscribe_cseq</field></col>
@ -175,7 +157,7 @@ index ddf2b2e..6cad290 100644
</query_cols>
</cmd>
<cmd><cmd_name>update</cmd_name>
@@ -3740,6 +3743,7 @@
@@ -3737,6 +3740,7 @@
<col><field>record_route</field></col>
<col><field>notify_cseq</field></col>
<col><field>subscribe_cseq</field></col>
@ -183,8 +165,6 @@ index ddf2b2e..6cad290 100644
</query_cols>
</cmd>
<cmd><cmd_name>delete</cmd_name>
diff --git a/utils/kamctl/xhttp_pi/sca-mod b/utils/kamctl/xhttp_pi/sca-mod
index db0b3e2..d774b40 100644
--- a/utils/kamctl/xhttp_pi/sca-mod
+++ b/utils/kamctl/xhttp_pi/sca-mod
@@ -17,6 +17,7 @@
@ -211,8 +191,6 @@ index db0b3e2..d774b40 100644
</query_cols>
</cmd>
<cmd><cmd_name>delete</cmd_name>
diff --git a/utils/kamctl/xhttp_pi/sca-table b/utils/kamctl/xhttp_pi/sca-table
index 4b8ae67..811c309 100644
--- a/utils/kamctl/xhttp_pi/sca-table
+++ b/utils/kamctl/xhttp_pi/sca-table
@@ -15,4 +15,5 @@

15
debian/patches/upstream/dialog-check-if-dialog-exists-after-event-route-exec.patch vendored
Unescape View File

@ -9,11 +9,9 @@ Subject: [PATCH] dialog: check if dialog exists after event route execution
modules/dialog/dlg_handlers.c | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c
index 539d248e0..2eb36f502 100644
--- a/modules/dialog/dlg_handlers.c
+++ b/modules/dialog/dlg_handlers.c
@@ -1226,12 +1226,14 @@ dlg_cell_t *dlg_get_msg_dialog(sip_msg_t *msg)
@@ -1179,12 +1179,14 @@ dlg_cell_t *dlg_get_msg_dialog(sip_msg_t
*/
void dlg_onroute(struct sip_msg* req, str *route_params, void *param)
{
@ -33,7 +31,7 @@ index 539d248e0..2eb36f502 100644
dlg = dlg_get_ctx_dialog();
if (dlg!=NULL) {
@@ -1321,8 +1323,10 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param)
@@ -1274,8 +1276,10 @@ void dlg_onroute(struct sip_msg* req, st
/* set current dialog - re-use ref increment from dlg_get() above */
set_current_dialog( req, dlg);
@ -46,9 +44,9 @@ index 539d248e0..2eb36f502 100644
if(dlg->iflags & DLG_IFLAG_CSEQ_DIFF) {
if(dlg_cseq_refresh(req, dlg, dir)<0) {
@@ -1364,6 +1368,15 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param)
dlg_run_event_route(dlg, req, old_state, new_state);
@@ -1320,6 +1324,15 @@ void dlg_onroute(struct sip_msg* req, st
return;
}
+ dlg0 = dlg_lookup(h_entry, h_id);
+ if (dlg0==0) {
@ -62,6 +60,3 @@ index 539d248e0..2eb36f502 100644
/* delay deletion of dialog until transaction has died off in order
* to absorb in-air messages */
if (new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) {
--
2.11.0

Write Preview
Loading…
Cancel
Save