sr-dev August 2012

sr-dev@lists.kamailio.org

30 participants
169 discussions

git:master: pkg/kamailio/rpm: execute 'success' for start operation

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f9c5c389b2412d23f1fdd35c6e97dfe7dbe44811 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f9c5c38… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 14 11:19:08 2012 +0200 pkg/kamailio/rpm: execute 'success' for start operation - reported by Andre --- pkg/kamailio/rpm/kamailio.init | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/rpm/kamailio.init b/pkg/kamailio/rpm/kamailio.init index a11a7d7..93742db 100644 --- a/pkg/kamailio/rpm/kamailio.init +++ b/pkg/kamailio/rpm/kamailio.init @@ -53,7 +53,7 @@ start() { daemon $KAM $OPTIONS >/dev/null 2>/dev/null RETVAL=$? echo - [ $RETVAL = 0 ] && touch $LOCK_FILE + [ $RETVAL = 0 ] && touch $LOCK_FILE && success return $RETVAL }

11 years, 9 months

git:pd/outbound: pkg/kamailio/(centos|fedora): updated CentOS/ Fedora build to add Outbound module stub

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: b215201ca00712ef3cf1af9e2d46111ac39cd671 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b215201… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 14 09:19:49 2012 +0100 pkg/kamailio/(centos|fedora): updated CentOS/Fedora build to add Outbound module stub --- pkg/kamailio/centos/6/kamailio-build.appl | 2 +- pkg/kamailio/centos/6/kamailio.appl | 2 +- pkg/kamailio/fedora/16/kamailio-build.appl | 2 +- pkg/kamailio/fedora/16/kamailio.appl | 2 +- pkg/kamailio/fedora/16/kamailio.spec | 29 +++++++++++++++++++++++---- pkg/kamailio/fedora/17/kamailio-build.appl | 2 +- pkg/kamailio/fedora/17/kamailio.appl | 2 +- 7 files changed, 30 insertions(+), 11 deletions(-) diff --git a/pkg/kamailio/centos/6/kamailio-build.appl b/pkg/kamailio/centos/6/kamailio-build.appl index 7496687..f47f52c 100644 --- a/pkg/kamailio/centos/6/kamailio-build.appl +++ b/pkg/kamailio/centos/6/kamailio-build.appl @@ -29,7 +29,7 @@ packages: - mysql-devel # kamailio-mysql - net-snmp-devel # kamailio-snmpstats - openldap-devel # kamailio-ldap - - openssl-devel # kamailio-tls, kamailio-websocket + - openssl-devel # kamailio-outbound, kamailio-tls, kamailio-websocket - pcre-devel # kamailio-regex, kamailio-dialplan, kamailio-lcr - postgresql-devel # kamailio-postgresql - python-devel # kamailio-python diff --git a/pkg/kamailio/centos/6/kamailio.appl b/pkg/kamailio/centos/6/kamailio.appl index 7dc0efd..762b717 100644 --- a/pkg/kamailio/centos/6/kamailio.appl +++ b/pkg/kamailio/centos/6/kamailio.appl @@ -23,7 +23,7 @@ packages: - mysql-libs # kamailio-mysql - net-snmp-libs # kamailio-snmpstats - openldap # kamailio-ldap - - openssl # kamailio-tls, kamailio-websocket + - openssl # kamailio-outbound, kamailio-tls, kamailio-websocket - pcre # kamailio-regex, kamailio-dialplan, kamailio-lcr - perl-Authen-SASL # kamailio-perl - perl-LDAP # kamailio-perl diff --git a/pkg/kamailio/fedora/16/kamailio-build.appl b/pkg/kamailio/fedora/16/kamailio-build.appl index bbdc185..7976632 100644 --- a/pkg/kamailio/fedora/16/kamailio-build.appl +++ b/pkg/kamailio/fedora/16/kamailio-build.appl @@ -34,7 +34,7 @@ packages: - mysql-devel # kamailio-mysql - net-snmp-devel # kamailio-snmpstats - openldap-devel # kamailio-ldap - - openssl-devel # kamailio-tls, kamailio-websocket + - openssl-devel # kamailio-outbound, kamailio-tls, kamailio-websocket - pcre-devel # kamailio-regex, kamailio-dialplan, kamailio-lcr - postgresql-devel # kamailio-postgresql - python-devel # kamailio-python diff --git a/pkg/kamailio/fedora/16/kamailio.appl b/pkg/kamailio/fedora/16/kamailio.appl index e275735..801e77b 100644 --- a/pkg/kamailio/fedora/16/kamailio.appl +++ b/pkg/kamailio/fedora/16/kamailio.appl @@ -28,7 +28,7 @@ packages: - mysql-libs # kamailio-mysql - net-snmp-libs # kamailio-snmpstats - openldap # kamailio-ldap - - openssl # kamailio-tls, kamailio-websocket + - openssl # kamailio-outbound, kamailio-tls, kamailio-websocket - pcre # kamailio-regex, kamailio-dialplan, kamailio-lcr - perl-Authen-SASL # kamailio-perl - perl-LDAP # kamailio-perl diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index fdaf822..73ec187 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -25,7 +25,7 @@ Conflicts: kamailio-xmlrpc < %ver, kamailio-perl < %ver, kamailio-lua < %ver Conflicts: kamailio-python < %ver, kamailio-regex < %ver Conflicts: kamailio-dialplan < %ver, kamailio-lcr < %ver Conflicts: kamailio-xmlops < %ver, kamailio-cdp < %ver -Conflicts: kamailio-websocket < %ver +Conflicts: kamailio-websocket < %ver, kamailio-outbound < %ver %if 0%{?fedora} Conflicts: kamailio-radius < %ver, kamailio-carrierroute < %ver Conflicts: kamailio-redis < %ver, kamailio-json < %ver @@ -260,6 +260,17 @@ BuildRequires: openssl-devel, libunistring-devel WebSocket transport for Kamailio. +%package outbound +Summary: Outbound (RFC 5626) support for Kamailio. +Group: System Environment/Daemons +Requires: openssl, kamailio = %ver +BuildRequires: openssl-devel + +%description outbound +RFC 5626, "Managing Client-Initiated Connections in the Session Initiation +Protocol (SIP)" support for Kamailio. + + %package purple Summary: Multi-protocol IM and presence gateway module. Group: System Environment/Daemons @@ -363,14 +374,14 @@ make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\ db_oracle memcached mi_xmlrpc osp" group_include="kstandard kmysql\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kcarrierroute kpresence kradius kgeoip kregex kdialplan\ - klcr ksqlite kredis kjson kmono kberkeley kwebsocket"\ + klcr ksqlite kredis kjson kmono kberkeley kwebsocket koutbound"\ include_modules="xmlrpc xmlops cdp cdp_avp" %else make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\ db_oracle memcached mi_xmlrpc osp" group_include="kstandard kmysql\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kpresence kregex kdialplan\ - klcr ksqlite kberkeley kwebsocket"\ + klcr ksqlite kberkeley kwebsocket koutbound"\ include_modules="xmlrpc xmlops cdp cdp_avp" %endif @@ -385,7 +396,7 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ db_oracle memcached mi_xmlrpc osp" group_include="kstandard kmysql\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kcarrierroute kpresence kradius kgeoip kregex kdialplan\ - klcr ksqlite kredis kjson kmono kberkeley kwebsocket"\ + klcr ksqlite kredis kjson kmono kberkeley kwebsocket koutbound"\ include_modules="xmlrpc xmlops cdp cdp_avp" mkdir -p $RPM_BUILD_ROOT/%{_unitdir} @@ -400,7 +411,7 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ db_oracle memcached mi_xmlrpc osp" group_include="kstandard kmysql\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kpresence kregex kdialplan\ - klcr ksqlite kberkeley kwebsocket"\ + klcr ksqlite kberkeley kwebsocket koutbound"\ include_modules="xmlrpc xmlops cdp cdp_avp" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d @@ -928,6 +939,12 @@ fi %{_libdir}/kamailio/modules/websocket.so +%files outbound +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.outbound +%{_libdir}/kamailio/modules/outbound.so + + %if 0%{?fedora} %files radius %defattr(-,root,root) @@ -976,6 +993,8 @@ fi %changelog +* Mon Aug 13 2012 Peter Dunkley <peter(a)dunkley.me.uk> + - Added Outbound module * Fri Jul 13 2012 Peter Dunkley <peter(a)dunkley.me.uk> - Updated rel to dev2 * Thu Jul 5 2012 Peter Dunkley <peter(a)dunkley.me.uk> diff --git a/pkg/kamailio/fedora/17/kamailio-build.appl b/pkg/kamailio/fedora/17/kamailio-build.appl index ccb1257..e7b5c5b 100644 --- a/pkg/kamailio/fedora/17/kamailio-build.appl +++ b/pkg/kamailio/fedora/17/kamailio-build.appl @@ -35,7 +35,7 @@ packages: - mysql-devel # kamailio-mysql - net-snmp-devel # kamailio-snmpstats - openldap-devel # kamailio-ldap - - openssl-devel # kamailio-tls, kamailio-websocket + - openssl-devel # kamailio-outbound, kamailio-tls, kamailio-websocket - pcre-devel # kamailio-regex, kamailio-dialplan, kamailio-lcr - postgresql-devel # kamailio-postgresql - python-devel # kamailio-python diff --git a/pkg/kamailio/fedora/17/kamailio.appl b/pkg/kamailio/fedora/17/kamailio.appl index 1b46a1d..fb66522 100644 --- a/pkg/kamailio/fedora/17/kamailio.appl +++ b/pkg/kamailio/fedora/17/kamailio.appl @@ -29,7 +29,7 @@ packages: - mysql-libs # kamailio-mysql - net-snmp-libs # kamailio-snmpstats - openldap # kamailio-ldap - - openssl # kamailio-tls, kamailio-websocket + - openssl # kamailio-outbound, kamailio-tls, kamailio-websocket - pcre # kamailio-regex, kamailio-dialplan, kamailio-lcr - perl-Authen-SASL # kamailio-perl - perl-LDAP # kamailio-perl

