sr-dev December 2013

sr-dev@lists.kamailio.org

30 participants
318 discussions

git:vseva/merge_deb: pkg/kamailio/deb: fixing squeeze

by Victor Seva

Module: sip-router Branch: vseva/merge_deb Commit: 2600774a8bb91061ed49b10d04922aa60dc9da27 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2600774… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Mon Dec 16 16:58:20 2013 +0100 pkg/kamailio/deb: fixing squeeze --- pkg/kamailio/deb/squeeze/rules | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index 9587cd7..1dc3a8e 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -79,11 +79,6 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif -# CFLAGS + CPPFLAGS -> CC_EXTRA_OPTS -# LDFLAGS -> LD_EXTRA_OPTS -CUSTOM_BUILDFLAGS:=$(shell dpkg-buildflags --export=configure| \ -sed -e 's/" CPPFLAGS="/ /' -e 's/CFLAGS/CC_EXTRA_OPTS/g' -e 's/LDFLAGS/LD_EXTRA_OPTS/g') - configure: configure-stamp configure-stamp: dh_testdir @@ -92,9 +87,7 @@ configure-stamp: cfg_target=/etc/kamailio/ \ basedir=$(CURDIR)/debian/kamailio \ skip_modules="$(EXCLUDED_MODULES) $(EXTRA_EXCLUDED_MODULES)" \ - $(CUSTOM_BUILDFLAGS) \ group_include="kstandard" - touch configure-stamp

10 years, 11 months

git:master: ims_registrar_pcscf: Use correct modparam for configurable fallback2ip

by Hugh Waite

Module: sip-router Branch: master Commit: 2f310077fd5b89ebec0d3ac6e001a0d9ba6702e2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f31007… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Mon Dec 16 15:57:25 2013 +0000 ims_registrar_pcscf: Use correct modparam for configurable fallback2ip --- modules/ims_registrar_pcscf/reg_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ims_registrar_pcscf/reg_mod.c b/modules/ims_registrar_pcscf/reg_mod.c index 8442e54..5df839d 100644 --- a/modules/ims_registrar_pcscf/reg_mod.c +++ b/modules/ims_registrar_pcscf/reg_mod.c @@ -143,7 +143,7 @@ static param_export_t params[] = { {"received_avp", STR_PARAM, &rcv_avp_param }, - {"is_registered_fallback2ip", INT_PARAM, &pending_reg_expires }, + {"is_registered_fallback2ip", INT_PARAM, &is_registered_fallback2ip }, // {"ims_mode", INT_PARAM, &registrar_ims_mode }, /* 0-PCSCF ; 1-SCSCF */

10 years, 11 months

git:vseva/merge_deb: pkg/kamailio/deb: fixing squeeze

by Victor Seva

Module: sip-router Branch: vseva/merge_deb Commit: 3965377350a0e077113226f7bd2582a718c2cc95 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3965377… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Mon Dec 16 12:39:31 2013 +0100 pkg/kamailio/deb: fixing squeeze --- pkg/kamailio/deb/squeeze/control | 65 ++------------------------------------ pkg/kamailio/deb/squeeze/rules | 8 +---- 2 files changed, 4 insertions(+), 69 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=396…

10 years, 11 months

git:vseva/merge_deb: pkg/kamailio/deb: remove redis on squeeze

by Victor Seva

Module: sip-router Branch: vseva/merge_deb Commit: 989cfe35ef3f6fe971b84d97b1c9a2bc1a6810b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=989cfe3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Mon Dec 16 12:15:50 2013 +0100 pkg/kamailio/deb: remove redis on squeeze --- pkg/kamailio/deb/squeeze/control | 15 +-------------- pkg/kamailio/deb/squeeze/rules | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control index 512ddbd..b5ff4a7 100644 --- a/pkg/kamailio/deb/squeeze/control +++ b/pkg/kamailio/deb/squeeze/control @@ -14,7 +14,6 @@ Build-Depends: bison, libevent-dev, libexpat1-dev, libgeoip-dev (>= 1.4.5), - libhiredis-dev (>= 0.10.0), libjson0-dev, libldap2-dev, liblua5.1-0-dev, @@ -48,7 +47,7 @@ Architecture: linux-any Multi-Arch: foreign Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, python, adduser -Suggests: kamailio-mysql-modules, kamailio-postgres-modules, kamailio-unixodbc-modules, kamailio-cpl-modules, kamailio-radius-modules, kamailio-presence-modules, kamailio-xml-modules, kamailio-perl-modules, kamailio-snmpstats-modules, kamailio-xmpp-modules, kamailio-carrierroute-modules, kamailio-berkeley-modules, kamailio-ldap-modules, kamailio-python-modules, kamailio-redis-modules, kamailio-lua-modules +Suggests: kamailio-mysql-modules, kamailio-postgres-modules, kamailio-unixodbc-modules, kamailio-cpl-modules, kamailio-radius-modules, kamailio-presence-modules, kamailio-xml-modules, kamailio-perl-modules, kamailio-snmpstats-modules, kamailio-xmpp-modules, kamailio-carrierroute-modules, kamailio-berkeley-modules, kamailio-ldap-modules, kamailio-python-modules, kamailio-lua-modules Description: very fast and configurable SIP proxy Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls @@ -160,18 +159,6 @@ Description: contains the app_python module This package provides the app_python module, an extension allowing to execute embedded Python applications within configuration file. -Package: kamailio-redis-modules -Architecture: linux-any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version}) -Description: Redis database connectivity module for Kamailio - Kamailio is a very fast and flexible SIP (RFC3261) - proxy server. Written entirely in C, Kamailio can handle thousands calls - per second even on low-budget hardware. - . - This package provides the Redis NOSQL database driver for Kamailio. - Package: kamailio-mysql-modules Architecture: linux-any Multi-Arch: same diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index b328cb7..546eea2 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -35,7 +35,7 @@ EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy purple # on which other depend first) PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils lua memcached \ - snmpstats carrierroute xmpp cpl redis python geoip\ + snmpstats carrierroute xmpp cpl python geoip\ sqlite json ims sctp \ tls outbound websocket autheph

