From fe7f161d1676b9f24f8d51cfeb7c16d627ca0ffb Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 19 Aug 2014 17:31:10 +0200 Subject: [PATCH] MT#8699 fix debugger.reset_msgid --- debian/patches/series | 1 + .../debug/0001-debugger-fix-reset_msgid.patch | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 debian/patches/upstream/debug/0001-debugger-fix-reset_msgid.patch diff --git a/debian/patches/series b/debian/patches/series index 3a5ca6361..9aa322b50 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,6 +2,7 @@ upstream/acc-allow-pseudo-variables-as-first-parameter-for-fu.patch upstream/acc-add-documentation-note-indicating-the-use-of-pse.patch upstream/debug/0001-modules-debugger-trace-msg-out.patch +upstream/debug/0001-debugger-fix-reset_msgid.patch ## multipart bodies upstream/0001-parser-add-internal-flag-FL_BODY_MULTIPART.patch upstream/0001-core-add-str_append-helper-function.patch diff --git a/debian/patches/upstream/debug/0001-debugger-fix-reset_msgid.patch b/debian/patches/upstream/debug/0001-debugger-fix-reset_msgid.patch new file mode 100644 index 000000000..f4e3aaf88 --- /dev/null +++ b/debian/patches/upstream/debug/0001-debugger-fix-reset_msgid.patch @@ -0,0 +1,42 @@ +From 86f998f6ebc800ca3292d699951427b9c54ced75 Mon Sep 17 00:00:00 2001 +From: Victor Seva +Date: Tue, 19 Aug 2014 17:21:57 +0200 +Subject: [PATCH] debugger: fix reset_msgid + +Don't change the msg->id when that message has been processed already +--- + modules/debugger/debugger_api.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/modules/debugger/debugger_api.c b/modules/debugger/debugger_api.c +index 6f4cbb8..05f904e 100644 +--- a/modules/debugger/debugger_api.c ++++ b/modules/debugger/debugger_api.c +@@ -273,18 +273,18 @@ int dbg_msgid_filter(struct sip_msg *msg, unsigned int flags, void *bar) + } + msgid_base = _dbg_pid_list[indx].msgid_base; + lock_release(_dbg_pid_list[indx].lock); +- msgid_new = msg->id - msgid_base; +- LM_DBG("msg->id:%d msgid_base:%d -> %d\n", msg->id, msgid_base, msgid_new); +- if(msgid_new>0) ++ if(msg->id > msgid_base) + { ++ msgid_new = msg->id - msgid_base; ++ LM_DBG("msg->id:%d msgid_base:%d -> %d\n", ++ msg->id, msgid_base, msgid_new); + msg->id = msgid_new; +- return 1; + } + else + { +- LM_WARN("msgid_new<=0??\n"); +- return -1; ++ LM_DBG("msg->id:%d already processed\n", msg->id); + } ++ return 1; + } + + char* get_current_route_type_name() +-- +2.1.0.rc1 +