11 years, 9 months

git:pd/outbound: Makefile: added Outbound stub module

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: c9b45176a1e3a55820c98f4907927ee217007e2e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9b4517… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 14 09:17:16 2012 +0100 Makefile: added Outbound stub module --- Makefile | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 49a73e3..c8f09a7 100644 --- a/Makefile +++ b/Makefile @@ -194,7 +194,7 @@ module_group_stable=cpl-c dbtext jabber osp sms pdb # Modules in this group are either not complete, untested, or without enough # reports of usage to allow the module into the stable group. They may or may # not have dependencies -module_group_experimental=tls oracle iptrtpproxy ndb_redis async websocket +module_group_experimental=tls oracle iptrtpproxy ndb_redis async websocket outbound # For cassandra module_group_cassandra_driver=db_cassandra @@ -267,6 +267,9 @@ module_group_ktls=tls # K websocket module module_group_kwebsocket=websocket +# K outbound module +module_group_koutbound=outbound + # K presence modules module_group_kpresence=presence presence_dialoginfo presence_mwi presence_xml presence_profile\ pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp \ @@ -317,7 +320,7 @@ else presence_dialoginfo presence_xml pua pua_bla \ pua_dialoginfo pua_usrloc pua_xmpp \ regex xcap_client xcap_server presence_conference \ - presence_reginfo pua_reginfo websocket + presence_reginfo pua_reginfo websocket outbound #excluded because they depend on external *.h files exclude_modules+= h350 # excluded because they do not compile (remove them only after they are