10 years, 11 months

git:vseva/merge_deb: pkg/kamailio/deb: fixing squeeze wheezy

by Victor Seva

Module: sip-router Branch: vseva/merge_deb Commit: 29625a9a41a233db6d3435568ac8e4bcdab3b101 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29625a9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Mon Dec 16 11:45:08 2013 +0100 pkg/kamailio/deb: fixing squeeze wheezy --- pkg/kamailio/deb/squeeze/control | 17 ----------------- pkg/kamailio/deb/squeeze/rules | 2 +- pkg/kamailio/deb/wheezy/control | 14 -------------- pkg/kamailio/deb/wheezy/rules | 2 +- 4 files changed, 2 insertions(+), 33 deletions(-) diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control index c96e651..512ddbd 100644 --- a/pkg/kamailio/deb/squeeze/control +++ b/pkg/kamailio/deb/squeeze/control @@ -13,7 +13,6 @@ Build-Depends: bison, libdb-dev (>= 4.6.19), libevent-dev, libexpat1-dev, - libgcj12-dev, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libjson0-dev, @@ -398,22 +397,6 @@ Description: sctp module for Kamailio . This package provides the sctp module for Kamailio. -Package: kamailio-java-modules -Architecture: linux-any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, - ${shlibs:Depends}, - gjc-jre, - kamailio (= ${binary:Version}) -Description: contains the app_java module - Kamailio is a very fast and flexible SIP (RFC3261) - proxy server. Written entirely in C, Kamailio can handle thousands calls - per second even on low-budget hardware. - . - This package provides the app_java module, an extension allowing to - execute embedded Java applications within configuration file. - Package: kamailio-tls-modules Architecture: linux-any Multi-Arch: same diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index 3a00065..b328cb7 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -36,7 +36,7 @@ EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy purple PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils lua memcached \ snmpstats carrierroute xmpp cpl redis python geoip\ - sqlite json ims sctp java \ + sqlite json ims sctp \ tls outbound websocket autheph # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index b167568..50f54b2 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -33,7 +33,6 @@ Build-Depends: bison, libsnmp-dev, libsqlite3-dev, libunistring-dev, - libval-dev, libxml2-dev, libxmlrpc-c3-dev, openssl, @@ -462,19 +461,6 @@ Description: Websocket module for kamailio . This package contains the module implementing WebSocket transport layer. -Package: kamailio-dnssec-modules -Architecture: linux-any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: kamailio (= ${Source-Version}), - ${shlibs:Depends} -Description: contains the dnssec module - Kamailio is a very fast and flexible SIP (RFC3261) - proxy server. Written entirely in C, Kamailio can handle thousands calls - per second even on low-budget hardware. - . - This package provides the dnssec module for Kamailio. - Package: kamailio-autheph-modules Architecture: linux-any Multi-Arch: same diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules index 748d766..49e6177 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/pkg/kamailio/deb/wheezy/rules @@ -37,7 +37,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils lua memcached \ snmpstats carrierroute xmpp cpl redis python geoip\ sqlite json mono ims sctp java \ - tls outbound websocket autheph dnssec + tls outbound websocket autheph # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)

