sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

git:4.0: .gitignore: added protoshoot binary the ignore list of git

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 95903a0f12e10e4852316eb52c8097fb8b30a308 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95903a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 9 00:21:44 2013 +0200 .gitignore: added protoshoot binary the ignore list of git (cherry picked from commit a177a33b9938a36cfaedbce61734a1525e5b1665) --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 11e0e2c..9c26668 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ utils/sercmd/sercmd utils/sercmd/kamcmd utils/pdbt/pdb_server utils/pdbt/pdbt +utils/protoshoot/protoshoot # Emacs backup files *~ # Emacs file locks

11 years, 8 months

git:4.0: rr: added missing s in sips for record route

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 118da22f979dfa8e97a7c029ff34251ba72b6833 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=118da22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 5 21:30:06 2013 +0200 rr: added missing s in sips for record route - reported by Sander van Grieken (cherry picked from commit 0ecde91fe6e911997b1f5ee33eb50fa6778b7a89) --- modules/rr/record.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/rr/record.c b/modules/rr/record.c index 0779200..41a3245 100644 --- a/modules/rr/record.c +++ b/modules/rr/record.c @@ -47,7 +47,7 @@ #define RR_PREFIX_SIP "Record-Route: <sip:" #define RR_PREFIX_SIP_LEN (sizeof(RR_PREFIX_SIP)-1) -#define RR_PREFIX_SIPS "Record-Route: <sip:" +#define RR_PREFIX_SIPS "Record-Route: <sips:" #define RR_PREFIX_SIPS_LEN (sizeof(RR_PREFIX_SIPS)-1) #define RR_LR ";lr"

11 years, 8 months

git:4.0: dialog_ng: set kamailio mod interface always

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 1e36ce594fa1c3ae180870025d79987fbfc90878 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e36ce5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 30 20:59:24 2013 +0100 dialog_ng: set kamailio mod interface always - it breaks rpc list generation otherwise (cherry picked from commit 11bc294a9d64e31014ccb836290467984c28ce65) --- modules/dialog_ng/Makefile | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/modules/dialog_ng/Makefile b/modules/dialog_ng/Makefile index a41c949..082ee36 100644 --- a/modules/dialog_ng/Makefile +++ b/modules/dialog_ng/Makefile @@ -7,9 +7,7 @@ auto_gen= NAME=dialog_ng.so LIBS= -ifeq ($(CFG_NAME),kamailio) - DEFS += -DKAMAILIO_MOD_INTERFACE -endif +DEFS += -DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kmi/kmi

11 years, 8 months

git:4.0: core: set TOS for IPv6 sctp sockets

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 77c275383c509d34ba0300182ace889a4f1d7963 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=77c2753… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 30 09:15:00 2013 +0100 core: set TOS for IPv6 sctp sockets (cherry picked from commit b57f64533dbc538f3d5282d0196598062f0b4652) --- sctp_server.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/sctp_server.c b/sctp_server.c index fbe83ea..511842e 100644 --- a/sctp_server.c +++ b/sctp_server.c @@ -451,10 +451,22 @@ static int sctp_init_sock_opt_common(int s, int af) #endif /* set tos */ optval = tos; - if (setsockopt(s, IPPROTO_IP, IP_TOS, (void*)&optval,sizeof(optval)) ==-1){ - LOG(L_WARN, "WARNING: sctp_init_sock_opt_common: setsockopt tos: %s\n", - strerror(errno)); - /* continue since this is not critical */ + if(af==AF_INET){ + if (setsockopt(s, IPPROTO_IP, IP_TOS, (void*)&optval, + sizeof(optval)) ==-1){ + LM_WARN("sctp_init_sock_opt_common: setsockopt tos: %s\n", + strerror(errno)); + /* continue since this is not critical */ + } +#ifdef USE_IPV6 + } else if(af==AF_INET6){ + if (setsockopt(s, IPPROTO_IPV6, IPV6_TCLASS, + (void*)&optval, sizeof(optval)) ==-1) { + LM_WARN("sctp_init_sock_opt_common: setsockopt v6 tos: %s\n", + strerror(errno)); + /* continue since this is not critical */ + } +#endif } /* set receive buffer: SO_RCVBUF*/

11 years, 8 months