11 years, 9 months

Git push problems

by Peter Dunkley

Hi, I've been having some problems with git this evening. Earlier today (at the office) I created a branch to start the Outbound development on. This evening (at home, on another computer) I checked out this branch using "git checkout -b outbound origin/pd/outbound" I added some files, made some changes, and committed them to the local branch, but I can't seem to push these changes. When I do "git push" I get "Everything up-to-date" - which is not the case. When I try something more specific like "git push origin origin/pd/outbound" I get: Total 0 (delta 0), reused 0 (delta 0) remote: error: hook declined to update refs/remotes/origin/pd/outbound To ssh://pd@git.sip-router.org/sip-router ! [remote rejected] origin/pd/outbound -> origin/pd/outbound (hook declined) error: failed to push some refs to 'ssh://pd@git.sip-router.org/sip-router' I have pushed some fixes to master this evening from this same computer - so it must be something to do with the branch or the "git push" operation itself. I'm sure I've just done something stupid... but I can't think what it might be. Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

11 years, 9 months

git:pd/outbound: modules_k/outbound: added stub module for Outbound

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 82de81e6becd747f84f67b360c510e3edbeeedf3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82de81e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 14 09:15:51 2012 +0100 modules_k/outbound: added stub module for Outbound --- modules_k/outbound/Makefile | 27 +++++ modules_k/outbound/README | 67 +++++++++++++ modules_k/outbound/api.h | 52 ++++++++++ modules_k/outbound/doc/Makefile | 4 + modules_k/outbound/doc/outbound.xml | 33 ++++++ modules_k/outbound/doc/outbound_admin.xml | 59 +++++++++++ modules_k/outbound/ob_mod.c | 151 +++++++++++++++++++++++++++++ 7 files changed, 393 insertions(+), 0 deletions(-) diff --git a/modules_k/outbound/Makefile b/modules_k/outbound/Makefile new file mode 100644 index 0000000..148a900 --- /dev/null +++ b/modules_k/outbound/Makefile @@ -0,0 +1,27 @@ +# $Id$ +# +# +# WARNING: do not run this directly, it should be run by the master Makefile + +include ../../Makefile.defs +auto_gen= +NAME=outbound.so + +BUILDER = $(shell which pkg-config) +ifeq ($(BUILDER),) + DEFS+= -I$(LOCALBASE)/ssl/include + LIBS= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \ + -L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \ + -lssl +else + DEFS+= $(shell pkg-config --cflags libssl) + LIBS= $(shell pkg-config --libs libssl) +endif + +DEFS+=-DOPENSER_MOD_INTERFACE + +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/kcore/kcore +SER_LIBS+=$(SERLIBPATH)/kmi/kmi + +include ../../Makefile.modules diff --git a/modules_k/outbound/README b/modules_k/outbound/README new file mode 100644 index 0000000..7feab22 --- /dev/null +++ b/modules_k/outbound/README @@ -0,0 +1,67 @@ +Outbound Module + +Peter Dunkley + + Crocodile RCS Ltd + + Copyright © 2012 Crocodile RCS Ltd + __________________________________________________________________ + + Table of Contents + + 1. Admin Guide + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Parameters + 4. Functions + 5. MI Commands + +Chapter 1. Admin Guide + + Table of Contents + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Parameters + 4. Functions + 5. MI Commands + +1. Overview + + ... + +2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + +2.1. Kamailio Modules + + ... + +2.2. External Libraries or Applications + + The following libraries must be installed before running Kamailio with + this module loaded: + * OpenSSL. + +3. Parameters + + ... + +4. Functions + + ... + +5. MI Commands + + ... diff --git a/modules_k/outbound/api.h b/modules_k/outbound/api.h new file mode 100644 index 0000000..117ce49 --- /dev/null +++ b/modules_k/outbound/api.h @@ -0,0 +1,52 @@ +/* + * $Id$ + * + * Copyright (C) 2012 Crocodile RCS Ltd + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef OB_API_H +#define OB_API_H + +typedef int (*ob_fn1_t)(int, int, int); +typedef int (*ob_fn2_t)(int, int, int); +typedef int (*ob_fn3_t)(int, int, int); + +typedef struct ob_binds { + ob_fn1_t ob_fn1; + ob_fn2_t ob_fn2; + ob_fn3_t ob_fn3; +} ob_api_t; + +typedef int (*bind_ob_f)(ob_api_t*); + +int bind_ob(struct ob_binds*); + +inline static int ob_load_api(ob_api_t *pxb) +{ + bind_ob_f bind_ob_exports; + if (!(bind_ob_exports = (bind_ob_f)find_export("bind_ob", 1, 0))) + { + LM_ERR("Failed to import bind_ob\n"); + return -1; + } + return bind_ob_exports(pxb); +} + +#endif /* OB_API_H */ diff --git a/modules_k/outbound/doc/Makefile b/modules_k/outbound/doc/Makefile new file mode 100644 index 0000000..2b088ac --- /dev/null +++ b/modules_k/outbound/doc/Makefile @@ -0,0 +1,4 @@ +docs = outbound.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules_k/outbound/doc/outbound.xml b/modules_k/outbound/doc/outbound.xml new file mode 100644 index 0000000..fcf307c --- /dev/null +++ b/modules_k/outbound/doc/outbound.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + +<book xmlns:xi="http://www.w3.org/2001/XInclude"> + <bookinfo> + <title>Outbound Module</title> + <productname class="trade">&kamailioname;</productname> + <authorgroup> + <author> + <firstname>Peter</firstname> + <surname>Dunkley</surname> + <affiliation><orgname>Crocodile RCS Ltd</orgname></affiliation> + <address> + <email>peter.dunkley(a)crocodile-rcs.com</email> + </address> + </author> + </authorgroup> + <copyright> + <year>2012</year> + <holder>Crocodile RCS Ltd</holder> + </copyright> + </bookinfo> + <toc></toc> + + <xi:include href="outbound_admin.xml"/> +</book> diff --git a/modules_k/outbound/doc/outbound_admin.xml b/modules_k/outbound/doc/outbound_admin.xml new file mode 100644 index 0000000..0a08053 --- /dev/null +++ b/modules_k/outbound/doc/outbound_admin.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + + +<chapter> + + <title>&adminguide;</title> + + <section> + <title>Overview</title> + <para>...</para> + </section> + + <section> + <title>Dependencies</title> + <section> + <title>&kamailio; Modules</title> + <para>...</para> + </section> + + <section> + <title>External Libraries or Applications</title> + <para> + The following libraries must be installed before running + &kamailio; with this module loaded: + <itemizedlist> + <listitem> + <para><emphasis>OpenSSL</emphasis>.</para> + </listitem> + </itemizedlist> + </para> + </section> + </section> + + + <section> + <title>Parameters</title> + <para>...</para> + </section> + + <section> + <title>Functions</title> + <para>...</para> + </section> + + <section> + <title>MI Commands</title> + <para>...</para> + </section> + +</chapter> + diff --git a/modules_k/outbound/ob_mod.c b/modules_k/outbound/ob_mod.c new file mode 100644 index 0000000..858dac1 --- /dev/null +++ b/modules_k/outbound/ob_mod.c @@ -0,0 +1,151 @@ +/* + * $Id$ + * + * Copyright (C) 2012 Crocodile RCS Ltd + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "../../dprint.h" +#include "../../sr_module.h" +#include "../../lib/kcore/kstats_wrapper.h" +#include "../../lib/kmi/mi.h" + +#include "api.h" + +MODULE_VERSION + +static int mod_init(void); +static int child_init(int rank); +static void destroy(void); + +static int ob_force_bflag = -1; +static str ob_key = {0, 0}; + +static cmd_export_t cmds[]= +{ + { "bind_ob", (cmd_function) bind_ob, + 1, 0, 0, + 0 }, + { 0, 0, 0, 0, 0, 0 } +}; + +static param_export_t params[]= +{ + { "force_outbound_bflag", INT_PARAM, &ob_force_bflag }, + { "flow_token_key", STR_PARAM, &ob_key.s}, + { 0, 0, 0 } +}; + +static stat_export_t stats[] = +{ + { 0, 0, 0 } +}; + +static mi_export_t mi_cmds[] = +{ + { 0, 0, 0, 0, 0 } +}; + +struct module_exports exports= +{ + "outbound", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* Exported functions */ + params, /* Exported parameters */ + stats, /* exported statistics */ + mi_cmds, /* exported MI functions */ + 0, /* exported pseudo-variables */ + 0, /* extra processes */ + mod_init, /* module initialization function */ + 0, /* response function */ + destroy, /* destroy function */ + child_init /* per-child initialization function */ +}; + +static int mod_init(void) +{ + if (register_module_stats(exports.name, stats) != 0) + { + LM_ERR("registering core statistics\n"); + return -1; + } + + if (register_mi_mod(exports.name, mi_cmds) != 0) + { + LM_ERR("registering MI commands\n"); + return -1; + } + + if (ob_force_bflag == -1) + { + LM_ERR("force_outbound_bflag not set\n"); + return -1; + } + + if (ob_key.s == 0) + { + LM_ERR("flow_token_key not set\n"); + return -1; + } + else + ob_key.len = strlen(ob_key.s); + + return 0; +} + +static int child_init(int rank) +{ + /* TODO */ + return 0; +} + +static void destroy(void) +{ + /* TODO */ +} + +int ob_fn1(int p1, int p2, int p3) +{ + return 0; +} + +int ob_fn2(int p1, int p2, int p3) +{ + return 0; +} + +int ob_fn3(int p1, int p2, int p3) +{ + return 0; +} + +int bind_ob(struct ob_binds *pxb) +{ + if (pxb == NULL) + { + LM_WARN("bind_outbound: Cannot load outbound API into NULL pointer\n"); + return -1; + } + + pxb->ob_fn1 = ob_fn1; + pxb->ob_fn2 = ob_fn2; + pxb->ob_fn3 = ob_fn3; + + return 0; +}

