sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

git:master: Revert "modules/websocket: b/ f defined missing ws_keepalive_mechanism variable"

by Peter Dunkley

Module: sip-router Branch: master Commit: 52741b4c709713b0cd0a3b9b81701ce2cf95b731 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=52741b4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Apr 5 13:33:19 2013 +0100 Revert "modules/websocket: b/f defined missing ws_keepalive_mechanism variable" This reverts commit caf4769ec0f243df71e79ee3c0781afbe5884bac. --- modules/websocket/ws_mod.c | 2 -- modules/websocket/ws_mod.h | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index 7ac4316..4159a47 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -50,8 +50,6 @@ static void destroy(void); sl_api_t ws_slb; -int ws_keepalive_mechanism = KEEPALIVE_MECHANISM_PING; - #define DEFAULT_KEEPALIVE_INTERVAL 1 static int ws_keepalive_interval = DEFAULT_KEEPALIVE_INTERVAL; diff --git a/modules/websocket/ws_mod.h b/modules/websocket/ws_mod.h index 028368a..819d3ea 100644 --- a/modules/websocket/ws_mod.h +++ b/modules/websocket/ws_mod.h @@ -37,7 +37,6 @@ enum extern sl_api_t ws_slb; extern gen_lock_t *ws_stats_lock; -extern int ws_keepalive_mechanism; extern int ws_ping_interval; /* time (in seconds) between sending Pings */ #endif /* _WS_MOD_H */

11 years, 8 months

git:master: modules/websocket: b/ f defined missing ws_keepalive_mechanism variable

by Juha Heinanen

Module: sip-router Branch: master Commit: caf4769ec0f243df71e79ee3c0781afbe5884bac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=caf4769… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Apr 5 15:17:07 2013 +0300 modules/websocket: b/f defined missing ws_keepalive_mechanism variable --- modules/websocket/ws_mod.c | 2 ++ modules/websocket/ws_mod.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index 4159a47..7ac4316 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -50,6 +50,8 @@ static void destroy(void); sl_api_t ws_slb; +int ws_keepalive_mechanism = KEEPALIVE_MECHANISM_PING; + #define DEFAULT_KEEPALIVE_INTERVAL 1 static int ws_keepalive_interval = DEFAULT_KEEPALIVE_INTERVAL; diff --git a/modules/websocket/ws_mod.h b/modules/websocket/ws_mod.h index 819d3ea..028368a 100644 --- a/modules/websocket/ws_mod.h +++ b/modules/websocket/ws_mod.h @@ -37,6 +37,7 @@ enum extern sl_api_t ws_slb; extern gen_lock_t *ws_stats_lock; +extern int ws_keepalive_mechanism; extern int ws_ping_interval; /* time (in seconds) between sending Pings */ #endif /* _WS_MOD_H */

11 years, 8 months

Help improving the modules readmes & docs

by Daniel-Constantin Mierla

Hello, I thought some people may have spare cycles and are willing to help with the documentation. Here is some updates I would like to get for modules: 1) adding ids for parameters, functions, and other sections of the docbook xml files. Now we generate the alphabetic indexes pointing to the online html readmes, would be better to point directly to the exact section. Practically, for example, sections such as next from async module: <section> <title><varname>workers</varname> (int)</title> should become: <section id="async.p.workers"> <title><varname>workers</varname> (int)</title> To get unique ids over all files, I suggest using following pattern: [module name] [dot] [type] [dot] [title] The [type] should be: - p - parameters - f - functions - m - mi commands - r - rpc commands - s - statistics 2) Add RPC commands to readmes -- some of modules already do, but many don't. There is a perl script that should get the list of RPC commands from source code, but it requires some patch to a perl lib, not working on all systems. Moreover, the output is quite minimalistic, not easy to improve the content or add examples. Last generated index is: - http://www.kamailio.org/docs/docbooks/3.4.x/rpc_list/rpc_list.html 3) Document selects -- although their name are quite suggestive, a bit of text around won't harm. - http://www.kamailio.org/wiki/cookbooks/devel/selects Because 1) and 2) requires git access, the easiest way to contribute is to provide patches to the xml files. If anyone commits to do an extensive work on these tasks in short term, we may eventually arrange for git access. The 3) is in the wiki, everyone can register an account and then update the pages. I would recommend these guidelines to be followed from now on by developers when adding new elements to the module documentation. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, April 16-17, 2013, Berlin - http://conference.kamailio.com -

