Module: sip-router Branch: 3.3 Commit: 78d4b145c57e5e93b70f7441ec2c7e63a2f9f2c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78d4b145...

Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: Fri Nov 9 08:41:55 2012 +0100

dialog(k): use proper scan string for optional headers parameter in rpc commands

- credits to Kristofer Signer for report and troubleshooting (cherry picked from commit d5120187eb41e709c840b3cfbb0dc1803f61b036)

---

modules_k/dialog/dialog.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 3a404d1..e25890d 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -1585,7 +1585,7 @@ static void rpc_end_dlg_entry_id(rpc_t *rpc, void *c) { dlg_cell_t * dlg = NULL; str rpc_extra_hdrs = {NULL,0};

- if (rpc->scan(c, "ddS", &h_entry, &h_id, &rpc_extra_hdrs) < 2) return; + if (rpc->scan(c, "dd*S", &h_entry, &h_id, &rpc_extra_hdrs) < 2) return;

dlg = dlg_lookup(h_entry, h_id); if(dlg){ @@ -1622,7 +1622,7 @@ static void rpc_dlg_bridge(rpc_t *rpc, void *c) { str to = {NULL,0}; str op = {NULL,0};

- if (rpc->scan(c, "SSS", &from, &to, &op) < 2) return; + if (rpc->scan(c, "SS*S", &from, &to, &op) < 2) return;

dlg_bridge(&from, &to, &op); }