git:4.0: core: set TOS for tcp IPv6 sockets

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 1d6e63967ba8eaa5e1cf0d63081ec38439f0bcaa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d6e639… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 30 09:24:19 2013 +0100 core: set TOS for tcp IPv6 sockets (cherry picked from commit b9476db0c1e1ce869c1da2f87dfaf411edf69277) --- tcp_main.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 9d3359e..8a650a1 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -373,7 +373,7 @@ static inline int init_sock_keepalive(int s) * disable nagle, tos lowdelay, reuseaddr, non-blocking * * return -1 on error */ -static int init_sock_opt(int s) +static int init_sock_opt(int s, int af) { int flags; int optval; @@ -388,11 +388,24 @@ static int init_sock_opt(int s) #endif /* tos*/ optval = tos; - if (setsockopt(s, IPPROTO_IP, IP_TOS, (void*)&optval,sizeof(optval)) ==-1){ - LOG(L_WARN, "WARNING: init_sock_opt: setsockopt tos: %s\n", - strerror(errno)); - /* continue since this is not critical */ + if(af==AF_INET){ + if (setsockopt(s, IPPROTO_IP, IP_TOS, (void*)&optval, + sizeof(optval)) ==-1){ + LOG(L_WARN, "WARNING: init_sock_opt: setsockopt tos: %s\n", + strerror(errno)); + /* continue since this is not critical */ + } +#ifdef USE_IPV6 + } else if(af==AF_INET6){ + if (setsockopt(s, IPPROTO_IPV6, IPV6_TCLASS, + (void*)&optval, sizeof(optval)) ==-1) { + LOG(L_WARN, "WARNING: init_sock_opt: setsockopt v6 tos: %s\n", + strerror(errno)); + /* continue since this is not critical */ + } +#endif } + #if !defined(TCP_DONT_REUSEADDR) optval=1; if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, @@ -1140,7 +1153,7 @@ inline static int tcp_do_connect( union sockaddr_union* server, su2a(server, sizeof(*server)), errno, strerror(errno)); goto error; } - if (init_sock_opt(s)<0){ + if (init_sock_opt(s, server->s.sa_family)<0){ LOG(L_ERR, "ERROR: tcp_do_connect %s: init_sock_opt failed\n", su2a(server, sizeof(*server))); goto error;

11 years, 8 months

git:4.0: usrloc: use NULL domain for updating ul attributes for use_domain=

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 060c8cd03ee745aa48b21d946ebfa9e3671d89c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=060c8cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 29 11:02:31 2013 +0100 usrloc: use NULL domain for updating ul attributes for use_domain=0 - use counter var for db matching keys (cherry picked from commit 50b116cf4c9c33c4f23c1d5b66fd313a7f40c572) --- modules/usrloc/ucontact.c | 117 ++++++++++++++++++++++++++------------------ 1 files changed, 69 insertions(+), 48 deletions(-) diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index 91ecddc..c265580 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -633,6 +633,7 @@ int db_update_ucontact(ucontact_t* _c) char* dom; db_key_t keys1[4]; db_val_t vals1[4]; + int n1; db_key_t keys2[14]; db_val_t vals2[14]; @@ -643,10 +644,6 @@ int db_update_ucontact(ucontact_t* _c) return 0; } - keys1[0] = &user_col; - keys1[1] = &contact_col; - keys1[2] = &callid_col; - keys1[3] = &domain_col; keys2[0] = &expires_col; keys2[1] = &q_col; keys2[2] = &cseq_col; @@ -662,17 +659,24 @@ int db_update_ucontact(ucontact_t* _c) keys2[12] = &instance_col; keys2[13] = &reg_id_col; - vals1[0].type = DB1_STR; - vals1[0].nul = 0; - vals1[0].val.str_val = *_c->aor; - - vals1[1].type = DB1_STR; - vals1[1].nul = 0; - vals1[1].val.str_val = _c->c; - - vals1[2].type = DB1_STR; - vals1[2].nul = 0; - vals1[2].val.str_val = _c->callid; + n1 = 0; + keys1[n1] = &user_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + vals1[n1].val.str_val = *_c->aor; + n1++; + + keys1[n1] = &contact_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + vals1[n1].val.str_val = _c->c; + n1++; + + keys1[n1] = &callid_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + vals1[n1].val.str_val = _c->callid; + n1++; vals2[0].type = DB1_DATETIME; vals2[0].nul = 0; @@ -761,17 +765,19 @@ int db_update_ucontact(ucontact_t* _c) nr_cols2++; if (use_domain) { - vals1[3].type = DB1_STR; - vals1[3].nul = 0; + keys1[n1] = &domain_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; dom = memchr(_c->aor->s, '@', _c->aor->len); if (dom==0) { vals1[0].val.str_val.len = 0; - vals1[3].val.str_val = *_c->aor; + vals1[n1].val.str_val = *_c->aor; } else { vals1[0].val.str_val.len = dom - _c->aor->s; - vals1[3].val.str_val.s = dom + 1; - vals1[3].val.str_val.len = _c->aor->s + _c->aor->len - dom - 1; + vals1[n1].val.str_val.s = dom + 1; + vals1[n1].val.str_val.len = _c->aor->s + _c->aor->len - dom - 1; } + n1++; } if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { @@ -779,8 +785,8 @@ int db_update_ucontact(ucontact_t* _c) return -1; } - if (ul_dbf.update(ul_dbh, keys1, 0, vals1, keys2, vals2, - (use_domain) ? (4) : (3), nr_cols2) < 0) { + if (ul_dbf.update(ul_dbh, keys1, 0, vals1, keys2, vals2, n1, + nr_cols2) < 0) { LM_ERR("updating database failed\n"); return -1; } @@ -795,10 +801,17 @@ int db_update_ucontact(ucontact_t* _c) } } /* delete old db attrs and add the current list */ - uldb_delete_attrs(_c->domain, &vals1[0].val.str_val, - &vals1[3].val.str_val, &_c->ruid); - uldb_insert_attrs(_c->domain, &vals1[0].val.str_val, &vals1[3].val.str_val, - &_c->ruid, _c->xavp); + if (use_domain) { + uldb_delete_attrs(_c->domain, &vals1[0].val.str_val, + &vals1[n1-1].val.str_val, &_c->ruid); + uldb_insert_attrs(_c->domain, &vals1[0].val.str_val, + &vals1[n1-1].val.str_val, &_c->ruid, _c->xavp); + } else { + uldb_delete_attrs(_c->domain, &vals1[0].val.str_val, + NULL, &_c->ruid); + uldb_insert_attrs(_c->domain, &vals1[0].val.str_val, + NULL, &_c->ruid, _c->xavp); + } return 0; } @@ -814,51 +827,59 @@ int db_delete_ucontact(ucontact_t* _c) char* dom; db_key_t keys[4]; db_val_t vals[4]; + int n; if (_c->flags & FL_MEM) { return 0; } - keys[0] = &user_col; - keys[1] = &contact_col; - keys[2] = &callid_col; - keys[3] = &domain_col; - vals[0].type = DB1_STR; - vals[0].nul = 0; - vals[0].val.str_val = *_c->aor; + n = 0; + keys[n] = &user_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; + vals[n].val.str_val = *_c->aor; + n++; - vals[1].type = DB1_STR; - vals[1].nul = 0; - vals[1].val.str_val = _c->c; + keys[n] = &contact_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; + vals[n].val.str_val = _c->c; + n++; - vals[2].type = DB1_STR; - vals[2].nul = 0; - vals[2].val.str_val = _c->callid; + keys[n] = &callid_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; + vals[n].val.str_val = _c->callid; + n++; if (use_domain) { - vals[3].type = DB1_STR; - vals[3].nul = 0; + keys[n] = &domain_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; dom = memchr(_c->aor->s, '@', _c->aor->len); if (dom==0) { vals[0].val.str_val.len = 0; - vals[3].val.str_val = *_c->aor; + vals[n].val.str_val = *_c->aor; } else { vals[0].val.str_val.len = dom - _c->aor->s; - vals[3].val.str_val.s = dom + 1; - vals[3].val.str_val.len = _c->aor->s + _c->aor->len - dom - 1; + vals[n].val.str_val.s = dom + 1; + vals[n].val.str_val.len = _c->aor->s + _c->aor->len - dom - 1; } + uldb_delete_attrs(_c->domain, &vals[0].val.str_val, + &vals[n].val.str_val, &_c->ruid); + n++; + } else { + uldb_delete_attrs(_c->domain, &vals[0].val.str_val, + NULL, &_c->ruid); } - uldb_delete_attrs(_c->domain, &vals[0].val.str_val, - &vals[3].val.str_val, &_c->ruid); - if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { LM_ERR("sql use_table failed\n"); return -1; } - if (ul_dbf.delete(ul_dbh, keys, 0, vals, (use_domain) ? (4) : (3)) < 0) { + if (ul_dbf.delete(ul_dbh, keys, 0, vals, n) < 0) { LM_ERR("deleting from database failed\n"); return -1; }

11 years, 8 months

git:4.0: core: set TOS for IPv6 UDP sockets

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: e83d6d4c34fb04223f5754fff1248286e1345e7d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e83d6d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 27 20:53:00 2013 +0100 core: set TOS for IPv6 UDP sockets - reported by Klaus Feichtinger, FS#179 (cherry picked from commit 084be456bc0fab015cf9964ac85651fa60ea77c9) --- udp_server.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/udp_server.c b/udp_server.c index 3889a65..d4efe13 100644 --- a/udp_server.c +++ b/udp_server.c @@ -321,11 +321,24 @@ int udp_init(struct socket_info* sock_info) } /* tos */ optval = tos; - if (setsockopt(sock_info->socket, IPPROTO_IP, IP_TOS, (void*)&optval, - sizeof(optval)) ==-1){ - LOG(L_WARN, "WARNING: udp_init: setsockopt tos: %s\n", strerror(errno)); - /* continue since this is not critical */ + if (addr->s.sa_family==AF_INET){ + if (setsockopt(sock_info->socket, IPPROTO_IP, IP_TOS, (void*)&optval, + sizeof(optval)) ==-1){ + LOG(L_WARN, "WARNING: udp_init: setsockopt tos: %s\n", + strerror(errno)); + /* continue since this is not critical */ + } +#ifdef USE_IPV6 + } else if (addr->s.sa_family==AF_INET6){ + if (setsockopt(sock_info->socket, IPPROTO_IPV6, IPV6_TCLASS, + (void*)&optval, sizeof(optval)) ==-1) { + LOG(L_WARN, "WARNING: udp_init: setsockopt v6 tos: %s\n", + strerror(errno)); + /* continue since this is not critical */ + } +#endif } + #if defined (__OS_linux) && defined(UDP_ERRORS) optval=1; /* enable error receiving on unconnected sockets */

11 years, 8 months

git:4.0: msrp: fix compile warning of argument type in dbg message

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 22b614d06590f8c9adcadf9302882fba3e8f1d1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22b614d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 24 12:38:45 2013 +0100 msrp: fix compile warning of argument type in dbg message - reported by Olle E. Johansson (cherry picked from commit 7339d847adfd098c58426e96e5e3730ad580d543) --- modules/msrp/msrp_parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/msrp/msrp_parser.c b/modules/msrp/msrp_parser.c index 585d090..d7a2ced 100644 --- a/modules/msrp/msrp_parser.c +++ b/modules/msrp/msrp_parser.c @@ -538,7 +538,7 @@ int msrp_parse_uri(char *start, int len, msrp_uri_t *uri) error: LM_ERR("parsing error in [%.*s] at [%ld]\n", - len, start, s - start); + len, start, (long int)(s - start)); memset(uri, 0, sizeof(msrp_uri_t)); return -1; }