11 years, 8 months

cannot load websocket module

by Juha Heinanen

i built latest master and got error when trying to load websocket module: 0(10759) ERROR: <core> [sr_module.c:588]: ERROR: load_module: could not open module </usr/lib/sip-proxy/modules/websocket.so>: /usr/lib/sip-proxy/modules/websocket.so: undefined symbol: ws_keepalive_mechanism is there a bug in websocket module or am i missing something? i read websocket readme and didn't find anything missing. i have not defined keepalive_mechanism variable in config. -- juha

11 years, 8 months

git:master: Merge remote branch 'origin/hpw/branch_failure_route'

by Hugh Waite

Module: sip-router Branch: master Commit: 2168999d8f198268526404946b0def97b87fd8f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2168999… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Fri Apr 5 09:33:38 2013 +0100 Merge remote branch 'origin/hpw/branch_failure_route' * origin/hpw/branch_failure_route: modules/tm: Fix t_next_contact_flow return value modules/tmx: Add $T_reply_ruid pv to return ruid for a branch reply modules/tm: Make ruid available in uac structure modules/registrar: Allow unregister for ruids in branch_failure_route modules/usrloc: Fix get_urecord_by_ruid to return static aor modules/tm: Fix setting instance in uac branches modules/tm: Enable retrieving of branch instance id from uac structure modules/xprint: Updated to use the new get_branch()/next_branch() functions modules/pv: Updated to use the new get_branch()/next_branch() functions modules/permissions: Updated to use the new get_branch()/next_branch() functions modules/domain: Updated to use the new get_branch()/next_branch() functions core: Update get_branch() to return instance from appended branches modules/tm: Update t_next_contact_flows for use in branch_failure event_route core: Add defines required for a new branch_failure_route type modules/tm: Create branch-failure event route Revert "core: Initial revision of branch_failure_route" core: Initial revision of branch_failure_route modules/tm: Initial revision of branch_failure_route ---

11 years, 8 months

git:master: lib/ims: Added cscf_get_p_charging_vector to retrieve icid, term_ioi, orig_ioi

by Jason Penton

