sr-dev June 2010

sr-dev@lists.kamailio.org

26 participants
164 discussions

git:andrei/raw_sock: raw socket: compilation fixes
by Andrei Pelinescu-Onciul 15 Jun '10

15 Jun '10

Module: sip-router Branch: andrei/raw_sock Commit: d0df7adc45ad9f7a5b253e1f4390084259b97cd3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0df7ad… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jun 15 16:24:46 2010 +0200 raw socket: compilation fixes --- raw_listener.c | 9 +++------ raw_listener.h | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/raw_listener.c b/raw_listener.c index ef707a2..5656a74 100644 --- a/raw_listener.c +++ b/raw_listener.c @@ -26,18 +26,15 @@ #ifdef USE_RAW_SOCKS -#include "../../config.h" -#include "../../receive.h" #include "raw_listener.h" #include "raw_sock.h" -#include "tlb_send.h" -#include "tlb_cfg.h" +#include "receive.h" #include <errno.h> #include <string.h> -struct raw_listen_info* raw_sendipv4=0; +struct socket_info* raw_udp_sendipv4=0; /** creates a raw socket based on a socket_info structure. * Side-effects: sets raw_udp_sendipv4 if not already set. @@ -55,7 +52,7 @@ int raw_listener_init(struct socket_info* si, str* iface, int iphdr_incl) su2ip_addr(&ip, &si->su); sock=raw_udp4_socket(&ip, iface, iphdr_incl); if (sock>=0){ - if (raw_sendipv4==0 || iface==0 || iface->s==0) + if (raw_udp_sendipv4==0 || iface==0 || iface->s==0) raw_udp_sendipv4=si; } return sock; diff --git a/raw_listener.h b/raw_listener.h index 5bc2f58..3ac7d84 100644 --- a/raw_listener.h +++ b/raw_listener.h @@ -27,11 +27,11 @@ #ifndef _raw_listener_h #define _raw_listener_h -#include "../../ip_addr.h" +#include "ip_addr.h" /** default raw socket used for sending on udp ipv4 */ -struct struct_info* raw_udp_sendipv4; +struct socket_info* raw_udp_sendipv4; int raw_listener_init(struct socket_info* si, str* iface, int iphdr_incl); int raw_udp4_rcv_loop(int rsock, int port1, int port2);

1 0

pua_dialoginfo deletes AVPs?
by Jasmin Schnatterbeck 15 Jun '10

15 Jun '10

Hello list, after loading the pua_dialoginfo module I noticed, that AVPs set in a REQUEST_ROUTE are not available anymore within the following branch_route. I tried to examine the situation and recognized, that (for INVITE) the PUBLISH is sent out after calling t_relay (dialog registers callback in tm and pua registers callback in dialog) but before the branch_routes are called. So there seems to be a problem in the code, which sends out the PUBLISH request. Or is this behaviour normal? If not, which information would be needed for debugging? Thank you & Best Regards Jasmin

3 3

git:master: dbg(s): remove module, as its functionality is also provided from cfgutils
by Henning Westerholt 15 Jun '10

15 Jun '10