11 years, 9 months

git:master: modules/websocket: removed another magic number

by Peter Dunkley

Module: sip-router Branch: master Commit: dfbb0af56aec99e3c76476bba16c54cf0d7d928f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dfbb0af… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Aug 13 22:46:49 2012 +0100 modules/websocket: removed another magic number --- modules/websocket/ws_handshake.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index 8e7b328..a874eac 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -78,8 +78,7 @@ static str str_status_service_unavailable = str_init("Service Unavailable"); #define HDR_BUF_LEN (256) static char headers_buf[HDR_BUF_LEN]; -#define KEY_BUF_LEN (28) -static char key_buf[KEY_BUF_LEN]; +static char key_buf[base64_enc_len(SHA_DIGEST_LENGTH)]; static int ws_send_reply(sip_msg_t *msg, int code, str *reason, str *hdrs) { @@ -289,7 +288,8 @@ int ws_handle_handshake(struct sip_msg *msg) pkg_free(reply_key.s); reply_key.s = key_buf; reply_key.len = base64_enc(sha1, SHA_DIGEST_LENGTH, - (unsigned char *) reply_key.s, KEY_BUF_LEN); + (unsigned char *) reply_key.s, + base64_enc_len(SHA_DIGEST_LENGTH)); /* Add the connection to the WebSocket connection table */ wsconn_add(msg->rcv);

