sr-dev August 2012

sr-dev@lists.kamailio.org

30 participants
170 discussions

git:master: usrloc(k): return ruid and aor hash in get all contacts API functions
by Daniel-Constantin Mierla 08 Aug '12

08 Aug '12

Module: sip-router Branch: master Commit: 7b863271880a643d72b506975faa0669d2ca268a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b86327… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 8 20:24:09 2012 +0200 usrloc(k): return ruid and aor hash in get all contacts API functions - these records are used to send NAT keepalives - aor hash is set to 0 if db_mode is DB_ONLY, it is not stored in database --- modules_k/usrloc/dlist.c | 116 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 81 insertions(+), 35 deletions(-) diff --git a/modules_k/usrloc/dlist.c b/modules_k/usrloc/dlist.c index cb25871..c6c4c8e 100644 --- a/modules_k/usrloc/dlist.c +++ b/modules_k/usrloc/dlist.c @@ -101,11 +101,15 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, db1_res_t* res = NULL; db_row_t *row; dlist_t *dom; - char *p, *p1; char now_s[25]; int now_len; - int port, proto, p_len, p1_len; + int port, proto; + char *p; + str addr; + str path; + str ruid; str host; + unsigned int aorhash; int i; void *cp; int shortage, needed; @@ -113,7 +117,7 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, cp = buf; shortage = 0; /* Reserve space for terminating 0000 */ - len -= sizeof(p_len); + len -= sizeof(addr.len); /* get the current time in DB format */ now_len = 25; @@ -121,22 +125,23 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, LM_ERR("failed to print now time\n"); return -1; } + aorhash = 0; for (dom = root; dom!=NULL ; dom=dom->next) { /* build query */ i = snprintf( query_buf, sizeof(query_buf), "select %.*s, %.*s, %.*s," + " %.*s, %.*s, %.*s from %s where %.*s > %.*s and" #ifdef ORACLE_USRLOC - " %.*s, %.*s from %s where %.*s > %.*s and " - "bitand(%.*s, %d) = %d and mod(id, %u) = %u", + " bitand(%.*s, %d) = %d and mod(id, %u) = %u", #else - " %.*s, %.*s from %s where %.*s > %.*s and %.*s & %d = %d and " - "id %% %u = %u", + " %.*s & %d = %d and id %% %u = %u", #endif received_col.len, received_col.s, contact_col.len, contact_col.s, sock_col.len, sock_col.s, cflags_col.len, cflags_col.s, path_col.len, path_col.s, + ruid_col.len, ruid_col.s, dom->d->name->s, expires_col.len, expires_col.s, now_len, now_s, @@ -161,38 +166,50 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, row = RES_ROWS(res) + i; /* received */ - p = (char*)VAL_STRING(ROW_VALUES(row)); - if ( VAL_NULL(ROW_VALUES(row)) || p==0 || p[0]==0 ) { + addr.s = (char*)VAL_STRING(ROW_VALUES(row)); + if ( VAL_NULL(ROW_VALUES(row)) || addr.s==0 || addr.s[0]==0 ) { /* contact */ - p = (char*)VAL_STRING(ROW_VALUES(row)+1); - if (VAL_NULL(ROW_VALUES(row)+1) || p==0 || p[0]==0) { + addr.s = (char*)VAL_STRING(ROW_VALUES(row)+1); + if (VAL_NULL(ROW_VALUES(row)+1) || addr.s==0 || addr.s[0]==0) { LM_ERR("empty contact -> skipping\n"); continue; } } - p_len = strlen(p); + addr.len = strlen(addr.s); /* path */ - p1 = (char*)VAL_STRING(ROW_VALUES(row)+4); - if (VAL_NULL(ROW_VALUES(row)+4) || p1==0 || p1[0]==0){ - p1 = NULL; - p1_len = 0; + path.s = (char*)VAL_STRING(ROW_VALUES(row)+4); + if (VAL_NULL(ROW_VALUES(row)+4) || path.s==0 || path.s[0]==0){ + path.s = NULL; + path.len = 0; } else { - p1_len = strlen(p1); + path.len = strlen(path.s); } - needed = (int)(sizeof(p_len)+p_len+sizeof(sock)+sizeof(dbflags)+ - sizeof(p1_len)+p1_len); + /* ruid */ + ruid.s = (char*)VAL_STRING(ROW_VALUES(row)+5); + if (VAL_NULL(ROW_VALUES(row)+5) || ruid.s==0 || ruid.s[0]==0){ + ruid.s = NULL; + ruid.len = 0; + } else { + ruid.len = strlen(ruid.s); + } + + needed = (int)(sizeof(addr.len) + addr.len + + sizeof(sock) + sizeof(dbflags) + + sizeof(path.len) + path.len + + sizeof(ruid.len) + ruid.len + + sizeof(aorhash)); if (len < needed) { shortage += needed ; continue; } /* write received/contact */ - memcpy(cp, &p_len, sizeof(p_len)); - cp = (char*)cp + sizeof(p_len); - memcpy(cp, p, p_len); - cp = (char*)cp + p_len; + memcpy(cp, &addr.len, sizeof(addr.len)); + cp = (char*)cp + sizeof(addr.len); + memcpy(cp, addr.s, addr.len); + cp = (char*)cp + addr.len; /* sock */ p = (char*)VAL_STRING(ROW_VALUES(row) + 2); @@ -221,13 +238,26 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, cp = (char*)cp + sizeof(dbflags); /* write path */ - memcpy(cp, &p1_len, sizeof(p1_len)); - cp = (char*)cp + sizeof(p1_len); + memcpy(cp, &path.len, sizeof(path.len)); + cp = (char*)cp + sizeof(path.len); /* copy path only if exist */ - if(p1_len){ - memcpy(cp, p1, p1_len); - cp = (char*)cp + p1_len; + if(path.len){ + memcpy(cp, path.s, path.len); + cp = (char*)cp + path.len; + } + + /* write ruid */ + memcpy(cp, &ruid.len, sizeof(ruid.len)); + cp = (char*)cp + sizeof(ruid.len); + /* copy ruid only if exist */ + if(ruid.len){ + memcpy(cp, ruid.s, ruid.len); + cp = (char*)cp + ruid.len; } + /* aorhash not used for db-only records, but it is added + * (as 0) to match the struct used for mem records */ + memcpy(cp, &aorhash, sizeof(aorhash)); + cp = (char*)cp + sizeof(aorhash); len -= needed; } /* row cycle */ @@ -237,7 +267,7 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, /* len < 0 is possible, if size of the buffer < sizeof(c->c.len) */ if (len >= 0) - memset(cp, 0, sizeof(p_len)); + memset(cp, 0, sizeof(addr.len)); /* Shouldn't happen */ if (shortage > 0 && len > shortage) { @@ -300,9 +330,11 @@ static inline int get_all_mem_ucontacts(void *buf, int len, unsigned int flags, continue; if (c->received.s) { needed = (int)(sizeof(c->received.len) - + c->received.len + sizeof(c->sock) - + sizeof(c->cflags) + sizeof(c->path.len) - + c->path.len); + + c->received.len + + sizeof(c->sock) + sizeof(c->cflags) + + sizeof(c->path.len) + c->path.len + + sizeof(c->ruid.len) + c->ruid.len + + sizeof(r->aorhash)); if (len >= needed) { memcpy(cp,&c->received.len,sizeof(c->received.len)); cp = (char*)cp + sizeof(c->received.len); @@ -316,14 +348,22 @@ static inline int get_all_mem_ucontacts(void *buf, int len, unsigned int flags, cp = (char*)cp + sizeof(c->path.len); memcpy(cp, c->path.s, c->path.len); cp = (char*)cp + c->path.len; + memcpy(cp, &c->ruid.len, sizeof(c->ruid.len)); + cp = (char*)cp + sizeof(c->ruid.len); + memcpy(cp, c->ruid.s, c->ruid.len); + cp = (char*)cp + c->ruid.len; + memcpy(cp, &r->aorhash, sizeof(r->aorhash)); + cp = (char*)cp + sizeof(r->aorhash); len -= needed; } else { shortage += needed; } } else { - needed = (int)(sizeof(c->c.len) + c->c.len + - sizeof(c->sock) + sizeof(c->cflags) + - sizeof(c->path.len) + c->path.len); + needed = (int)(sizeof(c->c.len) + c->c.len + + sizeof(c->sock) + sizeof(c->cflags) + + sizeof(c->path.len) + c->path.len + + sizeof(c->ruid.len) + c->ruid.len + + sizeof(r->aorhash)); if (len >= needed) { memcpy(cp, &c->c.len, sizeof(c->c.len)); cp = (char*)cp + sizeof(c->c.len); @@ -337,6 +377,12 @@ static inline int get_all_mem_ucontacts(void *buf, int len, unsigned int flags, cp = (char*)cp + sizeof(c->path.len); memcpy(cp, c->path.s, c->path.len); cp = (char*)cp + c->path.len; + memcpy(cp, &c->ruid.len, sizeof(c->ruid.len)); + cp = (char*)cp + sizeof(c->ruid.len); + memcpy(cp, c->ruid.s, c->ruid.len); + cp = (char*)cp + c->ruid.len; + memcpy(cp, &r->aorhash, sizeof(r->aorhash)); + cp = (char*)cp + sizeof(r->aorhash); len -= needed; } else { shortage += needed;

1 0

Kamailio WebSockets and Outbound
by Peter Dunkley 08 Aug '12

08 Aug '12

Hi, I would really like to get the required Outbound support into Kamailio. There has been a lot of discussion on Outbound recently, and I have been left a little confused as to what is actually needed for WebSockets. I am happy to devote a few evenings and weekends to implementing this, but I could use a little help. If there is anyone who understands Outbound (and what Kamailio does and doesn't support with regards to Outbound) a short (bullet-point?) list of what is currently missing would be great. Also, if anyone can point me to some clients (both WebSockets and TCP) that support Outbound so I have something to test with, that'd be a great help too. Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

5 8

git:3.3: modules_k/rls: Fixed memory leak in RLS
by Peter Dunkley 08 Aug '12

08 Aug '12

Module: sip-router Branch: 3.3 Commit: 25c6efc8d245c339c77748f93c222188769a7be8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25c6efc… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Aug 8 12:05:44 2012 +0100 modules_k/rls: Fixed memory leak in RLS - Leak only happens when there is more than one Record-Route: header - Fixed by Hugh Waite @ Crocodile RCS (cherry picked from commit c1240aa21a534f1c1a5bdaaebd9c29fe4984a4bb) --- modules_k/rls/notify.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index b923add..c8eb230 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -760,7 +760,7 @@ void rls_free_td(dlg_t* td) pkg_free(td->rem_uri.s); if(td->route_set) - pkg_free(td->route_set); + free_rr(&td->route_set); pkg_free(td); }

1 0

git:master: modules_k/rls: Fixed memory leak in RLS
by Peter Dunkley 08 Aug '12

08 Aug '12

Module: sip-router Branch: master Commit: c1240aa21a534f1c1a5bdaaebd9c29fe4984a4bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c1240aa… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Aug 8 12:05:44 2012 +0100 modules_k/rls: Fixed memory leak in RLS - Leak only happens when there is more than one Record-Route: header - Fixed by Hugh Waite @ Crocodile RCS --- modules_k/rls/notify.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index b923add..c8eb230 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -760,7 +760,7 @@ void rls_free_td(dlg_t* td) pkg_free(td->rem_uri.s); if(td->route_set) - pkg_free(td->route_set); + free_rr(&td->route_set); pkg_free(td); }

1 0

Websocket module
by Carlos Ruiz Díaz 08 Aug '12

08 Aug '12

Hello list, I'm trying to test the websocket module on Kamailio but I currently lack of a working web SIP phone that makes use of the websocket transport protocol. I'm trying with OverSIP <https://github.com/versatica/OverSIP> but there's no documentation on how to try it (and I don't do Ruby). Is there another HTML5 SIP client that I can use or at least a page where I can find documentation about how to configure OverSIP? Regards. Carlos.

4 17

git:master: modules_k/seas: Added WebSocket transport support
by Peter Dunkley 08 Aug '12

08 Aug '12

Module: sip-router Branch: master Commit: 6eb7414bc7e6f2027d49d5b01462e565ae4a93a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6eb7414… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Aug 8 10:10:42 2012 +0100 modules_k/seas: Added WebSocket transport support - Note: seas doesn't seem to compile at the moment, but I think the four lines added for WebSockets are OK... --- modules_k/seas/seas_action.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules_k/seas/seas_action.c b/modules_k/seas/seas_action.c index 3db43b8..bad30e4 100644 --- a/modules_k/seas/seas_action.c +++ b/modules_k/seas/seas_action.c @@ -1170,6 +1170,11 @@ int print_local_uri(as_p as,char processor_id,char *where,int len) proto.s=TRANSPORT_PARAM "SCTP"; proto.len=TRANSPORT_PARAM_LEN + 4; break; + case PROTO_WS: + case PROTO_WSS: + proto.s=TRANSPORT_PARAM "WS"; + proto.len=TRANSPORT_PARAM_LEN + 2; + break; } switch(si->address.af){ case AF_INET:

1 0

git:master: modules/lcr: Added WebSocket transport to lcr
by Peter Dunkley 08 Aug '12

08 Aug '12

Module: sip-router Branch: master Commit: f96e6005eb5a071ec25c9ab3174c4150223448cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f96e600… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Aug 8 09:59:59 2012 +0100 modules/lcr: Added WebSocket transport to lcr - LCR won't use a WebSocket gateway (this doesn't make sense), but PROTO_(WS|WSS) has been added to some switch statements to catch misconfiguration and get rid of compiler warnings. --- modules/lcr/lcr_mod.c | 4 ++++ modules/lcr/lcr_rpc.c | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 3bdcc98..6627b43 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -1738,6 +1738,10 @@ inline int decode_avp_value(char *value, unsigned int *gw_index, str *scheme, transport->s = ";transport=sctp"; transport->len = 15; break; + case PROTO_WS: + case PROTO_WSS: + LM_ERR("unsupported transport '%d'\n", u); + return 0; default: LM_ERR("unknown transport '%d'\n", u); return 0; diff --git a/modules/lcr/lcr_rpc.c b/modules/lcr/lcr_rpc.c index 1ce860d..6483c5b 100644 --- a/modules/lcr/lcr_rpc.c +++ b/modules/lcr/lcr_rpc.c @@ -134,6 +134,8 @@ static void dump_gws(rpc_t* rpc, void* c) case PROTO_OTHER: rpc->struct_add(st, "s", "transport", "OTHER"); break; + case PROTO_WS: + case PROTO_WSS: case PROTO_NONE: break; }

