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

MT#14721 fix routename for event_route

Browse Source 
Change-Id: Ic60c865d7da4064340a676beadcbe8ff034a16d3
changes/87/2487/9
Victor Seva 10 years ago
parent e0b7ef1796
commit 76e5e3fe4c
4 changed files with 108 additions and 1 deletions
Show Stats Download Patch File Download Diff File

2
debian/patches/series vendored
Unescape View File

@ -1,6 +1,8 @@
# kamailio-config-test
# fix needed from upstream
upstream/0001-core-clean-previous-routename-in-order-to-get-the-co.patch
upstream/0002-core-fix-routename-for-event_route.patch
upstream/0003-core-revert-from-last-clear-or-routename.patch
#
sipwise/debug/0000-modules-debugger-move-json-related-from-debugger_api.patch
sipwise/debug/0001-modules-cfgt-trace-config-and-save-to-file.patch

2
debian/patches/sipwise/debug/0001-modules-cfgt-trace-config-and-save-to-file.patch vendored
Unescape View File

@ -1,4 +1,4 @@
From 95948013a291286ebd332bb71cdffb09a0618606 Mon Sep 17 00:00:00 2001
From 839fca856115c95cd7033b0bac1110554090fb9f Mon Sep 17 00:00:00 2001
From: Victor Seva <linuxmaniac@torreviejawireless.org>
Date: Wed, 24 Jun 2015 22:19:24 +0200
Subject: [PATCH] modules/cfgt: trace config and save to file

56
debian/patches/upstream/0002-core-fix-routename-for-event_route.patch vendored
Unescape View File