11 years, 9 months

git:master: modules/websocket: Replaced magic number

by Peter Dunkley

Module: sip-router Branch: master Commit: 8d3eec4f8fbfb2d037e09b80c5d45b5fc400f729 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d3eec4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Aug 13 21:55:37 2012 +0100 modules/websocket: Replaced magic number --- modules/websocket/ws_handshake.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index d8e34f8..8e7b328 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -110,7 +110,7 @@ static int ws_send_reply(sip_msg_t *msg, int code, str *reason, str *hdrs) int ws_handle_handshake(struct sip_msg *msg) { str key = {0, 0}, headers = {0, 0}, reply_key = {0, 0}; - unsigned char sha1[20]; + unsigned char sha1[SHA_DIGEST_LENGTH]; unsigned int hdr_flags = 0; int version; struct hdr_field *hdr = msg->headers; @@ -288,7 +288,7 @@ int ws_handle_handshake(struct sip_msg *msg) SHA1((const unsigned char *) reply_key.s, reply_key.len, sha1); pkg_free(reply_key.s); reply_key.s = key_buf; - reply_key.len = base64_enc(sha1, 20, + reply_key.len = base64_enc(sha1, SHA_DIGEST_LENGTH, (unsigned char *) reply_key.s, KEY_BUF_LEN); /* Add the connection to the WebSocket connection table */

11 years, 9 months

git:3.3: modules/lcr, modules_k/regex: Fix stack overflow from pcre_fullinfo(PCRE_INFO_SIZE)

by Richard Fuchs

Module: sip-router Branch: 3.3 Commit: ff72de945a70b9eedb6eca08677b93e618faeb94 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff72de9… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Mon Aug 13 13:10:37 2012 -0400 modules/lcr, modules_k/regex: Fix stack overflow from pcre_fullinfo(PCRE_INFO_SIZE) Fix instances where pcre_fullinfo(PCRE_INFO_SIZE) was given only an "int" argument, which results in stack overflow on some 64-bit platforms where an "int" is only 32 bits long. It expects a "size_t" argument, which is 64 bits long. --- modules/lcr/lcr_mod.c | 3 ++- modules_k/regex/regex_mod.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 3bdcc98..d02d72f 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -758,7 +758,8 @@ static pcre *reg_ex_comp(const char *pattern) { pcre *re, *result; const char *error; - int rc, size, err_offset; + int rc, err_offset; + size_t size; re = pcre_compile(pattern, 0, &error, &err_offset, NULL); if (re == NULL) { diff --git a/modules_k/regex/regex_mod.c b/modules_k/regex/regex_mod.c index 51665aa..eb9f744 100644 --- a/modules_k/regex/regex_mod.c +++ b/modules_k/regex/regex_mod.c @@ -260,7 +260,7 @@ static int load_pcres(int action) char line[FILE_MAX_LINE]; char **patterns = NULL; pcre *pcre_tmp = NULL; - int pcre_size; + size_t pcre_size; int pcre_rc; const char *pcre_error; int pcre_erroffset;

11 years, 9 months

git:master: modules/lcr, modules_k/regex: Fix stack overflow from pcre_fullinfo(PCRE_INFO_SIZE)

by Richard Fuchs

Module: sip-router Branch: master Commit: 87742f9cd82a7da2da2cab59ea4e6338c76fa3c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=87742f9… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Mon Aug 13 13:10:37 2012 -0400 modules/lcr, modules_k/regex: Fix stack overflow from pcre_fullinfo(PCRE_INFO_SIZE) Fix instances where pcre_fullinfo(PCRE_INFO_SIZE) was given only an "int" argument, which results in stack overflow on some 64-bit platforms where an "int" is only 32 bits long. It expects a "size_t" argument, which is 64 bits long. --- modules/lcr/lcr_mod.c | 3 ++- modules_k/regex/regex_mod.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 6627b43..6574229 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -758,7 +758,8 @@ static pcre *reg_ex_comp(const char *pattern) { pcre *re, *result; const char *error; - int rc, size, err_offset; + int rc, err_offset; + size_t size; re = pcre_compile(pattern, 0, &error, &err_offset, NULL); if (re == NULL) { diff --git a/modules_k/regex/regex_mod.c b/modules_k/regex/regex_mod.c index 51665aa..eb9f744 100644 --- a/modules_k/regex/regex_mod.c +++ b/modules_k/regex/regex_mod.c @@ -260,7 +260,7 @@ static int load_pcres(int action) char line[FILE_MAX_LINE]; char **patterns = NULL; pcre *pcre_tmp = NULL; - int pcre_size; + size_t pcre_size; int pcre_rc; const char *pcre_error; int pcre_erroffset;

11 years, 9 months

git:pd/outbound: modules_k/rls: Added DB transaction code around rls_presentity insert/replace

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 65dcb2d0e72757d51b0ee51c457c5440278444bc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65dcb2d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Aug 13 15:50:05 2012 +0100 modules_k/rls: Added DB transaction code around rls_presentity insert/replace --- modules_k/rls/resource_notify.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index bf9aa0d..8937131 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -767,6 +767,15 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) goto error; } + if (dbmode == RLS_DB_ONLY && rlpres_dbf.start_transaction) + { + if (rlpres_dbf.start_transaction(rlpres_db) < 0) + { + LM_ERR("in start_transaction\n"); + goto error; + } + } + if (rlpres_dbf.replace != NULL) { if(rlpres_dbf.replace(rlpres_db, query_cols, query_vals, n_query_cols, @@ -796,7 +805,16 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) LM_DBG("Inserted in database table new record\n"); } } - + + if (dbmode == RLS_DB_ONLY && rlpres_dbf.end_transaction) + { + if (rlpres_dbf.end_transaction(rlpres_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } + } + LM_DBG("Updated rlpres_table\n"); /* reply 200OK */ done: @@ -831,6 +849,13 @@ error: if (reason.s) pkg_free(reason.s); free_to_params(&TO); + + if (dbmode == RLS_DB_ONLY && rlpres_dbf.abort_transaction) + { + if (rlpres_dbf.abort_transaction(rlpres_db) < 0) + LM_ERR("in abort_transaction\n"); + } + return -1; }

11 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2012