1 0

git:master: modules_k/snmpstats: Added defines for WebSocket transport
by Peter Dunkley 08 Aug '12

08 Aug '12

Module: sip-router Branch: master Commit: 58b22e62ea360c38574ad5ef2a031bb9413807fa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=58b22e6… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Aug 8 10:14:57 2012 +0100 modules_k/snmpstats: Added defines for WebSocket transport - There are no specific stats for WebSocket connections here (just as there are none for SCTP), but the defines are there as place- holders. --- modules_k/snmpstats/snmpstats_globals.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/snmpstats/snmpstats_globals.h b/modules_k/snmpstats/snmpstats_globals.h index 5e12df4..e98b030 100644 --- a/modules_k/snmpstats/snmpstats_globals.h +++ b/modules_k/snmpstats/snmpstats_globals.h @@ -88,6 +88,9 @@ #define TC_TRANSPORT_PROTOCOL_TCP (128 >> 2) #define TC_TRANSPORT_PROTOCOL_SCTP (128 >> 3) #define TC_TRANSPORT_PROTOCOL_TLS (128 >> 4) +#define TC_TRANSPORT_PROTOCOL_WS (128 >> 5) +#define TC_TRANSPORT_PROTOCOL_WSS (128 >> 6) + /* * Textual Conventions for BITS types - ends *************************************************************/