Module: sip-router Branch: master Commit: 8b446ade643fa84cb4382067bb181f8a6995e38b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b446ad… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 15 12:30:32 2010 +0200 dbg(s): remove module, as its functionality is also provided from cfgutils remove the dbg module, its functionality can be provided from cfgutils: - dbg_msleep(n) -> usleep(n*1000) - dbg_abort() -> abort() - dbg_pkg_status() -> pkg_status() - dbg_shm_status() -> shm_status() --- modules_s/dbg/Makefile | 15 ----- modules_s/dbg/README | 71 --------------------- modules_s/dbg/dbg.c | 128 --------------------------------------- modules_s/dbg/doc/Makefile | 4 - modules_s/dbg/doc/dbg.xml | 47 -------------- modules_s/dbg/doc/functions.xml | 97 ----------------------------- modules_s/dbg/doc/params.xml | 17 ----- 7 files changed, 0 insertions(+), 379 deletions(-) diff --git a/modules_s/dbg/Makefile b/modules_s/dbg/Makefile deleted file mode 100644 index bdb6af3..0000000 --- a/modules_s/dbg/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $Id$ -# -# dbg module makefile -# -# -# WARNING: do not run this directly, it should be run by the master Makefile - -include ../../Makefile.defs -auto_gen= -NAME=dbg.so -LIBS= - -DEFS+=-DSER_MOD_INTERFACE - -include ../../Makefile.modules diff --git a/modules_s/dbg/README b/modules_s/dbg/README deleted file mode 100644 index 05f5838..0000000 --- a/modules_s/dbg/README +++ /dev/null @@ -1,71 +0,0 @@ - -Dbg Module - -Andrei Pelinescu-Onciul - - iptelorg GmbH - - Copyright � 2007 iptelorg GmbH - Revision History - Revision $Revision$ $Date$ - _________________________________________________________________ - -Overview - - This is a module used for debugging. It should contain only test and - debugging related functions. For example it contains functions to - simulate delays and to dump core. - - This modules should not be used in production. - -Parameters - - Revision History - Revision $Revision$ $Date$ - -Functions - - Revision History - Revision $Revision$ $Date$ - -dbg_msleep(ms) - - Causes a ms milliseconds delay in processing for the executing - process. - - This function can be used to simulate delays. - - Meaning of the parameters is as follows: - * ms - delay in milliseconds. - - Example 1. dbg_msleep usage -... -dbg_msleep(1000); # 1 second delay -... - -dbg_abort() - - Forces a core dump (see abort(3)). - - Example 2. dbg_abort usage -... -dbg_abort(); -... - -dbg_pkg_status() - - Dumps the local memory malloc fragment list into the log. - - Example 3. dbg_pkg_status usage -... -dbg_pkg_status(); -... - -dbg_shm_status() - - Dumps the shared memory malloc fragment list into the log. - - Example 4. dbg_shm_status usage -... -dbg_shm_status(); -... diff --git a/modules_s/dbg/dbg.c b/modules_s/dbg/dbg.c deleted file mode 100644 index 0af55a2..0000000 --- a/modules_s/dbg/dbg.c +++ /dev/null @@ -1,128 +0,0 @@ -/*$Id$ - * - * debug and test ser module - * - * - * Copyright (C) 2007 iptelorg GmbH - * - * This file is part of ser, a free SIP server. - * - * ser 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 - * - * For a license to use the ser software under conditions - * other than those described here, or to purchase support for this - * software, please contact iptel.org by e-mail at the following addresses: - * info(a)iptel.org - * - * ser 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 - */ -/* - * History: - * -------- - * 2007-02-27 created by andrei - */ - - - - -#include "../../sr_module.h" -#include "../../mem/mem.h" -#include "../../mem/shm_mem.h" - -#define _XOPEN_SOURCE 500 -#include <unistd.h> -#include <stdlib.h> - -MODULE_VERSION - -static int dbg_msleep(struct sip_msg*, char*,char*); -static int dbg_abort(struct sip_msg*, char*,char*); -static int dbg_pkg_status(struct sip_msg*, char*,char*); -static int dbg_shm_status(struct sip_msg*, char*,char*); -static int mod_init(void); - - -static cmd_export_t cmds[]={ - {"dbg_msleep", dbg_msleep, 1, fixup_int_1, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|ONSEND_ROUTE}, - {"dbg_abort", dbg_abort, 0, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|ONSEND_ROUTE}, - {"dbg_pkg_status", dbg_pkg_status, 0, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|ONSEND_ROUTE}, - {"dbg_shm_status", dbg_shm_status, 0, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|ONSEND_ROUTE}, - {0, 0, 0, 0, 0} -}; - -static param_export_t params[]={ - {0,0,0} -}; - -struct module_exports exports = { - "dbg", - cmds, - 0, /* RPC methods */ - params, - - mod_init, /* module initialization function */ - 0, /* response function*/ - 0, /* destroy function */ - 0, /* oncancel function */ - 0 /* per-child init function */ -}; - - -static int mod_init(void) -{ - LOG(L_WARN, "WARNING: dbg module loaded\n"); - return 0; -} - - -static int dbg_msleep(struct sip_msg* msg, char* val, char* foo) -{ - int ms; - fparam_t* p; - p=(fparam_t*)val; - ms=p->v.i; - LOG(L_CRIT, "dbg: sleeping %d ms\n", ms); - usleep(ms*1000); - return 1; -} - - - -static int dbg_abort(struct sip_msg* msg, char* foo, char* bar) -{ - LOG(L_CRIT, "dbg: dbg_abort called\n"); - abort(); - return 0; -} - - - -static int dbg_pkg_status(struct sip_msg* msg, char* foo, char* bar) -{ - pkg_status(); - return 1; -} - - - -static int dbg_shm_status(struct sip_msg* msg, char* foo, char* bar) -{ - shm_status(); - return 1; -} - - diff --git a/modules_s/dbg/doc/Makefile b/modules_s/dbg/doc/Makefile deleted file mode 100644 index 30f5566..0000000 --- a/modules_s/dbg/doc/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -docs = dbg.xml - -docbook_dir=../../../docbook -include $(docbook_dir)/Makefile.module diff --git a/modules_s/dbg/doc/dbg.xml b/modules_s/dbg/doc/dbg.xml deleted file mode 100644 index 9508f7f..0000000 --- a/modules_s/dbg/doc/dbg.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> - -<section id="print" xmlns:xi="http://www.w3.org/2001/XInclude"> - <sectioninfo> - <authorgroup> - <author> - <firstname>Andrei</firstname> - <surname>Pelinescu-Onciul</surname> - <affiliation><orgname>iptelorg GmbH</orgname></affiliation> - <address> - <email>andrei(a)iptel.org</email> - </address> - </author> - </authorgroup> - <copyright> - <year>2007</year> - <holder>iptelorg GmbH</holder> - </copyright> - <revhistory> - <revision> - <revnumber>$Revision$</revnumber> - <date>$Date$</date> - </revision> - </revhistory> - </sectioninfo> - - <title>Dbg Module</title> - - <section id="dbg.overview"> - <title>Overview</title> - <para> - This is a module used for debugging. It should contain only test and - debugging related functions. For example it contains functions to - simulate delays and to dump core. - </para> - <para> - This modules <emphasis>should not be used</emphasis> in production. - </para> - </section> - - <xi:include href="params.xml"/> - <xi:include href="functions.xml"/> - -</section> - diff --git a/modules_s/dbg/doc/functions.xml b/modules_s/dbg/doc/functions.xml deleted file mode 100644 index 99bd7f0..0000000 --- a/modules_s/dbg/doc/functions.xml +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> - -<section id="dbg.functions" xmlns:xi="http://www.w3.org/2001/XInclude"> - <sectioninfo> - <revhistory> - <revision> - <revnumber>$Revision$</revnumber> - <date>$Date$</date> - </revision> - </revhistory> - </sectioninfo> - - <title>Functions</title> - - <section id="dbg.dbg_msleep"> - <title> - <function>dbg_msleep(ms)</function> - </title> - <para> - Causes a <varname>ms</varname> milliseconds delay in processing for the - executing process. - </para> - <para> - This function can be used to simulate delays. - </para> - <para>Meaning of the parameters is as follows:</para> - <itemizedlist> - <listitem> - <para><emphasis>ms</emphasis> - delay in milliseconds. - </para> - </listitem> - </itemizedlist> - <example> - <title><function>dbg_msleep</function> usage</title> - <programlisting> -... -dbg_msleep(1000); # 1 second delay -... - </programlisting> - </example> - </section> - - <section id="dbg.abort"> - <title> - <function>dbg_abort()</function> - </title> - <para> - Forces a core dump (see abort(3)). - </para> - <example> - <title><function>dbg_abort</function> usage</title> - <programlisting> -... -dbg_abort(); -... - </programlisting> - </example> - </section> - - <section id="dbg.pkg_status"> - <title> - <function>dbg_pkg_status()</function> - </title> - <para> - Dumps the local memory malloc fragment list into the log. - </para> - <example> - <title><function>dbg_pkg_status</function> usage</title> - <programlisting> -... -dbg_pkg_status(); -... - </programlisting> - </example> - </section> - - <section id="dbg.shm_status"> - <title> - <function>dbg_shm_status()</function> - </title> - <para> - Dumps the shared memory malloc fragment list into the log. - </para> - <example> - <title><function>dbg_shm_status</function> usage</title> - <programlisting> -... -dbg_shm_status(); -... - </programlisting> - </example> - </section> - - -</section> diff --git a/modules_s/dbg/doc/params.xml b/modules_s/dbg/doc/params.xml deleted file mode 100644 index 97f2d3b..0000000 --- a/modules_s/dbg/doc/params.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> - -<section id="dbg.parameters" xmlns:xi="http://www.w3.org/2001/XInclude"> - <sectioninfo> - <revhistory> - <revision> - <revnumber>$Revision$</revnumber> - <date>$Date$</date> - </revision> - </revhistory> - </sectioninfo> - - <title>Parameters</title> - -</section>