10 years, 11 months

git:master: ims_registrar_pcscf: Fallback to IP/Port/ Proto search is now configurable; fallback to ip-search will be done, if no contact-header present (and the fallback is enabled).

by Carsten Bock

Module: sip-router Branch: master Commit: 4243c57511007f5af5df6d29939189925fd023da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4243c57… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Dec 16 11:08:29 2013 +0100 ims_registrar_pcscf: Fallback to IP/Port/Proto search is now configurable; fallback to ip-search will be done, if no contact-header present (and the fallback is enabled). Thanks to Camille Oudot & Hugh Waite for the improvement requests! --- modules/ims_registrar_pcscf/reg_mod.c | 4 ++ modules/ims_registrar_pcscf/reg_mod.h | 1 + modules/ims_registrar_pcscf/service_routes.c | 46 +++++++++++++------------- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/modules/ims_registrar_pcscf/reg_mod.c b/modules/ims_registrar_pcscf/reg_mod.c index b2ffe8e..8442e54 100644 --- a/modules/ims_registrar_pcscf/reg_mod.c +++ b/modules/ims_registrar_pcscf/reg_mod.c @@ -79,6 +79,8 @@ char * pcscf_uri = "sip:pcscf.ims.smilecoms.com:4060"; str pcscf_uri_str; unsigned int pending_reg_expires = 30; /**!< parameter for expiry time of a pending registration before receiving confirmation from SCSCF */ +int is_registered_fallback2ip = 0; + char* rcv_avp_param = 0; unsigned short rcv_avp_type = 0; int_str rcv_avp_name; @@ -141,6 +143,8 @@ static param_export_t params[] = { {"received_avp", STR_PARAM, &rcv_avp_param }, + {"is_registered_fallback2ip", INT_PARAM, &pending_reg_expires }, + // {"ims_mode", INT_PARAM, &registrar_ims_mode }, /* 0-PCSCF ; 1-SCSCF */ // {"subscription_max_expires",INT_PARAM, &subscription_max_expires }, diff --git a/modules/ims_registrar_pcscf/reg_mod.h b/modules/ims_registrar_pcscf/reg_mod.h index 71aa17d..d59d7f1 100644 --- a/modules/ims_registrar_pcscf/reg_mod.h +++ b/modules/ims_registrar_pcscf/reg_mod.h @@ -57,6 +57,7 @@ extern unsigned short rcv_avp_type; extern int_str rcv_avp_name; +extern int is_registered_fallback2ip; #endif /* REG_MOD_H */ diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index 80393bc..937d152 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -123,33 +123,33 @@ pcontact_t * getContactP(struct sip_msg* _m, udomain_t* _d) { b = cscf_parse_contacts(_m); - if (!b || !b->contacts) { - LM_DBG("No contacts found\n"); - return NULL; - } - - for (ct = b->contacts; ct; ct = ct->next) { - if (ul.get_pcontact(_d, &ct->uri, &c) == 0) { - if ((c->reg_state == PCONTACT_REGISTERED) && (c->received_port == _m->rcv.src_port) && (c->received_proto == _m->rcv.proto)) { - received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); - received_host.s = srcip; - LM_DBG("Received host len %d (search %d)\n", c->received_host.len, received_host.len); - // Then check the length: - if (c->received_host.len == received_host.len) { - LM_DBG("Received host %.*s (search %.*s)\n", - c->received_host.len, c->received_host.s, - received_host.len, received_host.s); - - // Finally really compare the "received_host" - if (!memcmp(c->received_host.s, received_host.s, received_host.len)) - break; - c = NULL; + if (b && b->contacts) { + for (ct = b->contacts; ct; ct = ct->next) { + if (ul.get_pcontact(_d, &ct->uri, &c) == 0) { + if ((c->reg_state == PCONTACT_REGISTERED) && (c->received_port == _m->rcv.src_port) && (c->received_proto == _m->rcv.proto)) { + received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); + received_host.s = srcip; + LM_DBG("Received host len %d (search %d)\n", c->received_host.len, received_host.len); + // Then check the length: + if (c->received_host.len == received_host.len) { + LM_DBG("Received host %.*s (search %.*s)\n", + c->received_host.len, c->received_host.s, + received_host.len, received_host.s); + + // Finally really compare the "received_host" + if (!memcmp(c->received_host.s, received_host.s, received_host.len)) + break; + c = NULL; + } } } } + } else { + LM_WARN("No contact-header found\n"); } - if (c == NULL) { - LM_WARN("Contact not found based on Contact, trying IP/Port/Proto\n"); + + if ((c == NULL) && (is_registered_fallback2ip > 0)) { + LM_WARN("Contact not found based on Contact-header, trying IP/Port/Proto\n"); received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); received_host.s = srcip; if (ul.get_pcontact_by_src(_d, &received_host, _m->rcv.src_port, _m->rcv.proto, &c) == 1)

10 years, 11 months

pcscf_is_registered() internals

by Camille Oudot

Hi, I'm currently using the pcscf modules to build an IMS proxy. The pcscf_is_registered() function uses the source IP, port and protocol to search a record in the pcscf location database. In my case, I could have to deal with several UACs using the same source IP and ports, so this approach won't work for me. The pcscf location database is indexed by the contact URI hash, so is there a reason not to use the contact URI to do the lookup? Besides, this should increase the performances when dealing with hundreds of records (the ip/port/protocol lookup is linear). Regards, -- Camille

10 years, 11 months

git:master: Use Contact-Header for Service-Route/Asserted-Identity Lookup, fallback to IP/Port/Proto as fallback

by Carsten Bock

Module: sip-router Branch: master Commit: 82362cd189b1f5dea8b4ec85ac82293576eb5ca4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82362cd… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Dec 9 21:11:38 2013 +0100 Use Contact-Header for Service-Route/Asserted-Identity Lookup, fallback to IP/Port/Proto as fallback --- modules/ims_registrar_pcscf/service_routes.c | 66 ++++++++++++++++++++++---- 1 files changed, 57 insertions(+), 9 deletions(-) diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index ab57cd6..8cff8a4 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -1,7 +1,7 @@ /** * Functions to force or check the service-routes * - * Copyright (c) 2012 Carsten Bock, ng-voice GmbH + * Copyright (c) 2013 Carsten Bock, ng-voice GmbH * * This file is part of Kamailio, a free SIP server. * @@ -112,16 +112,49 @@ static inline int find_next_route(struct sip_msg* _m, struct hdr_field** _hdr) */ pcontact_t * getContactP(struct sip_msg* _m, udomain_t* _d) { ppublic_t * p; + contact_body_t *b = 0; str received_host = {0, 0}; + contact_t *ct; char srcip[50]; if (_m->id != current_msg_id) { current_msg_id = _m->id; c = NULL; - received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); - received_host.s = srcip; - if (ul.get_pcontact_by_src(_d, &received_host, _m->rcv.src_port, _m->rcv.proto, &c) == 1) - LM_WARN("No entry in usrloc for %.*s:%i (Proto %i) found!\n", received_host.len, received_host.s, _m->rcv.src_port, _m->rcv.proto); + + b = cscf_parse_contacts(_m); + + if (!b || !b->contacts) { + LM_DBG("No contacts found\n"); + return NULL; + } + + for (ct = b->contacts; ct; ct = ct->next) { + if (ul.get_pcontact(_d, &ct->uri, &c) == 1) { + if ((c->reg_state == PCONTACT_REGISTERED) && (c->received_port == _m->rcv.src_port) && (c->received_proto == _m->rcv.proto)) { + received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); + received_host.s = srcip; + LM_DBG("Received host len %d (search %d)\n", c->received_host.len, received_host.len); + // Then check the length: + if (c->received_host.len == received_host.len) { + LM_DBG("Received host %.*s (search %.*s)\n", + c->received_host.len, c->received_host.s, + received_host.len, received_host.s); + + // Finally really compare the "received_host" + if (!memcmp(c->received_host.s, received_host.s, received_host.len)) + break; + c = NULL; + } + } + } + } + if (c == NULL) { + LM_WARN("Contact not found based on Contact, trying IP/Port/Proto\n"); + received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); + received_host.s = srcip; + if (ul.get_pcontact_by_src(_d, &received_host, _m->rcv.src_port, _m->rcv.proto, &c) == 1) + LM_DBG("No entry in usrloc for %.*s:%i (Proto %i) found!\n", received_host.len, received_host.s, _m->rcv.src_port, _m->rcv.proto); + } } asserted_identity = NULL; if (c) { @@ -370,9 +403,7 @@ error: * Check, if source is registered. */ int is_registered(struct sip_msg* _m, udomain_t* _d) { - if (getContactP(_m, _d) != NULL) return 1; //I think Carsten wrote this but IMO it should be based on Via, not received IP -// if (getContactP_from_via(_m, _d) != NULL) return 1; // It was really intended that way :-) - + if (getContactP(_m, _d) != NULL) return 1; return -1; } @@ -390,9 +421,26 @@ str * get_asserted_identity(struct sip_msg* _m) { * Add proper asserted identies based on registration */ int assert_identity(struct sip_msg* _m, udomain_t* _d, str identity) { + // Public identities of this contact + struct ppublic * p; + + if (getContactP(_m, _d) != NULL) { + for (p = c->head; p; p = p->next) { + LM_DBG("Public identity: %.*s\n", p->public_identity.len, p->public_identity.s); + /* Check length: */ + if (identity.len == p->public_identity.len) { + /* Check contents: */ + if (strncasecmp(identity.s, p->public_identity.s, identity.len) == 0) { + LM_DBG("Match!\n"); + return 1; + } + } else LM_DBG("Length does not match.\n"); + } + } + LM_WARN("Contact not found based on Contact, trying IP/Port/Proto\n"); str received_host = {0, 0}; char srcip[50]; - + received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); received_host.s = srcip; if (ul.assert_identity(_d, &received_host, _m->rcv.src_port, _m->rcv.proto, &identity) == 0)

10 years, 11 months

git:vseva/merge_deb: pkg/kamailio/deb: merge changes from Debian

by Victor Seva

Module: sip-router Branch: vseva/merge_deb Commit: ed1c923e26db5ba72e8deaefe60cffd7f2d2006d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed1c923… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Mon Dec 16 09:04:15 2013 +0100 pkg/kamailio/deb: merge changes from Debian --- pkg/kamailio/deb/debian/compat | 2 +- pkg/kamailio/deb/debian/control | 654 ++++++++++---------- pkg/kamailio/deb/debian/kamailio-berkeley-bin.dirs | 1 + pkg/kamailio/deb/debian/kamailio.README.Debian | 7 +- pkg/kamailio/deb/debian/kamailio.default | 26 +- pkg/kamailio/deb/debian/kamailio.init | 279 +++------ pkg/kamailio/deb/debian/kamailio.postinst | 28 +- pkg/kamailio/deb/debian/rules | 139 ++--- pkg/kamailio/deb/debian/source/format | 1 + pkg/kamailio/deb/debian/watch | 3 + pkg/kamailio/deb/jessie/compat | 2 +- pkg/kamailio/deb/jessie/control | 654 ++++++++++---------- pkg/kamailio/deb/jessie/kamailio-berkeley-bin.dirs | 1 + pkg/kamailio/deb/jessie/kamailio.README.Debian | 7 +- pkg/kamailio/deb/jessie/kamailio.default | 26 +- pkg/kamailio/deb/jessie/kamailio.init | 279 +++------ pkg/kamailio/deb/jessie/kamailio.postinst | 28 +- pkg/kamailio/deb/jessie/rules | 139 ++--- pkg/kamailio/deb/jessie/source/format | 1 + pkg/kamailio/deb/jessie/watch | 3 + pkg/kamailio/deb/squeeze/changelog | 1 + pkg/kamailio/deb/squeeze/compat | 2 +- pkg/kamailio/deb/squeeze/control | 559 +++++++++-------- .../deb/squeeze/kamailio-berkeley-bin.dirs | 1 + pkg/kamailio/deb/squeeze/kamailio.README.Debian | 7 +- pkg/kamailio/deb/squeeze/kamailio.default | 26 +- pkg/kamailio/deb/squeeze/kamailio.init | 279 +++------ pkg/kamailio/deb/squeeze/kamailio.postinst | 28 +- pkg/kamailio/deb/squeeze/rules | 142 ++--- pkg/kamailio/deb/squeeze/source/format | 1 + pkg/kamailio/deb/squeeze/watch | 3 + pkg/kamailio/deb/wheezy/compat | 2 +- pkg/kamailio/deb/wheezy/control | 617 ++++++++++--------- pkg/kamailio/deb/wheezy/kamailio-berkeley-bin.dirs | 1 + pkg/kamailio/deb/wheezy/kamailio.README.Debian | 7 +- pkg/kamailio/deb/wheezy/kamailio.default | 26 +- pkg/kamailio/deb/wheezy/kamailio.init | 279 +++------ pkg/kamailio/deb/wheezy/kamailio.postinst | 28 +- pkg/kamailio/deb/wheezy/rules | 139 ++--- pkg/kamailio/deb/wheezy/source/format | 1 + pkg/kamailio/deb/wheezy/watch | 3 + 41 files changed, 1975 insertions(+), 2457 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ed1…

10 years, 11 months

git:4.1: db_flatstore: update timestamp for kamailio specific rpc rotate

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: d75bc3b69151a9d0391309e6bb51784f3b6b9a83 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d75bc3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 16 09:26:03 2013 +0100 db_flatstore: update timestamp for kamailio specific rpc rotate - do also in 'rotate' command, not only in 'k_rotate' - from a patch by Abdelkader Allam (cherry picked from commit b15aefa31e45f1ad6a45b64905f9fae24e0f790e) --- modules/db_flatstore/flat_rpc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/db_flatstore/flat_rpc.c b/modules/db_flatstore/flat_rpc.c index 2fe0d0f..5145d83 100644 --- a/modules/db_flatstore/flat_rpc.c +++ b/modules/db_flatstore/flat_rpc.c @@ -32,6 +32,7 @@ #include "flat_rpc.h" #include "flatstore_mod.h" +#include "km_flatstore_mod.h" #include <time.h> @@ -43,6 +44,7 @@ */ static void rotate(rpc_t* rpc, void* c) { + *km_flat_rotate = time(0); *flat_rotate = time(0); }

10 years, 11 months

← Newer
1
...
7
8
9
10
11
12
13
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2013