1 0

git:master: modules_k/nat_traversal: Added WebSocket transport support
by Peter Dunkley 08 Aug '12

08 Aug '12

Module: sip-router Branch: master Commit: e1848d9c7fcaa04e785fe39365abd90b3c075f2f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1848d9… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Aug 8 10:08:33 2012 +0100 modules_k/nat_traversal: Added WebSocket transport support --- modules_k/nat_traversal/nat_traversal.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/nat_traversal/nat_traversal.c b/modules_k/nat_traversal/nat_traversal.c index 4c6f7b2..3368689 100644 --- a/modules_k/nat_traversal/nat_traversal.c +++ b/modules_k/nat_traversal/nat_traversal.c @@ -2017,6 +2017,10 @@ pv_get_source_uri(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) case PROTO_SCTP: strcat(uri, ";transport=sctp"); break; + case PROTO_WS: + case PROTO_WSS: + strcat(uri, ";transport=ws"); + break; } res->rs.s = uri;

1 0

git:master: modules_k/path: Added WebSocket transport support to Path module
by Peter Dunkley 08 Aug '12

08 Aug '12

Module: sip-router Branch: master Commit: c7a9b1ed48631952f286d312721e8c45dde05ca1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c7a9b1e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Aug 8 09:49:13 2012 +0100 modules_k/path: Added WebSocket transport support to Path module --- modules_k/path/path.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/path/path.c b/modules_k/path/path.c index b8eb0c8..a8fb8aa 100644 --- a/modules_k/path/path.c +++ b/modules_k/path/path.c @@ -140,6 +140,10 @@ static int prepend_path(struct sip_msg* _m, str *user, int recv) case PROTO_SCTP: rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 21, "'sip:%s:%u;transport=sctp'", src_ip, _m->rcv.src_port); break; + case PROTO_WS: + case PROTO_WSS: + rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 19, "'sip:%s:%u;transport=ws'", src_ip, _m->rcv.src_port); + break; } l = insert_new_lump_before(l, rcv_addr.s, rcv_addr.len, 0);

1 0

← Newer
1
...
10
11
12
13
14
15
16
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2012