1 0

removal of dbg module
by Henning Westerholt 15 Jun '10

15 Jun '10

Hi, during a review i noticed that it seems that all the functionality in the modules_s/dbg module is also provided from the modules_k/cfgutils module. function mapping: - dbg_msleep(n) -> usleep(n*1000) - dbg_abort() -> abort() - dbg_pkg_status() -> pkg_status() - dbg_shm_status() -> shm_status() It is ok when i remove this module? If this one additional multiplication is not ok, i can of course also add a 'm_sleep' function to the cfgutils module as well. Regards, Henning

1 1

problem with topoh module development
by jerome.marchet＠orange-ftgroup.com 15 Jun '10

15 Jun '10

3 7

git:sr_3.0: auth_radius(s), avp_radius(s), uri_radius(s): revived
by Andrei Pelinescu-Onciul 14 Jun '10

14 Jun '10

Module: sip-router Branch: sr_3.0 Commit: 5d214e889c1a7c57e4eefe6ebd5b56cbc62bee00 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d214e8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jun 14 18:05:18 2010 +0200 auth_radius(s), avp_radius(s), uri_radius(s): revived Revive modules_/{auth_radius,avp_radius,uri_radius}. Needed to be able to use radius auth. with ser auth_api/module (the ser and kamailio auth apis are not compatible and so one cannot use a kamailio radius auth with the ser auth module). Reverts 456c3c137e9abcf687413f9675fe0f1761ce820d. (cherry picked from commit b06131c655bceaaf1edbef75594e109a3b57c1ce) --- modules_s/auth_radius/Makefile | 17 ++ modules_s/auth_radius/README | 189 +++++++++++++ modules_s/auth_radius/authorize.c | 302 +++++++++++++++++++++ modules_s/auth_radius/authorize.h | 52 ++++ modules_s/auth_radius/authrad_mod.c | 204 ++++++++++++++ modules_s/auth_radius/authrad_mod.h | 50 ++++ modules_s/auth_radius/doc/Makefile | 29 ++ modules_s/auth_radius/doc/auth_radius.xml | 80 ++++++ modules_s/auth_radius/doc/functions.xml | 110 ++++++++ modules_s/auth_radius/doc/params.xml | 76 ++++++ modules_s/auth_radius/sterman.c | 283 ++++++++++++++++++++ modules_s/auth_radius/sterman.h | 56 ++++ modules_s/avp_radius/Makefile | 18 ++ modules_s/avp_radius/README | 115 ++++++++ modules_s/avp_radius/avp_radius.c | 413 +++++++++++++++++++++++++++++ modules_s/avp_radius/doc/Makefile | 29 ++ modules_s/avp_radius/doc/avp_radius.xml | 53 ++++ modules_s/avp_radius/doc/functions.xml | 53 ++++ modules_s/avp_radius/doc/params.xml | 52 ++++ modules_s/uri_radius/Makefile | 16 ++ modules_s/uri_radius/README | 142 ++++++++++ modules_s/uri_radius/checks.c | 168 ++++++++++++ modules_s/uri_radius/checks.h | 43 +++ modules_s/uri_radius/doc/Makefile | 29 ++ modules_s/uri_radius/doc/functions.xml | 38 +++ modules_s/uri_radius/doc/params.xml | 53 ++++ modules_s/uri_radius/doc/uri_radius.xml | 57 ++++ modules_s/uri_radius/urirad_mod.c | 126 +++++++++ modules_s/uri_radius/urirad_mod.h | 43 +++ 29 files changed, 2896 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5d2…

