From 89c889b1233919c1509dd6ee7144ef286bb1aa81 Mon Sep 17 00:00:00 2001 From: Marco Capetta Date: Mon, 4 Feb 2019 11:26:10 +0100 Subject: [PATCH] TT#51903 Remove already applied upstream patches and refresh old ones Change-Id: I765f38ab28fec65d2731f02ea0f97ec24a68251f --- debian/patches/series | 2 - debian/patches/sipwise/tt47976.patch | 41 ------- .../core_cfg_reset_routename_properly.patch | 101 ------------------ 3 files changed, 144 deletions(-) delete mode 100644 debian/patches/sipwise/tt47976.patch delete mode 100644 debian/patches/upstream/core_cfg_reset_routename_properly.patch diff --git a/debian/patches/series b/debian/patches/series index 61a5170c0..cebabac61 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -43,7 +43,5 @@ sipwise/extend_stats.patch sipwise/tt37692.patch sipwise/dtmf-blocking.patch sipwise/media-blocking.patch -upstream/core_cfg_reset_routename_properly.patch sipwise/tt41650.patch -sipwise/tt47976.patch sipwise/rtpengine-trickle-ice-sdp.patch diff --git a/debian/patches/sipwise/tt47976.patch b/debian/patches/sipwise/tt47976.patch deleted file mode 100644 index 2c5c47797..000000000 --- a/debian/patches/sipwise/tt47976.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: kamailio/src/modules/presence/presentity.c -=================================================================== ---- kamailio.orig/src/modules/presence/presentity.c -+++ kamailio/src/modules/presence/presentity.c -@@ -379,6 +379,10 @@ int delete_presentity_if_dialog_id_exist - int i = 0; - presentity_t old_presentity; - -+ if (presentity->event->evp->type != EVENT_DIALOG) { -+ return 0; -+ } -+ - query_cols[n_query_cols] = &str_domain_col; - query_ops[n_query_cols] = OP_EQ; - query_vals[n_query_cols].type = DB1_STR; -@@ -706,17 +710,18 @@ int update_presentity(struct sip_msg* ms - goto error; - } - } -+ if (presentity->event->evp->type == EVENT_DIALOG) { -+ check_if_dialog(*body, &is_dialog, &dialog_id); -+ if (dialog_id) { -+ if (delete_presentity_if_dialog_id_exists(presentity, dialog_id) < 0) { -+ free(dialog_id); -+ dialog_id = NULL; -+ goto error; -+ } - -- check_if_dialog(*body, &is_dialog, &dialog_id); -- if ( dialog_id ) { -- if (delete_presentity_if_dialog_id_exists(presentity, dialog_id) < 0) { - free(dialog_id); - dialog_id = NULL; -- goto error; - } -- -- free(dialog_id); -- dialog_id = NULL; - } - LM_DBG("inserting %d cols into table\n",n_query_cols); - diff --git a/debian/patches/upstream/core_cfg_reset_routename_properly.patch b/debian/patches/upstream/core_cfg_reset_routename_properly.patch deleted file mode 100644 index c977de9b0..000000000 --- a/debian/patches/upstream/core_cfg_reset_routename_properly.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 7a2103f3bf9b7174a6e0ea31ad23764308b945fb Mon Sep 17 00:00:00 2001 -From: Victor Seva -Date: Wed, 17 Oct 2018 12:07:53 +0200 -Subject: [PATCH] core: [cfg] reset routename properly - -solution for #1536 was not working - -fix #1668 ---- - src/core/cfg.lex | 16 ++++++++-------- - src/core/cfg.y | 22 ++++++++++++++++++---- - 2 files changed, 26 insertions(+), 12 deletions(-) - ---- a/src/core/cfg.lex -+++ b/src/core/cfg.lex -@@ -562,23 +562,23 @@ IMPORTFILE "import_file" - {ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; } - {AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; } - {MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; } --{ROUTE} { count(); routename=0; default_routename="DEFAULT_ROUTE"; -+{ROUTE} { count(); default_routename="DEFAULT_ROUTE"; - yylval.strval=yytext; return ROUTE; } --{ROUTE_REQUEST} { count(); routename=0; default_routename="DEFAULT_ROUTE"; -+{ROUTE_REQUEST} { count(); default_routename="DEFAULT_ROUTE"; - yylval.strval=yytext; return ROUTE_REQUEST; } --{ROUTE_ONREPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; -+{ROUTE_ONREPLY} { count(); default_routename="DEFAULT_ONREPLY"; - yylval.strval=yytext; - return ROUTE_ONREPLY; } --{ROUTE_REPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; -+{ROUTE_REPLY} { count(); default_routename="DEFAULT_ONREPLY"; - yylval.strval=yytext; return ROUTE_REPLY; } --{ROUTE_FAILURE} { count(); routename=0; default_routename="DEFAULT_FAILURE"; -+{ROUTE_FAILURE} { count(); default_routename="DEFAULT_FAILURE"; - yylval.strval=yytext; - return ROUTE_FAILURE; } --{ROUTE_BRANCH} { count(); routename=0; default_routename="DEFAULT_BRANCH"; -+{ROUTE_BRANCH} { count(); default_routename="DEFAULT_BRANCH"; - yylval.strval=yytext; return ROUTE_BRANCH; } --{ROUTE_SEND} { count(); routename=0; default_routename="DEFAULT_SEND"; -+{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND"; - yylval.strval=yytext; return ROUTE_SEND; } --{ROUTE_EVENT} { count(); routename=0; default_routename="DEFAULT_EVENT"; -+{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT"; - yylval.strval=yytext; - state=EVRT_NAME_S; BEGIN(EVRTNAME); - return ROUTE_EVENT; } ---- a/src/core/cfg.y -+++ b/src/core/cfg.y -@@ -1828,8 +1828,11 @@ route_stm: - | ROUTE error { yyerror("invalid route statement"); } - | ROUTE_REQUEST error { yyerror("invalid request_route statement"); } - ; -+ -+failure_route_main: ROUTE_FAILURE { routename=NULL; } -+; - failure_route_stm: -- ROUTE_FAILURE LBRACE actions RBRACE { -+ failure_route_main LBRACE actions RBRACE { - #ifdef SHM_MEM - if (!shm_initialized() && init_shm()<0) { - yyerror("Can't initialize shared memory"); -@@ -1906,8 +1909,11 @@ onreply_route_stm: - yyerror("invalid onreply_route statement"); - } - ; -+ -+branch_route_main: ROUTE_BRANCH { routename=NULL; } -+; - branch_route_stm: -- ROUTE_BRANCH LBRACE actions RBRACE { -+ branch_route_main LBRACE actions RBRACE { - #ifdef SHM_MEM - if (!shm_initialized() && init_shm()<0) { - yyerror("Can't initialize shared memory"); -@@ -1936,7 +1942,11 @@ branch_route_stm: - } - | ROUTE_BRANCH error { yyerror("invalid branch_route statement"); } - ; --send_route_stm: ROUTE_SEND LBRACE actions RBRACE { -+ -+send_route_main: ROUTE_SEND { routename=NULL; } -+; -+send_route_stm: -+ send_route_main LBRACE actions RBRACE { - #ifdef SHM_MEM - if (!shm_initialized() && init_shm()<0) { - yyerror("Can't initialize shared memory"); -@@ -1965,7 +1975,11 @@ send_route_stm: ROUTE_SEND LBRACE action - } - | ROUTE_SEND error { yyerror("invalid onsend_route statement"); } - ; --event_route_stm: ROUTE_EVENT LBRACK EVENT_RT_NAME RBRACK LBRACE actions RBRACE { -+ -+event_route_main: ROUTE_EVENT { routename=NULL; } -+; -+event_route_stm: -+ event_route_main LBRACK EVENT_RT_NAME RBRACK LBRACE actions RBRACE { - #ifdef SHM_MEM - if (!shm_initialized() && init_shm()<0) { - yyerror("Can't initialize shared memory");