Module: sip-router Branch: master Commit: 98d76f94f2a4587b7a93e8e9982ff8017cabd9a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=98d76f9… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Fri Apr 5 09:09:00 2013 +0200 lib/ims: Added cscf_get_p_charging_vector to retrieve icid,term_ioi,orig_ioi --- lib/ims/ims_getters.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/ims/ims_getters.h | 8 ++++ 2 files changed, 111 insertions(+), 0 deletions(-) diff --git a/lib/ims/ims_getters.c b/lib/ims/ims_getters.c index d1c84c7..05450f1 100644 --- a/lib/ims/ims_getters.c +++ b/lib/ims/ims_getters.c @@ -990,6 +990,109 @@ str cscf_get_charging_vector(struct sip_msg *msg, struct hdr_field **h) return cv; } +int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, + str * term_ioi) { + struct hdr_field* header = 0; + str header_body = { 0, 0 }; + char * p; + int index; + str temp = { 0, 0 }; + + if (parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_ERR("cscf_get_p_charging_vector: error parsing headers\n"); + return 0; + } + header = msg->headers; + while (header) { + if (header->name.len == cscf_p_charging_vector.len + && strncasecmp(header->name.s, cscf_p_charging_vector.s, cscf_p_charging_vector.len) == 0) + break; + header = header->next; + } + if (!header) { + LM_DBG("no header %.*s was found\n", cscf_p_charging_vector.len, cscf_p_charging_vector.s); + return 0; + } + if (!header->body.s || !header->body.len) + return 0; + + str_dup(header_body, header->body, pkg); + + LM_DBG("p_charging_vector body is %.*s\n", header_body.len, header_body.s); + + p = strtok(header_body.s, " ;:\r\t\n\"="); + loop: if (p > (header_body.s + header_body.len)) + return 1; + + if (strncmp(p, "icid-value", 10) == 0) { + p = strtok(NULL, " ;:\r\t\n\"="); + if (p > (header_body.s + header_body.len)) { + LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); + return 0; + } + temp.s = p; + temp.len = 0; + while (*p != '\"') { + temp.len = temp.len + 1; + p++; + } + icid->len = temp.len; + index = temp.s - header_body.s; + LM_DBG("icid len %i, index %i\n", temp.len, index); + icid->s = header->body.s + index; + LM_DBG("icid is %.*s\n", icid->len, icid->s); + p = strtok(NULL, " ;:\r\t\n\"="); + goto loop; + } else if (strncmp(p, "orig-ioi", 8) == 0) { + + p = strtok(NULL, " ;:\r\t\n\"="); + if (p > (header_body.s + header_body.len)) { + LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); + return 0; + } + temp.s = p; + temp.len = 0; + while (*p != '\"') { + temp.len = temp.len + 1; + p++; + } + orig_ioi->len = temp.len; + index = temp.s - header_body.s; + LM_DBG("orig ioi len %i, index %i\n", temp.len, index); + orig_ioi->s = header->body.s + index; + LM_DBG("orig_ioi is %.*s\n", orig_ioi->len, orig_ioi->s); + p = strtok(NULL, " ;:\r\t\n\"="); + goto loop; + } else if (strncmp(p, "term-ioi", 8) == 0) { + + p = strtok(NULL, " ;:\r\t\n\"="); + if (p > (header_body.s + header_body.len)) { + LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); + return 0; + } + temp.s = p; + temp.len = 0; + while (*p != '\"') { + temp.len = temp.len + 1; + p++; + } + term_ioi->len = temp.len; + term_ioi->s = header->body.s + (temp.s - header_body.s); + p = strtok(NULL, " ;:\r\t\n\"="); + goto loop; + } else { + p = strtok(NULL, " ;:\r\t\n\"="); + goto loop; + } + + LM_DBG("end\n"); + str_free(header_body, pkg); + return 1; + out_of_memory: + LM_ERR("cscf_get_p_charging_vector:out of pkg memory\n"); + return 0; +} + /** * Get the from tag * @param msg - the SIP message to look into diff --git a/lib/ims/ims_getters.h b/lib/ims/ims_getters.h index a36e0f3..e78310f 100644 --- a/lib/ims/ims_getters.h +++ b/lib/ims/ims_getters.h @@ -294,6 +294,14 @@ str cscf_get_access_network_info(struct sip_msg *msg, struct hdr_field **h); str cscf_get_charging_vector(struct sip_msg *msg, struct hdr_field **h); +/** + * Return the P-Charging-Vector tokens + * @param msg - the SIP message + * @returns the str with icid, orig_ioi and term_ioi + */ +int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, + str * term_ioi); + /** * Get the to tag

11 years, 8 months

Solaris LD switches for shared objects

by Jason Penton

Hi All, The following in Makefile.defs is incorrect IMO: # setting LDFLAGS ifeq ($(CC_NAME), gcc) ifeq ($(LDTYPE), solaris) # solaris ld LDFLAGS+=-O2 $(PROFILE) MOD_LDFLAGS:=-G $(LDFLAGS) LIB_LDFLAGS:=-G $(LDFLAGS) LIB_SONAME=-Wl,-h, LD_RPATH=-Wl,-R, else #gcc and maybe others, => gnu ld LDFLAGS+=-Wl,-O2 -Wl,-E $(PROFILE) MOD_LDFLAGS:=-shared $(LDFLAGS) LIB_LDFLAGS:=-shared $(LDFLAGS) LIB_SONAME=-Wl,-soname, LD_RPATH=-Wl,-rpath, endif endif Solaris GCC supports the standard -shared flag parameter. TBH, I'm not sure where the -G came from and why? If nobody has any objections I would like to remove -G switch for Solaris GCC??? ps. the -G switch works fine when building 32 bit but breaks when building 64 bit with errors like: fatal: relocation error: R_AMD64_PC32: .... value 0x2800c20d934 does not fit Cheers Jason

11 years, 8 months

[tracker] Comment added: usrloc module stops updating some records in db_mode 2

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#278 - usrloc module stops updating some records in db_mode 2 User who did this - Daniel-Constantin Mierla (miconda) ---------- Have you been able to compare the db queries in 3.1 vs. 3.3? Just wondering, maybe I overlooked something and I should investigate in other direction. I don't have any 3.1 going on anymore. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=278#comment819 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 8 months

Fwd: sip_trace unable to capture after next_branches()

by Ramaseshi reddy kolli

Hi, I am using sip_trace function after next_branches(), it is not capturing outbound SIP INVITE request can anyone please help me. Thanks Ram

11 years, 8 months

git:master: snmpstats Add support for the new transports as well as new roles

by Olle E. Johansson

Module: sip-router Branch: master Commit: 0964bc96b1e3cd3bb7478388f6df3cb69fffce64 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0964bc9… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Thu Apr 4 22:27:02 2013 +0200 snmpstats Add support for the new transports as well as new roles The edgeproxyServer is a SIP Outbound edge proxy that manages flows to NATted clients. The sipcaptureServer collects SIP messages for Homer SIP capture --- modules/snmpstats/README | 7 +++++-- modules/snmpstats/doc/snmpstats_admin.xml | 6 ++++-- modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB | 2 +- modules/snmpstats/mibs/KAMAILIO-TC | 24 ++++++++++++++++++------ modules/snmpstats/snmpSIPCommonObjects.c | 6 ++++++ modules/snmpstats/snmpstats_globals.h | 2 ++ 6 files changed, 36 insertions(+), 11 deletions(-) diff --git a/modules/snmpstats/README b/modules/snmpstats/README index 49d20dd..12d2c31 100644 --- a/modules/snmpstats/README +++ b/modules/snmpstats/README @@ -302,7 +302,8 @@ Chapter 1. Admin Guide and will be used in determining what is returned for the kamailioSIPEntityType scalar. Valid parameters are: - registrarServer, redirectServer, proxyServer, userAgent, other + registrarServer, redirectServer, proxyServer, userAgent, + edgeproxyServer, sipcaptureServer,other Example 1.1. Setting the sipEntityType parameter ... @@ -312,7 +313,9 @@ modparam("snmpstats", "sipEntityType", "proxyServer") Note that as the above example shows, you can define this parameter more than once. This is of course because a given Kamailio instance can - take on more than one role. + take on more than one role. The edgeproxyServer is an edge server using + the outbound module and path extensions. The sipcaptureServer is a + Homer Sip Capture server that collect SIP messages. 4.2. MsgQueueMinorThreshold (Integer) diff --git a/modules/snmpstats/doc/snmpstats_admin.xml b/modules/snmpstats/doc/snmpstats_admin.xml index 568e1c2..71a7b61 100644 --- a/modules/snmpstats/doc/snmpstats_admin.xml +++ b/modules/snmpstats/doc/snmpstats_admin.xml @@ -259,7 +259,7 @@ <para> <emphasis> - registrarServer, redirectServer, proxyServer, userAgent, other + registrarServer, redirectServer, proxyServer, userAgent, edgeproxyServer, sipcaptureServer,other </emphasis> </para> @@ -276,7 +276,9 @@ modparam("snmpstats", "sipEntityType", "proxyServer") <para> Note that as the above example shows, you can define this parameter more than once. This is of course because a given Kamailio instance can take on - more than one role. + more than one role. The edgeproxyServer is an edge server using the outbound + module and path extensions. The sipcaptureServer is a Homer Sip Capture + server that collect SIP messages. </para> </section> diff --git a/modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB b/modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB index 939a1a7..3ceec33 100644 --- a/modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB +++ b/modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB @@ -338,7 +338,7 @@ KAMAILIO-SIP-COMMON-MIB DEFINITIONS ::= BEGIN bit 4: Transport Layer Security Protocol over TCP bit 5: Transport Layer Security Protocol over SCTP bit 6: WebSocket transport - bit 7: WebSocket transport over HTTP/TLS (WSS) + bit 7: WebSocket transport over HTTP/TLS (WSS)" ::= { kamailioSIPPortEntry 4 } -- diff --git a/modules/snmpstats/mibs/KAMAILIO-TC b/modules/snmpstats/mibs/KAMAILIO-TC index 828ce2b..81d1459 100644 --- a/modules/snmpstats/mibs/KAMAILIO-TC +++ b/modules/snmpstats/mibs/KAMAILIO-TC @@ -23,7 +23,7 @@ IMPORTS kamailioTcModule MODULE-IDENTITY - LAST-UPDATED "201301081200Z" + LAST-UPDATED "201304041200Z" ORGANIZATION "Kamailio" CONTACT-INFO "http://www.kamailio.org" @@ -51,16 +51,22 @@ KamailioSIPTransportProtocol ::= TEXTUAL-CONVENTION bit 1 : User Datagram Protocol. bit 2 : Transmission Control Protocol. bit 3 : Stream Control Transmission Protocol. - bit 4 : Transport Layer Security Protocol." + bit 4 : Transport Layer Security Protocol. + bit 5 : SCTP/Transport Layer Security Protocol. + bit 6 : WebSocket transport (http) + bit 7 : WebSocket over HTTP/TLS (wss)" SYNTAX BITS { other(0), -- none of the following udp(1), tcp(2), sctp(3), - tls(4) + tls(4), + sctp_tls(5), + ws(6), + wss(7) } --- REFERENCE "RFC 3261, Section 18" +-- REFERENCE "RFC 4780, SipTCTransportProtocol" KamailioSIPEntityRole ::= TEXTUAL-CONVENTION STATUS current @@ -68,13 +74,20 @@ KamailioSIPEntityRole ::= TEXTUAL-CONVENTION "This convention defines the role of a SIP entity. Examples of SIP entities are proxies, user agents, redirect servers, registrars or combinations of - the above." + the above. + Kamailio adds the role 'edgeproxyServer' for + operation of a SIP outbound edge proxy node. + Kamailio adds the role 'sipcaptureServer' for + operation of a Homer SIPcapture node." + " SYNTAX BITS { other(0), userAgent(1), proxyServer(2), redirectServer(3), registrarServer(4) + edgeproxyServer(5) + sipcaptureServer(6) } @@ -87,7 +100,6 @@ KamailioSIPMethodIdentifier ::= TEXTUAL-CONVENTION of all defined SIP methods. Experimental support of extension methods is - acceptable and expected. Extention methods are those defined in Internet-Draft documents but not yet allocated an official number by IANA. diff --git a/modules/snmpstats/snmpSIPCommonObjects.c b/modules/snmpstats/snmpSIPCommonObjects.c index f4244d5..44ffa9d 100644 --- a/modules/snmpstats/snmpSIPCommonObjects.c +++ b/modules/snmpstats/snmpSIPCommonObjects.c @@ -502,6 +502,12 @@ int handleSipEntityType( modparam_t type, void* val) else if (strcasecmp(strEntityType, "registrarServer") == 0) { kamailioEntityType |= TC_SIP_ENTITY_ROLE_REGISTRAR_SERVER; } + else if (strcasecmp(strEntityType, "edgeproxyServer") == 0) { + kamailioEntityType |= TC_SIP_ENTITY_ROLE_EDGEPROXY_SERVER; + } + else if (strcasecmp(strEntityType, "sipcaptureServer") == 0) { + kamailioEntityType |= TC_SIP_ENTITY_ROLE_SIPCAPTURE_SERVER; + } else { LM_ERR("The configuration file specified sipEntityType=%s," " an unknown type\n", strEntityType); diff --git a/modules/snmpstats/snmpstats_globals.h b/modules/snmpstats/snmpstats_globals.h index 431e907..1eb37ed 100644 --- a/modules/snmpstats/snmpstats_globals.h +++ b/modules/snmpstats/snmpstats_globals.h @@ -73,6 +73,8 @@ #define TC_SIP_ENTITY_ROLE_PROXY_SERVER (128 >> 2) #define TC_SIP_ENTITY_ROLE_REDIRECT_SERVER (128 >> 3) #define TC_SIP_ENTITY_ROLE_REGISTRAR_SERVER (128 >> 4) +#define TC_SIP_ENTITY_ROLE_EDGEPROXY_SERVER (128 >> 5) +#define TC_SIP_ENTITY_ROLE_SIPCAPTURE_SERVER (128 >> 6) #define TC_SIP_OPTION_TAG_REQUIRE (128 >> 0) #define TC_SIP_OPTION_TAG_PROXY_REQUIRE (128 >> 1)

11 years, 8 months

← Newer
1
...
30
31
32
33
34
35
36
...
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