11 years, 8 months

git:4.0: rr: use sips to build RR headers of R-URI has sips

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 5ab5edc4bba76f7a46d243fb7b9ce329b31835b6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ab5edc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 23 10:44:31 2013 +0100 rr: use sips to build RR headers of R-URI has sips - reported by Hugh James, FS#277 (cherry picked from commit 1826a5f4e3a981e30956da61e11ea551aae0b714) --- modules/rr/record.c | 94 +++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 72 insertions(+), 22 deletions(-) diff --git a/modules/rr/record.c b/modules/rr/record.c index 784ec90..0779200 100644 --- a/modules/rr/record.c +++ b/modules/rr/record.c @@ -44,8 +44,11 @@ #include "rr_mod.h" -#define RR_PREFIX "Record-Route: <sip:" -#define RR_PREFIX_LEN (sizeof(RR_PREFIX)-1) +#define RR_PREFIX_SIP "Record-Route: <sip:" +#define RR_PREFIX_SIP_LEN (sizeof(RR_PREFIX_SIP)-1) + +#define RR_PREFIX_SIPS "Record-Route: <sip:" +#define RR_PREFIX_SIPS_LEN (sizeof(RR_PREFIX_SIPS)-1) #define RR_LR ";lr" #define RR_LR_LEN (sizeof(RR_LR)-1) @@ -79,6 +82,15 @@ static unsigned int rr_param_msg; static pv_spec_t *custom_user_avp; /*!< AVP for custom_user setting */ +inline static int rr_is_sips(sip_msg_t *_m) +{ + if(parse_sip_msg_uri(_m)<0) + return 0; + if(_m->parsed_uri.type==SIPS_URI_T) + return 1; + return 0; +} + void init_custom_user(pv_spec_t *custom_user_avp_p) { custom_user_avp = custom_user_avp_p; @@ -188,13 +200,23 @@ static inline struct lump *insert_rr_param_lump(struct lump *before, * \return 0 on success, negative on failure */ static inline int build_rr(struct lump* _l, struct lump* _l2, str* user, - str *tag, str *params, int _inbound, int _use_ob) + str *tag, str *params, int _inbound, int _use_ob, int _sips) { char* prefix, *suffix, *term, *r2; int suffix_len, prefix_len; char *p; + char *rr_prefix; + int rr_prefix_len; + + if(_sips==0) { + rr_prefix = RR_PREFIX_SIP; + rr_prefix_len = RR_PREFIX_SIP_LEN; + } else { + rr_prefix = RR_PREFIX_SIPS; + rr_prefix_len = RR_PREFIX_SIPS_LEN; + } - prefix_len = RR_PREFIX_LEN + (user->len ? (user->len + 1) : 0); + prefix_len = rr_prefix_len + (user->len ? (user->len + 1) : 0); if (enable_full_lr) { suffix_len = RR_LR_FULL_LEN + (params?params->len:0) + ((tag && tag->len) ? (RR_FROMTAG_LEN + tag->len) : 0); @@ -217,21 +239,21 @@ static inline int build_rr(struct lump* _l, struct lump* _l2, str* user, return -3; } - memcpy(prefix, RR_PREFIX, RR_PREFIX_LEN); + memcpy(prefix, rr_prefix, rr_prefix_len); if (user->len) { - memcpy(prefix + RR_PREFIX_LEN, user->s, user->len); + memcpy(prefix + rr_prefix_len, user->s, user->len); #ifdef ENABLE_USER_CHECK /* don't add the ignored user into a RR */ if(i_user.len && i_user.len == user->len && !strncmp(i_user.s, user->s, i_user.len)) { - if(prefix[RR_PREFIX_LEN]=='x') - prefix[RR_PREFIX_LEN]='y'; + if(prefix[rr_prefix_len]=='x') + prefix[rr_prefix_len]='y'; else - prefix[RR_PREFIX_LEN]='x'; + prefix[rr_prefix_len]='x'; } #endif - prefix[RR_PREFIX_LEN + user->len] = '@'; + prefix[rr_prefix_len + user->len] = '@'; } p = suffix; @@ -357,6 +379,7 @@ int record_route(struct sip_msg* _m, str *params) struct to_body* from = NULL; str* tag; int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; + int sips; user.len = 0; @@ -396,6 +419,8 @@ int record_route(struct sip_msg* _m, str *params) rr_param_buf.len = 0; } + sips = rr_is_sips(_m); + if (enable_double_rr && !use_ob) { l = anchor_lump(_m, _m->headers->name.s - _m->buf,0,HDR_RECORDROUTE_T); l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, 0); @@ -409,7 +434,7 @@ int record_route(struct sip_msg* _m, str *params) LM_ERR("failed to insert conditional lump\n"); return -6; } - if (build_rr(l, l2, &user, tag, params, OUTBOUND, 0) < 0) { + if (build_rr(l, l2, &user, tag, params, OUTBOUND, 0, sips) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -7; } @@ -423,7 +448,7 @@ int record_route(struct sip_msg* _m, str *params) } if (build_rr(l, l2, &user, tag, params, use_ob ? OUTBOUND : INBOUND, - use_ob) < 0) { + use_ob, sips) < 0) { LM_ERR("failed to insert inbound Record-Route\n"); return -4; } @@ -452,7 +477,19 @@ int record_route_preset(struct sip_msg* _m, str* _data) char* hdr, *p; int hdr_len; int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; - + char *rr_prefix; + int rr_prefix_len; + int sips; + + sips = rr_is_sips(_m); + if(sips==0) { + rr_prefix = RR_PREFIX_SIP; + rr_prefix_len = RR_PREFIX_SIP_LEN; + } else { + rr_prefix = RR_PREFIX_SIPS; + rr_prefix_len = RR_PREFIX_SIPS_LEN; + } + from = 0; user.len = 0; user.s = 0; @@ -488,7 +525,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) return -3; } - hdr_len = RR_PREFIX_LEN; + hdr_len = rr_prefix_len; if (user.len) hdr_len += user.len + 1; /* @ */ hdr_len += _data->len; @@ -512,8 +549,8 @@ int record_route_preset(struct sip_msg* _m, str* _data) } p = hdr; - memcpy(p, RR_PREFIX, RR_PREFIX_LEN); - p += RR_PREFIX_LEN; + memcpy(p, rr_prefix, rr_prefix_len); + p += rr_prefix_len; if (user.len) { memcpy(p, user.s, user.len); @@ -564,13 +601,23 @@ int record_route_preset(struct sip_msg* _m, str* _data) #define RR_TRANS_LEN 11 #define RR_TRANS ";transport=" static inline int build_advertised_rr(struct lump* _l, struct lump* _l2, str *_data, - str* user, str *tag, int _inbound, int _use_ob) + str* user, str *tag, int _inbound, int _use_ob, int _sips) { char *p; char *hdr, *trans, *r2, *suffix, *term; int hdr_len, suffix_len; + char *rr_prefix; + int rr_prefix_len; - hdr_len = RR_PREFIX_LEN; + if(_sips==0) { + rr_prefix = RR_PREFIX_SIP; + rr_prefix_len = RR_PREFIX_SIP_LEN; + } else { + rr_prefix = RR_PREFIX_SIPS; + rr_prefix_len = RR_PREFIX_SIPS_LEN; + } + + hdr_len = rr_prefix_len; if (user && user->len) hdr_len += user->len + 1; /* @ */ hdr_len += _data->len; @@ -602,8 +649,8 @@ static inline int build_advertised_rr(struct lump* _l, struct lump* _l2, str *_d } p = hdr; - memcpy(p, RR_PREFIX, RR_PREFIX_LEN); - p += RR_PREFIX_LEN; + memcpy(p, rr_prefix, rr_prefix_len); + p += rr_prefix_len; if (user->len) { memcpy(p, user->s, user->len); @@ -681,6 +728,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) struct lump* l; struct lump* l2; int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; + int sips; user.len = 0; user.s = 0; @@ -710,6 +758,8 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) tag = &((struct to_body*)_m->from->parsed)->tag_value; } + sips = rr_is_sips(_m); + if (enable_double_rr && !use_ob) { l = anchor_lump(_m, _m->headers->name.s - _m->buf,0,HDR_RECORDROUTE_T); l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, 0); @@ -724,7 +774,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) return -4; } if (build_advertised_rr(l, l2, _data, &user, tag, OUTBOUND, - 0) < 0) { + 0, sips) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -5; } @@ -739,7 +789,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) if (build_advertised_rr(l, l2, _data, &user, tag, use_ob ? OUTBOUND: INBOUND, - use_ob) < 0) { + use_ob, sips) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -7; }

11 years, 8 months

git pull error

by Juha Heinanen

when i try to pull from sip-router git, i get an error: $ git pull fatal: write error: Connection reset by peer this is with origin: git://git.sip-router.org/sip-route it works when origin is ssh: ssh://user@git.sip-router.org/sip-router is it just me or have others the same problem? -- juha

11 years, 8 months

← Newer
1
...
20
21
22
23
24
25
26
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013