1 0

git:sr_3.0: *_radius(s): doc: update to the new doc makefile format
by Andrei Pelinescu-Onciul 14 Jun '10

14 Jun '10

Module: sip-router Branch: sr_3.0 Commit: 457b2da42761d24faf7617cf66e61c87b36959c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=457b2da… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jun 14 18:05:46 2010 +0200 *_radius(s): doc: update to the new doc makefile format Update the doc makefiles for auth_radius, avp_radius and uri_radius. (cherry picked from commit a7ddee8e5f9fba13c482e8b1b2ba3a59e5598fea) --- modules_s/auth_radius/doc/Makefile | 31 +++---------------------------- modules_s/avp_radius/doc/Makefile | 31 +++---------------------------- modules_s/uri_radius/doc/Makefile | 31 +++---------------------------- 3 files changed, 9 insertions(+), 84 deletions(-) diff --git a/modules_s/auth_radius/doc/Makefile b/modules_s/auth_radius/doc/Makefile index 4537cf4..477c335 100644 --- a/modules_s/auth_radius/doc/Makefile +++ b/modules_s/auth_radius/doc/Makefile @@ -1,29 +1,4 @@ -# -# The list of documents to build (without extensions) -# -DOCUMENTS = auth_radius +docs = auth_radius.xml -# -# The root directory containing Makefile.doc -# -ROOT_DIR=../../.. - -# -# Validate docbook documents before generating output -# (may be slow) -# -#VALIDATE=1 - -# -# You can override the stylesheet used to generate -# xhtml documents here -# -#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl - -# -# You can override the stylesheet used to generate -# plain text documents here -# -#TXT_XSL=$(XHTML_XSL) - -include $(ROOT_DIR)/Makefile.doc +docbook_dir=../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules_s/avp_radius/doc/Makefile b/modules_s/avp_radius/doc/Makefile index 1bd9eb9..dd0cd7c 100644 --- a/modules_s/avp_radius/doc/Makefile +++ b/modules_s/avp_radius/doc/Makefile @@ -1,29 +1,4 @@ -# -# The list of documents to build (without extensions) -# -DOCUMENTS = avp_radius +docs = avp_radius.xml -# -# The root directory containing Makefile.doc -# -ROOT_DIR=../../.. - -# -# Validate docbook documents before generating output -# (may be slow) -# -#VALIDATE=1 - -# -# You can override the stylesheet used to generate -# xhtml documents here -# -#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl - -# -# You can override the stylesheet used to generate -# plain text documents here -# -#TXT_XSL=$(XHTML_XSL) - -include $(ROOT_DIR)/Makefile.doc +docbook_dir=../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules_s/uri_radius/doc/Makefile b/modules_s/uri_radius/doc/Makefile index 27d7ea1..829e048 100644 --- a/modules_s/uri_radius/doc/Makefile +++ b/modules_s/uri_radius/doc/Makefile @@ -1,29 +1,4 @@ -# -# The list of documents to build (without extensions) -# -DOCUMENTS = uri_radius +docs = uri_radius.xml -# -# The root directory containing Makefile.doc -# -ROOT_DIR=../../.. - -# -# Validate docbook documents before generating output -# (may be slow) -# -#VALIDATE=1 - -# -# You can override the stylesheet used to generate -# xhtml documents here -# -#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl - -# -# You can override the stylesheet used to generate -# plain text documents here -# -#TXT_XSL=$(XHTML_XSL) - -include $(ROOT_DIR)/Makefile.doc +docbook_dir=../../../docbook +include $(docbook_dir)/Makefile.module

