sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
376 discussions

git:master: tm: beter detection of brackets in From/ To values in UAC print functions
by Daniel-Constantin Mierla 28 Sep '14

28 Sep '14

Module: sip-router Branch: master Commit: 181c30705b3cb82245463015d98644c278131af2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=181c307… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Sep 28 21:44:35 2014 +0200 tm: beter detection of brackets in From/To values in UAC print functions - commit fb0cd1cd6a891ab5dc5f559bb6740ba62ac3daf4 fixed the case of avoiding double <> when dispaly name was present, but affected when header parameters were given - reported by Juha Heinanen --- modules/tm/t_msgbuilder.c | 44 +++++++++++++++++++++++++++++++++----------- 1 files changed, 33 insertions(+), 11 deletions(-) diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index a1890c8..fae0cdf 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -1393,16 +1393,16 @@ static inline char* print_request_uri(char* w, str* method, dlg_t* dialog, struc /* * Print To header field */ -static inline char* print_to(char* w, dlg_t* dialog, struct cell* t) +static inline char* print_to(char* w, dlg_t* dialog, struct cell* t, int bracket) { t->to.s = w; t->to.len = TO_LEN + dialog->rem_uri.len + CRLF_LEN + (((dialog->rem_uri.s[dialog->rem_uri.len - 1]!='>'))?2:0); memapp(w, TO, TO_LEN); - if(dialog->rem_uri.s[dialog->rem_uri.len - 1]!='>') memapp(w, "<", 1); + if(bracket) memapp(w, "<", 1); memapp(w, dialog->rem_uri.s, dialog->rem_uri.len); - if(dialog->rem_uri.s[dialog->rem_uri.len - 1]!='>') memapp(w, ">", 1); + if(bracket) memapp(w, ">", 1); if (dialog->id.rem_tag.len) { t->to.len += TOTAG_LEN + dialog->id.rem_tag.len ; @@ -1418,16 +1418,16 @@ static inline char* print_to(char* w, dlg_t* dialog, struct cell* t) /* * Print From header field */ -static inline char* print_from(char* w, dlg_t* dialog, struct cell* t) +static inline char* print_from(char* w, dlg_t* dialog, struct cell* t, int bracket) { t->from.s = w; t->from.len = FROM_LEN + dialog->loc_uri.len + CRLF_LEN + ((dialog->loc_uri.s[dialog->loc_uri.len - 1]!='>')?2:0); memapp(w, FROM, FROM_LEN); - if(dialog->loc_uri.s[dialog->loc_uri.len - 1]!='>') memapp(w, "<", 1); + if(bracket) memapp(w, "<", 1); memapp(w, dialog->loc_uri.s, dialog->loc_uri.len); - if(dialog->loc_uri.s[dialog->loc_uri.len - 1]!='>') memapp(w, ">", 1); + if(bracket) memapp(w, ">", 1); if (dialog->id.loc_tag.len) { t->from.len += FROMTAG_LEN + dialog->id.loc_tag.len; @@ -1514,9 +1514,10 @@ char * _strnstr(const char* s, const char* find, size_t slen) { char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int branch, struct cell *t, int* len, struct dest_info* dst) { - char* buf, *w; + char* buf, *w, *p; str content_length, cseq, via; unsigned int maxfwd_len; + int tbracket, fbracket; if (!method || !dialog) { LOG(L_ERR, "build_uac_req(): Invalid parameter value\n"); @@ -1546,12 +1547,33 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra } *len += via.len; + if((p=q_memrchr(dialog->rem_uri.s, '>', dialog->rem_uri.len))!=NULL) { + if((p==dialog->rem_uri.s + dialog->rem_uri.len - 1) + || *(p+1)==';') { + tbracket = 0; + } else { + tbracket = 1; + } + } else { + tbracket = 1; + } + if((p=q_memrchr(dialog->loc_uri.s, '>', dialog->loc_uri.len))!=NULL) { + if((p==dialog->loc_uri.s + dialog->loc_uri.len - 1) + || *(p+1)==';') { + fbracket = 0; + } else { + fbracket = 1; + } + } else { + fbracket = 1; + } + *len += TO_LEN + dialog->rem_uri.len + (dialog->id.rem_tag.len ? (TOTAG_LEN + dialog->id.rem_tag.len) : 0) + CRLF_LEN; /* To */ - if(dialog->rem_uri.s[dialog->rem_uri.len - 1]!='>') *len += 2; /* To-URI < > */ + if(tbracket) *len += 2; /* To-URI < > */ *len += FROM_LEN + dialog->loc_uri.len + (dialog->id.loc_tag.len ? (FROMTAG_LEN + dialog->id.loc_tag.len) : 0) + CRLF_LEN; /* From */ - if(dialog->loc_uri.s[dialog->loc_uri.len - 1]!='>') *len += 2; /* From-URI < > */ + if(fbracket) *len += 2; /* From-URI < > */ *len += CALLID_LEN + dialog->id.call_id.len + CRLF_LEN; /* Call-ID */ *len += CSEQ_LEN + cseq.len + 1 + method->len + CRLF_LEN; /* CSeq */ *len += calculate_routeset_length(dialog); /* Route set */ @@ -1573,8 +1595,8 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra w = print_request_uri(w, method, dialog, t, branch); /* Request-URI */ memapp(w, via.s, via.len); /* Top-most Via */ - w = print_to(w, dialog, t); /* To */ - w = print_from(w, dialog, t); /* From */ + w = print_to(w, dialog, t, tbracket); /* To */ + w = print_from(w, dialog, t, fbracket); /* From */ w = print_cseq(w, &cseq, method, t); /* CSeq */ w = print_callid(w, dialog, t); /* Call-ID */ w = print_routeset(w, dialog); /* Route set */

1 0

git:master: msrp: Minor doc updates, added section ID's
by Olle E. Johansson 28 Sep '14

28 Sep '14

Module: sip-router Branch: master Commit: dfcdc7b858ca916f9c9ae3509cb82fb4b547fa91 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dfcdc7b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Sep 28 21:44:51 2014 +0200 msrp: Minor doc updates, added section ID's --- modules/msrp/README | 49 +++++++++++++++-------------- modules/msrp/doc/msrp_admin.xml | 64 +++++++++++++++++++------------------- 2 files changed, 57 insertions(+), 56 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=dfc…

1 0

git:master: dialplan: Minor doc update, adding section ID's
by Olle E. Johansson 28 Sep '14

28 Sep '14

Module: sip-router Branch: master Commit: ba95571544ca0905905c025efb0ae76cbe1042c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba95571… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Sep 28 21:26:49 2014 +0200 dialplan: Minor doc update, adding section ID's --- modules/dialplan/README | 24 ++-- modules/dialplan/doc/dialplan_admin.xml | 171 ++++++++++++++++--------------- 2 files changed, 98 insertions(+), 97 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ba9…

1 0

git:master: tm: use advertised addr/ port if set for socket in rm rpc uac commands
by Daniel-Constantin Mierla 28 Sep '14

28 Sep '14

Module: sip-router Branch: master Commit: 131139883c03f3851ad99e96c59dfe3c349ec011 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1311398… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Sep 28 12:49:27 2014 +0200 tm: use advertised addr/port if set for socket in rm rpc uac commands - reported by Juha Heinanen --- modules/tm/rpc_uac.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/tm/rpc_uac.c b/modules/tm/rpc_uac.c index a305b63..507f4ae 100644 --- a/modules/tm/rpc_uac.c +++ b/modules/tm/rpc_uac.c @@ -156,12 +156,10 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, total_len = 0; last = &sl; last->next = 0; + sock_name = 0; + portname = 0; if (ssock){ - sock_name = &ssock->address_str; - portname = &ssock->port_no_str; - }else{ - sock_name = 0; - portname = 0; + si_get_signaling_data(ssock, &sock_name, &portname); } for (; hf; hf = hf->next) { @@ -197,8 +195,7 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, " failed\n"); goto error; } - sock_name = &di.send_sock->address_str; - portname = &di.send_sock->port_no_str; + si_get_signaling_data(di.send_sock, &sock_name, &portname); } if (!append_str_list(sock_name->s, sock_name->len, &last, &total_len))

2 3

git:4.1: tm: use advertised addr/ port if set for socket in rm rpc uac commands
by Juha Heinanen 28 Sep '14

28 Sep '14

Module: sip-router Branch: 4.1 Commit: 88031fe50236f9eb1fc28309fd466e86d8c6b81b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=88031fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Sep 28 12:49:27 2014 +0200 tm: use advertised addr/port if set for socket in rm rpc uac commands - reported by Juha Heinanen (cherry picked from commit 131139883c03f3851ad99e96c59dfe3c349ec011) --- modules/tm/rpc_uac.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/tm/rpc_uac.c b/modules/tm/rpc_uac.c index a305b63..507f4ae 100644 --- a/modules/tm/rpc_uac.c +++ b/modules/tm/rpc_uac.c @@ -156,12 +156,10 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, total_len = 0; last = &sl; last->next = 0; + sock_name = 0; + portname = 0; if (ssock){ - sock_name = &ssock->address_str; - portname = &ssock->port_no_str; - }else{ - sock_name = 0; - portname = 0; + si_get_signaling_data(ssock, &sock_name, &portname); } for (; hf; hf = hf->next) { @@ -197,8 +195,7 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, " failed\n"); goto error; } - sock_name = &di.send_sock->address_str; - portname = &di.send_sock->port_no_str; + si_get_signaling_data(di.send_sock, &sock_name, &portname); } if (!append_str_list(sock_name->s, sock_name->len, &last, &total_len))

1 0

git:4.1: core: helper functions to get addr and port to be used in signaling from socket info
by Juha Heinanen 28 Sep '14

28 Sep '14

Module: sip-router Branch: 4.1 Commit: a52c0024723a59d90c3c3966d5deadaf8b0d4440 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a52c002… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Sep 28 12:48:53 2014 +0200 core: helper functions to get addr and port to be used in signaling from socket info (cherry picked from commit c725f1dec14863e069bfd1e5c26857a1005528d5) --- ip_addr.c | 21 +++++++++++++++++++++ ip_addr.h | 2 ++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/ip_addr.c b/ip_addr.c index 5f8881e..7175bd0 100644 --- a/ip_addr.c +++ b/ip_addr.c @@ -404,3 +404,24 @@ int ip_addr_match_net(ip_addr_t *iaddr, ip_addr_t *naddr, return 0; return -1; } + +int si_get_signaling_data(struct socket_info *si, str **addr, str **port) +{ + if(si==NULL) + return -1; + if(addr) { + if(si->useinfo.name.len>0) { + *addr = &si->useinfo.name; + } else { + *addr = &si->address_str; + } + } + if(port) { + if(si->useinfo.port_no>0) { + *port = &si->useinfo.port_no_str; + } else { + *port = &si->port_no_str; + } + } + return 0; +} diff --git a/ip_addr.h b/ip_addr.h index 20b3ec2..5806122 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -807,4 +807,6 @@ inline static void init_dst_from_rcv(struct dest_info* dst, */ int ip_addr_match_net(ip_addr_t *iaddr, ip_addr_t *naddr, int mask); +int si_get_signaling_data(struct socket_info *si, str **addr, str **port); + #endif

1 0

TSILO or TMSILO or TM_SILO
by Olle E. Johansson 28 Sep '14

28 Sep '14

Hi! In the list of modules, I would like if TSILO appears after TM and TMX - which is why I would suggest we rename it to TM_SILO. http://kamailio.org/docs/modules/devel/ /O

3 5

git:master: Makefile.defs: version set 4.2.0-pre1
by Daniel-Constantin Mierla 28 Sep '14

28 Sep '14

Module: sip-router Branch: master Commit: decae860504ea27a559dc0e52d50833baf4cee63 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=decae86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Sep 28 12:50:41 2014 +0200 Makefile.defs: version set 4.2.0-pre1 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index f98b168..fefc8f5 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -165,7 +165,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master: core: helper functions to get addr and port to be used in signaling from socket info
by Daniel-Constantin Mierla 28 Sep '14

28 Sep '14

Module: sip-router Branch: master Commit: c725f1dec14863e069bfd1e5c26857a1005528d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c725f1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Sep 28 12:48:53 2014 +0200 core: helper functions to get addr and port to be used in signaling from socket info --- ip_addr.c | 21 +++++++++++++++++++++ ip_addr.h | 2 ++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/ip_addr.c b/ip_addr.c index 3ab1b55..b11ab27 100644 --- a/ip_addr.c +++ b/ip_addr.c @@ -404,3 +404,24 @@ int ip_addr_match_net(ip_addr_t *iaddr, ip_addr_t *naddr, return 0; return -1; } + +int si_get_signaling_data(struct socket_info *si, str **addr, str **port) +{ + if(si==NULL) + return -1; + if(addr) { + if(si->useinfo.name.len>0) { + *addr = &si->useinfo.name; + } else { + *addr = &si->address_str; + } + } + if(port) { + if(si->useinfo.port_no>0) { + *port = &si->useinfo.port_no_str; + } else { + *port = &si->port_no_str; + } + } + return 0; +} diff --git a/ip_addr.h b/ip_addr.h index c1c966d..4efb3bc 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -807,4 +807,6 @@ inline static void init_dst_from_rcv(struct dest_info* dst, */ int ip_addr_match_net(ip_addr_t *iaddr, ip_addr_t *naddr, int mask); +int si_get_signaling_data(struct socket_info *si, str **addr, str **port); + #endif

1 0

APP_JAVA docs
by Olle E. Johansson 27 Sep '14

27 Sep '14

" 4.2. child_init_method (string) TBD. Default value is “child_init”. " I think we need to clarify this part of the docs before release. It was the same in 4.1 and we should have made a decision by now or delete it. ;-) /O

2 3

← Newer
1
2
3
4
5
6
7
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2014