@ -0,0 +1,56 @@
From fed41e7bd30a1c4cd925b7f0c73d8aaa44722955 Mon Sep 17 00:00:00 2001
From: Victor Seva <linuxmaniac@torreviejawireless.org>
Date: Tue, 25 Aug 2015 15:43:29 +0200
Subject: [PATCH] core: fix routename for event_route
---
cfg.lex | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/cfg.lex b/cfg.lex
index 95edfdb..147f597 100644
--- a/cfg.lex
+++ b/cfg.lex
@@ -605,23 +605,23 @@ IMPORTFILE "import_file"
<INITIAL>{ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; }
<INITIAL>{AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; }
<INITIAL>{MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; }
-<INITIAL>{ROUTE} { count(); default_routename="DEFAULT_ROUTE";
+<INITIAL>{ROUTE} { count(); routename=NULL; default_routename="DEFAULT_ROUTE";
yylval.strval=yytext; return ROUTE; }
-<INITIAL>{ROUTE_REQUEST} { count(); default_routename="DEFAULT_ROUTE";
+<INITIAL>{ROUTE_REQUEST} { count(); routename=NULL; default_routename="DEFAULT_ROUTE";
yylval.strval=yytext; return ROUTE_REQUEST; }
-<INITIAL>{ROUTE_ONREPLY} { count(); default_routename="DEFAULT_ONREPLY";
+<INITIAL>{ROUTE_ONREPLY} { count(); routename=NULL; default_routename="DEFAULT_ONREPLY";
yylval.strval=yytext;
return ROUTE_ONREPLY; }
-<INITIAL>{ROUTE_REPLY} { count(); default_routename="DEFAULT_ONREPLY";
+<INITIAL>{ROUTE_REPLY} { count(); routename=NULL; default_routename="DEFAULT_ONREPLY";
yylval.strval=yytext; return ROUTE_REPLY; }
-<INITIAL>{ROUTE_FAILURE} { count(); default_routename="DEFAULT_FAILURE";
+<INITIAL>{ROUTE_FAILURE} { count(); routename=NULL; default_routename="DEFAULT_FAILURE";
yylval.strval=yytext;
return ROUTE_FAILURE; }
-<INITIAL>{ROUTE_BRANCH} { count(); default_routename="DEFAULT_BRANCH";
+<INITIAL>{ROUTE_BRANCH} { count(); routename=NULL; default_routename="DEFAULT_BRANCH";
yylval.strval=yytext; return ROUTE_BRANCH; }
-<INITIAL>{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND";
+<INITIAL>{ROUTE_SEND} { count(); routename=NULL; default_routename="DEFAULT_SEND";
yylval.strval=yytext; return ROUTE_SEND; }
-<INITIAL>{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT";
+<INITIAL>{ROUTE_EVENT} { count(); routename=NULL; default_routename="DEFAULT_EVENT";
yylval.strval=yytext;
state=EVRT_NAME_S; BEGIN(EVRTNAME);
return ROUTE_EVENT; }
@@ -630,6 +630,7 @@ IMPORTFILE "import_file"
<EVRTNAME>{EVENT_RT_NAME} { count();
addstr(&s_buf, yytext, yyleng);
yylval.strval=s_buf.s;
+ routename=s_buf.s;
memset(&s_buf, 0, sizeof(s_buf));
return EVENT_RT_NAME; }
<EVRTNAME>{RBRACK} { count();
--
2.5.0

49
debian/patches/upstream/0003-core-revert-from-last-clear-or-routename.patch vendored
Unescape View File

@ -0,0 +1,49 @@
From 821d1d9f300a2d73d18a6dd95b8ad44a7d8794e8 Mon Sep 17 00:00:00 2001
From: Victor Seva <linuxmaniac@torreviejawireless.org>
Date: Wed, 26 Aug 2015 10:56:32 +0200
Subject: [PATCH] core: partial revert from 546e624a859 wrong clear or
routename
---
cfg.lex | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/cfg.lex b/cfg.lex
index 147f597..ef8c881 100644
--- a/cfg.lex
+++ b/cfg.lex
@@ -605,23 +605,23 @@ IMPORTFILE "import_file"
<INITIAL>{ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; }
<INITIAL>{AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; }
<INITIAL>{MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; }
-<INITIAL>{ROUTE} { count(); routename=NULL; default_routename="DEFAULT_ROUTE";
+<INITIAL>{ROUTE} { count(); default_routename="DEFAULT_ROUTE";
yylval.strval=yytext; return ROUTE; }
-<INITIAL>{ROUTE_REQUEST} { count(); routename=NULL; default_routename="DEFAULT_ROUTE";
+<INITIAL>{ROUTE_REQUEST} { count(); default_routename="DEFAULT_ROUTE";
yylval.strval=yytext; return ROUTE_REQUEST; }
-<INITIAL>{ROUTE_ONREPLY} { count(); routename=NULL; default_routename="DEFAULT_ONREPLY";
+<INITIAL>{ROUTE_ONREPLY} { count(); default_routename="DEFAULT_ONREPLY";
yylval.strval=yytext;
return ROUTE_ONREPLY; }
-<INITIAL>{ROUTE_REPLY} { count(); routename=NULL; default_routename="DEFAULT_ONREPLY";
+<INITIAL>{ROUTE_REPLY} { count(); default_routename="DEFAULT_ONREPLY";
yylval.strval=yytext; return ROUTE_REPLY; }
-<INITIAL>{ROUTE_FAILURE} { count(); routename=NULL; default_routename="DEFAULT_FAILURE";
+<INITIAL>{ROUTE_FAILURE} { count(); default_routename="DEFAULT_FAILURE";
yylval.strval=yytext;
return ROUTE_FAILURE; }
-<INITIAL>{ROUTE_BRANCH} { count(); routename=NULL; default_routename="DEFAULT_BRANCH";
+<INITIAL>{ROUTE_BRANCH} { count(); default_routename="DEFAULT_BRANCH";
yylval.strval=yytext; return ROUTE_BRANCH; }
-<INITIAL>{ROUTE_SEND} { count(); routename=NULL; default_routename="DEFAULT_SEND";
+<INITIAL>{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND";
yylval.strval=yytext; return ROUTE_SEND; }
-<INITIAL>{ROUTE_EVENT} { count(); routename=NULL; default_routename="DEFAULT_EVENT";
+<INITIAL>{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT";
yylval.strval=yytext;
state=EVRT_NAME_S; BEGIN(EVRTNAME);
return ROUTE_EVENT; }
--
2.5.0
Write Preview
Loading…
Cancel
Save