1 0

git:sr_3.0: auth_radius, misc_radius: mv back to modules_k
by Andrei Pelinescu-Onciul 14 Jun '10

14 Jun '10

Module: sip-router Branch: sr_3.0 Commit: 7c9b95c691fbd4d987298138f112078e132ac544 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c9b95c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jun 14 18:04:29 2010 +0200 auth_radius,misc_radius: mv back to modules_k Partially revert 456c3c137e9abcf687413f9675fe0f1761ce820d: move modules/{auth_radius,misc_radius} back to modules_k to allow having 2 sets of radius modules (ser & kamailio). This is needed because the ser and kamailio auth apis (exported by modules*/auth) are incompatible and hence auth api using modules cannot be mixed. (cherry picked from commit 994b75e5f942e31675253356e2303d0dbea03890) --- {modules => modules_k}/auth_radius/Makefile | 0 {modules => modules_k}/auth_radius/README | 0 {modules => modules_k}/auth_radius/authorize.c | 0 {modules => modules_k}/auth_radius/authorize.h | 0 {modules => modules_k}/auth_radius/authrad_mod.c | 0 {modules => modules_k}/auth_radius/authrad_mod.h | 0 {modules => modules_k}/auth_radius/doc/Makefile | 0 .../auth_radius/doc/auth_radius.xml | 0 .../auth_radius/doc/auth_radius_admin.xml | 0 {modules => modules_k}/auth_radius/extra.c | 0 {modules => modules_k}/auth_radius/extra.h | 0 {modules => modules_k}/auth_radius/sterman.c | 0 {modules => modules_k}/auth_radius/sterman.h | 0 {modules => modules_k}/misc_radius/Makefile | 0 {modules => modules_k}/misc_radius/README | 0 {modules => modules_k}/misc_radius/doc/Makefile | 0 .../misc_radius/doc/misc_radius.xml | 0 .../misc_radius/doc/misc_radius_admin.xml | 0 {modules => modules_k}/misc_radius/extra.c | 0 {modules => modules_k}/misc_radius/extra.h | 0 {modules => modules_k}/misc_radius/functions.c | 0 {modules => modules_k}/misc_radius/functions.h | 0 {modules => modules_k}/misc_radius/misc_radius.c | 0 {modules => modules_k}/misc_radius/misc_radius.h | 0 24 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/auth_radius/Makefile b/modules_k/auth_radius/Makefile similarity index 100% rename from modules/auth_radius/Makefile rename to modules_k/auth_radius/Makefile diff --git a/modules/auth_radius/README b/modules_k/auth_radius/README similarity index 100% rename from modules/auth_radius/README rename to modules_k/auth_radius/README diff --git a/modules/auth_radius/authorize.c b/modules_k/auth_radius/authorize.c similarity index 100% rename from modules/auth_radius/authorize.c rename to modules_k/auth_radius/authorize.c diff --git a/modules/auth_radius/authorize.h b/modules_k/auth_radius/authorize.h similarity index 100% rename from modules/auth_radius/authorize.h rename to modules_k/auth_radius/authorize.h diff --git a/modules/auth_radius/authrad_mod.c b/modules_k/auth_radius/authrad_mod.c similarity index 100% rename from modules/auth_radius/authrad_mod.c rename to modules_k/auth_radius/authrad_mod.c diff --git a/modules/auth_radius/authrad_mod.h b/modules_k/auth_radius/authrad_mod.h similarity index 100% rename from modules/auth_radius/authrad_mod.h rename to modules_k/auth_radius/authrad_mod.h diff --git a/modules/auth_radius/doc/Makefile b/modules_k/auth_radius/doc/Makefile similarity index 100% rename from modules/auth_radius/doc/Makefile rename to modules_k/auth_radius/doc/Makefile diff --git a/modules/auth_radius/doc/auth_radius.xml b/modules_k/auth_radius/doc/auth_radius.xml similarity index 100% rename from modules/auth_radius/doc/auth_radius.xml rename to modules_k/auth_radius/doc/auth_radius.xml diff --git a/modules/auth_radius/doc/auth_radius_admin.xml b/modules_k/auth_radius/doc/auth_radius_admin.xml similarity index 100% rename from modules/auth_radius/doc/auth_radius_admin.xml rename to modules_k/auth_radius/doc/auth_radius_admin.xml diff --git a/modules/auth_radius/extra.c b/modules_k/auth_radius/extra.c similarity index 100% rename from modules/auth_radius/extra.c rename to modules_k/auth_radius/extra.c diff --git a/modules/auth_radius/extra.h b/modules_k/auth_radius/extra.h similarity index 100% rename from modules/auth_radius/extra.h rename to modules_k/auth_radius/extra.h diff --git a/modules/auth_radius/sterman.c b/modules_k/auth_radius/sterman.c similarity index 100% rename from modules/auth_radius/sterman.c rename to modules_k/auth_radius/sterman.c diff --git a/modules/auth_radius/sterman.h b/modules_k/auth_radius/sterman.h similarity index 100% rename from modules/auth_radius/sterman.h rename to modules_k/auth_radius/sterman.h diff --git a/modules/misc_radius/Makefile b/modules_k/misc_radius/Makefile similarity index 100% rename from modules/misc_radius/Makefile rename to modules_k/misc_radius/Makefile diff --git a/modules/misc_radius/README b/modules_k/misc_radius/README similarity index 100% rename from modules/misc_radius/README rename to modules_k/misc_radius/README diff --git a/modules/misc_radius/doc/Makefile b/modules_k/misc_radius/doc/Makefile similarity index 100% rename from modules/misc_radius/doc/Makefile rename to modules_k/misc_radius/doc/Makefile diff --git a/modules/misc_radius/doc/misc_radius.xml b/modules_k/misc_radius/doc/misc_radius.xml similarity index 100% rename from modules/misc_radius/doc/misc_radius.xml rename to modules_k/misc_radius/doc/misc_radius.xml diff --git a/modules/misc_radius/doc/misc_radius_admin.xml b/modules_k/misc_radius/doc/misc_radius_admin.xml similarity index 100% rename from modules/misc_radius/doc/misc_radius_admin.xml rename to modules_k/misc_radius/doc/misc_radius_admin.xml diff --git a/modules/misc_radius/extra.c b/modules_k/misc_radius/extra.c similarity index 100% rename from modules/misc_radius/extra.c rename to modules_k/misc_radius/extra.c diff --git a/modules/misc_radius/extra.h b/modules_k/misc_radius/extra.h similarity index 100% rename from modules/misc_radius/extra.h rename to modules_k/misc_radius/extra.h diff --git a/modules/misc_radius/functions.c b/modules_k/misc_radius/functions.c similarity index 100% rename from modules/misc_radius/functions.c rename to modules_k/misc_radius/functions.c diff --git a/modules/misc_radius/functions.h b/modules_k/misc_radius/functions.h similarity index 100% rename from modules/misc_radius/functions.h rename to modules_k/misc_radius/functions.h diff --git a/modules/misc_radius/misc_radius.c b/modules_k/misc_radius/misc_radius.c similarity index 100% rename from modules/misc_radius/misc_radius.c rename to modules_k/misc_radius/misc_radius.c diff --git a/modules/misc_radius/misc_radius.h b/modules_k/misc_radius/misc_radius.h similarity index 100% rename from modules/misc_radius/misc_radius.h rename to modules_k/misc_radius/misc_radius.h

1 0

git:master: auth(k): s/auth_api/auth_api_k & s/bind_auth/bind_auth_k
by Andrei Pelinescu-Onciul 14 Jun '10

14 Jun '10

Module: sip-router Branch: master Commit: dfe0feb20ba6d33ff3fcef80db0add9f23ffdf2a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dfe0feb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jun 14 17:15:50 2010 +0200 auth(k): s/auth_api/auth_api_k & s/bind_auth/bind_auth_k Rename auth_api_t and bind_auth (add _k), to avoid possible runtime problems when mixing ser and kamailio auth_api using modules. --- modules_k/auth/api.c | 2 +- modules_k/auth/api.h | 8 ++++---- modules_k/auth/auth_mod.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_k/auth/api.c b/modules_k/auth/api.c index 8c43ed2..73ad97e 100644 --- a/modules_k/auth/api.c +++ b/modules_k/auth/api.c @@ -257,7 +257,7 @@ int check_response(dig_cred_t* _cred, str* _method, char* _ha1) * \param api binded API * \return 0 on success, -1 on failure */ -int bind_auth(auth_api_t* api) +int bind_auth_k(auth_api_k_t* api) { if (!api) { LM_ERR("invalid parameter value\n"); diff --git a/modules_k/auth/api.h b/modules_k/auth/api.h index 1140214..87f2839 100644 --- a/modules_k/auth/api.h +++ b/modules_k/auth/api.h @@ -164,17 +164,17 @@ void strip_realm(str *_realm); /*! Auth module API */ -typedef struct auth_api { +typedef struct auth_api_k { int_str rpid_avp; /*!< Name of AVP containing Remote-Party-ID */ int rpid_avp_type; /*!< type of the RPID AVP */ pre_auth_t pre_auth; /*!< The function to be called before auth */ post_auth_t post_auth; /*!< The function to be called after auth */ calc_HA1_t calc_HA1; /*!< calculate H(A1) as per spec */ check_response_t check_response; /*!< check auth response */ -} auth_api_t; +} auth_api_k_t; -typedef int (*bind_auth_t)(auth_api_t* api); +typedef int (*bind_auth_k_t)(auth_api_k_t* api); /*! @@ -182,7 +182,7 @@ typedef int (*bind_auth_t)(auth_api_t* api); * \param api binded API * \return 0 on success, -1 on failure */ -int bind_auth(auth_api_t* api); +int bind_auth_k(auth_api_k_t* api); #endif diff --git a/modules_k/auth/auth_mod.c b/modules_k/auth/auth_mod.c index 638eaf0..fd1e405 100644 --- a/modules_k/auth/auth_mod.c +++ b/modules_k/auth/auth_mod.c @@ -149,7 +149,7 @@ static cmd_export_t cmds[] = { {"append_rpid_hf", (cmd_function)append_rpid_hf_p, 2, fixup_str_str, 0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, - {"bind_auth", (cmd_function)bind_auth, 0, 0, + {"bind_auth_k", (cmd_function)bind_auth_k, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} };

1 0

git:master: auth_*(k): updated auth_api and header file name
by Andrei Pelinescu-Onciul 14 Jun '10

14 Jun '10

Module: sip-router Branch: master Commit: 9d5a273c3cb5509ce1c61de26ed1ef719cbe12a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d5a273… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jun 14 17:22:01 2010 +0200 auth_*(k): updated auth_api and header file name Changed auth_api_t to auth_api_k_t and bind_auth to bind_auth_k in all the auth(k) using modules. Updated also the auth/api.h path to contain modules_k (safer if the modules will be moved). --- modules_k/auth_db/authdb_mod.c | 8 ++++---- modules_k/auth_db/authdb_mod.h | 4 ++-- modules_k/auth_diameter/authorize.c | 2 +- modules_k/auth_diameter/authorize.h | 2 +- modules_k/auth_radius/authrad_mod.c | 6 +++--- modules_k/auth_radius/authrad_mod.h | 2 +- modules_k/osp/orig_transaction.c | 2 +- modules_k/osp/osp_mod.c | 8 ++++---- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules_k/auth_db/authdb_mod.c b/modules_k/auth_db/authdb_mod.c index e3df1f5..8459b76 100644 --- a/modules_k/auth_db/authdb_mod.c +++ b/modules_k/auth_db/authdb_mod.c @@ -42,7 +42,7 @@ #include "../../error.h" #include "../../mod_fix.h" #include "../../mem/mem.h" -#include "../auth/api.h" +#include "../../modules_k/auth/api.h" #include "../sl/sl_api.h" #include "aaa_avps.h" #include "authorize.h" @@ -103,7 +103,7 @@ int use_domain = 0; /* Use also domain when looking up in table */ db1_con_t* auth_db_handle = 0; /* database connection handle */ db_func_t auth_dbf; -auth_api_t auth_api; +auth_api_k_t auth_api; char *credentials_list = DEFAULT_CRED_LIST; struct aaa_avp *credentials = 0; /* Parsed list of credentials to load */ @@ -171,7 +171,7 @@ static int child_init(int rank) static int mod_init(void) { - bind_auth_t bind_auth; + bind_auth_k_t bind_auth; db_url.len = strlen(db_url.s); user_column.len = strlen(user_column.s); @@ -186,7 +186,7 @@ static int mod_init(void) } /* bind to auth module and import the API */ - bind_auth = (bind_auth_t)find_export("bind_auth", 0, 0); + bind_auth = (bind_auth_k_t)find_export("bind_auth_k", 0, 0); if (!bind_auth) { LM_ERR("unable to find bind_auth function. Check if you load the auth module.\n"); return -2; diff --git a/modules_k/auth_db/authdb_mod.h b/modules_k/auth_db/authdb_mod.h index edb29c0..c9c8452 100644 --- a/modules_k/auth_db/authdb_mod.h +++ b/modules_k/auth_db/authdb_mod.h @@ -28,7 +28,7 @@ #include "../../str.h" #include "../../lib/srdb1/db.h" -#include "../auth/api.h" +#include "../../modules_k/auth/api.h" #include "../sl/sl_api.h" #include "../../parser/msg_parser.h" @@ -50,7 +50,7 @@ extern int use_domain; /* If set to 1 then the domain will be used when s extern db1_con_t* auth_db_handle; /* database connection handle */ extern db_func_t auth_dbf; -extern auth_api_t auth_api; +extern auth_api_k_t auth_api; extern struct aaa_avp* credentials; extern int credentials_n; diff --git a/modules_k/auth_diameter/authorize.c b/modules_k/auth_diameter/authorize.c index a8c32d4..71048b6 100644 --- a/modules_k/auth_diameter/authorize.c +++ b/modules_k/auth_diameter/authorize.c @@ -58,7 +58,7 @@ #include "diameter_msg.h" #include "auth_diameter.h" #include "defs.h" -#include "../auth/api.h" +#include "../../modules_k/auth/api.h" #include "authorize.h" #include "tcp_comm.h" diff --git a/modules_k/auth_diameter/authorize.h b/modules_k/auth_diameter/authorize.h index c3f96fb..a960436 100644 --- a/modules_k/auth_diameter/authorize.h +++ b/modules_k/auth_diameter/authorize.h @@ -35,7 +35,7 @@ #include "../../parser/hf.h" #include "../../pvar.h" #include "../../str.h" -#include "../auth/api.h" +#include "../../modules_k/auth/api.h" #include "defs.h" int get_uri(struct sip_msg* m, str** uri); diff --git a/modules_k/auth_radius/authrad_mod.c b/modules_k/auth_radius/authrad_mod.c index 803948a..c0feb97 100644 --- a/modules_k/auth_radius/authrad_mod.c +++ b/modules_k/auth_radius/authrad_mod.c @@ -52,7 +52,7 @@ struct attr attrs[A_MAX+MAX_EXTRA]; struct val vals[V_MAX+MAX_EXTRA]; void *rh; -auth_api_t auth_api; +auth_api_k_t auth_api; static int mod_init(void); /* Module initialization function */ static int auth_fixup(void** param, int param_no); /* char* -> str* */ @@ -120,7 +120,7 @@ struct module_exports exports = { static int mod_init(void) { DICT_VENDOR *vend; - bind_auth_t bind_auth; + bind_auth_k_t bind_auth; int n; if ((rh = rc_read_config(radius_config)) == NULL) { @@ -133,7 +133,7 @@ static int mod_init(void) return -2; } - bind_auth = (bind_auth_t)find_export("bind_auth", 0, 0); + bind_auth = (bind_auth_k_t)find_export("bind_auth_k", 0, 0); if (!bind_auth) { LM_ERR("unable to find bind_auth function. Check if you load the auth module.\n"); return -1; diff --git a/modules_k/auth_radius/authrad_mod.h b/modules_k/auth_radius/authrad_mod.h index 50b9940..a5aaa8e 100644 --- a/modules_k/auth_radius/authrad_mod.h +++ b/modules_k/auth_radius/authrad_mod.h @@ -41,6 +41,6 @@ extern struct extra_attr *auth_extra; extern int use_ruri_flag; -extern auth_api_t auth_api; +extern auth_api_k_t auth_api; #endif /* AUTHRAD_MOD_H */ diff --git a/modules_k/osp/orig_transaction.c b/modules_k/osp/orig_transaction.c index e50b9f2..ef9313d 100644 --- a/modules_k/osp/orig_transaction.c +++ b/modules_k/osp/orig_transaction.c @@ -33,7 +33,7 @@ #include "../../dset.h" #include "../../usr_avp.h" #include "../../mem/mem.h" -#include "../auth/api.h" +#include "../../modules_k/auth/api.h" #include "orig_transaction.h" #include "destination.h" #include "osptoolkit.h" diff --git a/modules_k/osp/osp_mod.c b/modules_k/osp/osp_mod.c index ee710b5..d7f9587 100644 --- a/modules_k/osp/osp_mod.c +++ b/modules_k/osp/osp_mod.c @@ -34,7 +34,7 @@ #include <osp/osp.h> #include "../rr/api.h" -#include "../auth/api.h" +#include "../../modules_k/auth/api.h" #include "osp_mod.h" #include "orig_transaction.h" #include "term_transaction.h" @@ -72,7 +72,7 @@ extern unsigned short _osp_snid_avptype; extern OSPTPROVHANDLE _osp_provider; struct rr_binds osp_rr; -auth_api_t osp_auth; +auth_api_k_t osp_auth; int osp_index[OSP_DEF_SPS]; static int ospInitMod(void); @@ -167,7 +167,7 @@ struct module_exports exports = { */ static int ospInitMod(void) { - bind_auth_t bind_auth; + bind_auth_k_t bind_auth; if (ospVerifyParameters() != 0) { /* At least one parameter incorrect -> error */ @@ -182,7 +182,7 @@ static int ospInitMod(void) } /* Load the AUTH API */ - bind_auth = (bind_auth_t)find_export("bind_auth", 0, 0); + bind_auth = (bind_auth_k_t)find_export("bind_auth_k", 0, 0); if ((bind_auth == NULL) || (bind_auth(&osp_auth) != 0)) { LM_WARN("failed to load the AUTH API. Check if you load the auth module.\n"); LM_WARN("rpid_avp & rpid_avp_type is required for calling number translation\n");

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 June 2010