sr-dev

sr-dev@lists.kamailio.org

13 participants
44202 discussions

git:master: textops: added implementation of free_/fixup_regexp_none()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 290e94777e85eae44c170f3a70271e58e35bcd7c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=290e947… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 17 00:30:14 2009 +0200 textops: added implementation of free_/fixup_regexp_none() --- modules_k/textops/textops.c | 36 ++++++++++++++++++++++++++++++++++++ modules_k/textops/textops.h | 3 ++- 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/modules_k/textops/textops.c b/modules_k/textops/textops.c index 489db21..ae40e1a 100644 --- a/modules_k/textops/textops.c +++ b/modules_k/textops/textops.c @@ -1811,3 +1811,39 @@ int fixup_regexpNL_none(void** param, int param_no) *param=re; return 0; } + +/*! \brief + * fixup for functions that get two parameters + * - first parameter is converted to regular expression structure + * - second parameter is not converted + */ +int fixup_regexp_none(void** param, int param_no) +{ + if (param_no != 1 && param_no != 2 ) + { + LM_ERR("invalid parameter number %d\n", param_no); + return E_UNSPEC; + } + if (param_no == 1) + return fixup_regexp_null(param, 1); + return 0; +} + +/** + * fixup free for functions that get two parameters + * - first parameter was converted to regular expression + * - second parameter was notconverted + */ +int fixup_free_regexp_none(void** param, int param_no) +{ + if (param_no != 1 && param_no != 2 ) + { + LM_ERR("invalid parameter number %d\n", param_no); + return E_UNSPEC; + } + if (param_no == 1) + return fixup_free_regexp_null(param, 1); + return 0; +} + + diff --git a/modules_k/textops/textops.h b/modules_k/textops/textops.h index 42b47ac..39168f4 100644 --- a/modules_k/textops/textops.h +++ b/modules_k/textops/textops.h @@ -31,5 +31,6 @@ int search_append_f(struct sip_msg*, char*, char*); int remove_hf_f(struct sip_msg* msg, char* str_hf, char* foo); int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, gparam_p hfval, int mode, gparam_p hfanc); - +int fixup_regexp_none(void** param, int param_no); +int fixup_free_regexp_none(void** param, int param_no); #endif /*TEXTOPS_H_*/

15 years, 9 months

git:master: core: commented prototype of free_/fixup_regexp_none()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8708160fe82b0886d3a3e014450c2a112b4aa150 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8708160… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 17 00:27:37 2009 +0200 core: commented prototype of free_/fixup_regexp_none() - these functions are used only by textops module - implementation of these functions added to textops --- mod_fix.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mod_fix.h b/mod_fix.h index c27beee..613e11f 100644 --- a/mod_fix.h +++ b/mod_fix.h @@ -85,9 +85,9 @@ int fixup_uint_uint(void** param, int param_no); int fixup_regexp_null(void** param, int param_no); int fixup_free_regexp_null(void** param, int param_no); +#if 0 int fixup_regexp_none(void** param, int param_no); int fixup_free_regexp_none(void** param, int param_no); -#if 0 /* not implemened yet */ int fixup_regexpNL_null(void** param, int param_no); int fixup_regexpNL_none(void** param, int param_no);

15 years, 9 months

git:master: kex: set dependency on kmi and kcore libs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: fd6b2964d77974668c960ebe7b295c893a3c6cd9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd6b296… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 16 22:06:42 2009 +0200 kex: set dependency on kmi and kcore libs - added paths to libs in Makefile --- modules_k/kex/Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/Makefile b/modules_k/kex/Makefile index 7f67725..b06b35e 100644 --- a/modules_k/kex/Makefile +++ b/modules_k/kex/Makefile @@ -12,4 +12,7 @@ LIBS= DEFS+=-DOPENSER_MOD_INTERFACE +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/kmi/kmi +SER_LIBS+=$(SERLIBPATH)/kcore/kcore include ../../Makefile.modules

15 years, 9 months

git:master: kex: new module - kamailio extensions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2ca10ea1f1d30b728678f28099b99e0735f9dc15 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ca10ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 16 20:56:13 2009 +0200 kex: new module - kamailio extensions - the module collects kamailio core extensions - K core mi commands included in the module --- modules_k/kex/Makefile | 15 ++++++++ modules_k/kex/kex_mod.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/Makefile b/modules_k/kex/Makefile new file mode 100644 index 0000000..7f67725 --- /dev/null +++ b/modules_k/kex/Makefile @@ -0,0 +1,15 @@ +# $Id$ +# +# example module makefile +# +# +# WARNING: do not run this directly, it should be run by the master Makefile + +include ../../Makefile.defs +auto_gen= +NAME=kex.so +LIBS= + +DEFS+=-DOPENSER_MOD_INTERFACE + +include ../../Makefile.modules diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c new file mode 100644 index 0000000..e99b6dc --- /dev/null +++ b/modules_k/kex/kex_mod.c @@ -0,0 +1,85 @@ +/** + * $Id$ + * + * Copyright (C) 2009 + * + * 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 <stdio.h> +#include <string.h> +#include <stdlib.h> + +#include "../../sr_module.h" +#include "../../dprint.h" + +#include "mi_core.h" + + +MODULE_VERSION + + +/** parameters */ + +/** module functions */ +static int mod_init(void); + +void destroy(void); + +static cmd_export_t cmds[]={ + {0,0,0,0,0,0} +}; + +static param_export_t params[]={ + {0,0,0} +}; + + +/** module exports */ +struct module_exports exports= { + "kex", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, + params, + 0, /* exported statistics */ + 0, /* exported MI functions */ + 0, /* exported pseudo-variables */ + 0, /* extra processes */ + mod_init, /* module initialization function */ + 0, + (destroy_function) destroy, + 0 /* per-child init function */ +}; + +/** + * init module function + */ +static int mod_init(void) +{ + if(init_mi_core()<0) + return -1; + return 0; +} + +/** + * destroy function + */ +void destroy(void) +{ + return; +} +

15 years, 9 months

git:master: libkmi: moved mi core commands to kex module

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5df5700d88060d932d8becace3fc805c36014fe8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5df5700… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 16 20:49:34 2009 +0200 libkmi: moved mi core commands to kex module - implementation of MI commands in core moved to kex module - mi commands are added in mod init function - 'ps' and 'debug' functions still are disabled --- {lib/kmi => modules_k/kex}/mi_core.c | 2 +- {lib/kmi => modules_k/kex}/mi_core.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/kmi/mi_core.c b/modules_k/kex/mi_core.c similarity index 99% rename from lib/kmi/mi_core.c rename to modules_k/kex/mi_core.c index debd599..f1ba66b 100644 --- a/lib/kmi/mi_core.c +++ b/modules_k/kex/mi_core.c @@ -46,7 +46,7 @@ #include "../../ut.h" #include "../../pt.h" #include "../../mem/mem.h" -#include "mi.h" +#include "../../lib/kmi/mi.h" #include "../../version.h" #define BUILD_STR __FILE__ " compiled on "__TIME__ " " __DATE__ " with " COMPILER "\n" diff --git a/lib/kmi/mi_core.h b/modules_k/kex/mi_core.h similarity index 97% rename from lib/kmi/mi_core.h rename to modules_k/kex/mi_core.h index 481aeed..bc58392 100644 --- a/lib/kmi/mi_core.h +++ b/modules_k/kex/mi_core.h @@ -36,6 +36,6 @@ #ifndef _MI_MI_CORE_H_ #define _MI_MI_CORE_H_ -// int init_mi_core(void); +int init_mi_core(void); #endif

15 years, 9 months

git:master: kex: added module documentation

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 618be5d48b24b62575ca9c5f0b2f10af4bd17c71 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=618be5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 16 22:08:04 2009 +0200 kex: added module documentation - added source XML files and generated README --- modules_k/kex/README | 130 ++++++++++++++++++++++++++++++ modules_k/kex/doc/kex.xml | 47 +++++++++++ modules_k/kex/doc/kex_admin.xml | 169 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 346 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/README b/modules_k/kex/README new file mode 100644 index 0000000..444a973 --- /dev/null +++ b/modules_k/kex/README @@ -0,0 +1,130 @@ +KEx Module + +Daniel-Constantin Mierla + + asipto.com + <miconda(a)gmail.com> + +Edited by + +Daniel-Constantin Mierla + + <miconda(a)gmail.com> + + Copyright � 2009 Daniel-Constantin Mierla + __________________________________________________________ + + Table of Contents + + 1. Admin Guide + + 1.1. Overview + 1.2. Dependencies + + 1.2.1. Kamailio Modules + 1.2.2. External Libraries or Applications + + 1.3. Exported MI Functions + + 1.3.1. arg + 1.3.2. kill + 1.3.3. pwd + 1.3.4. uptime + 1.3.5. version + 1.3.6. which + +Chapter 1. Admin Guide + +1.1. Overview + + This module collects extensions from Kamailio core. + + Kamailio Core CookBook is available at: + http://kamailio.org/dokuwiki/ + +1.2. Dependencies + +1.2.1. Kamailio Modules + + The following modules must be loaded before this module: + * No dependencies on other Kamailio modules. + +1.2.2. External Libraries or Applications + + The following libraries or applications must be installed + before running Kamailio with this module loaded: + * None. + +1.3. Exported MI Functions + +1.3.1. arg + + Print command line arguments. + + Name: arg + + Parameters: none. + + MI FIFO Command Format: + :arg:_reply_fifo_file_ + _empty_line_ + +1.3.2. kill + + Kill the application. + + Name: kill + + Parameters: none. + + MI FIFO Command Format: + :kill:_reply_fifo_file_ + _empty_line_ + +1.3.3. pwd + + Print working directory. + + Name: pwd + + Parameters: none. + + MI FIFO Command Format: + :pwd:_reply_fifo_file_ + _empty_line_ + +1.3.4. uptime + + Print uptime. + + Name: uptime + + Parameters: none. + + MI FIFO Command Format: + :uptime:_reply_fifo_file_ + _empty_line_ + +1.3.5. version + + Print version information. + + Name: version + + Parameters: none. + + MI FIFO Command Format: + :version:_reply_fifo_file_ + _empty_line_ + +1.3.6. which + + Print list of available MI commands. + + Name: which + + Parameters: none. + + MI FIFO Command Format: + :which:_reply_fifo_file_ + _empty_line_ diff --git a/modules_k/kex/doc/kex.xml b/modules_k/kex/doc/kex.xml new file mode 100644 index 0000000..a9b3f52 --- /dev/null +++ b/modules_k/kex/doc/kex.xml @@ -0,0 +1,47 @@ +<?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 admin SYSTEM "kex_admin.xml"> +<!ENTITY faq SYSTEM "../../../doc/module_faq.xml"> + + +<!ENTITY % docentities SYSTEM "../../../doc/entities.xml"> +%docentities; + +]> + +<book> + <bookinfo> + <title>KEx Module</title> + <productname class="trade">&kamailioname;</productname> + <authorgroup> + <author> + <firstname>Daniel-Constantin</firstname> + <surname>Mierla</surname> + <affiliation><orgname>asipto.com</orgname></affiliation> + <email>miconda(a)gmail.com</email> + <address> + <otheraddr> + <ulink url="http://www.asipto.com">http://www.asipto.com</ulink> + </otheraddr> + </address> + </author> + <editor> + <firstname>Daniel-Constantin</firstname> + <surname>Mierla</surname> + <email>miconda(a)gmail.com</email> + </editor> + </authorgroup> + <copyright> + <year>2009</year> + <holder>Daniel-Constantin Mierla</holder> + </copyright> + </bookinfo> + <toc></toc> + + &admin; + &faq; + +</book> diff --git a/modules_k/kex/doc/kex_admin.xml b/modules_k/kex/doc/kex_admin.xml new file mode 100644 index 0000000..50a5641 --- /dev/null +++ b/modules_k/kex/doc/kex_admin.xml @@ -0,0 +1,169 @@ + + +<chapter> + + <title>&adminguide;</title> + + <section> + <title>Overview</title> + <para> + This module collects extensions from Kamailio core. + </para> + <para> + Kamailio Core CookBook is available at: + <ulink url="http://kamailio.org/dokuwiki/"> + http://kamailio.org/dokuwiki/</ulink> + </para> + </section> + + <section> + <title>Dependencies</title> + <section> + <title>&kamailio; Modules</title> + <para> + The following modules must be loaded before this module: + <itemizedlist> + <listitem> + <para> + <emphasis>No dependencies on other &kamailio; modules</emphasis>. + </para> + </listitem> + </itemizedlist> + </para> + </section> + <section> + <title>External Libraries or Applications</title> + <para> + The following libraries or applications must be installed before running + &kamailio; with this module loaded: + <itemizedlist> + <listitem> + <para> + <emphasis>None</emphasis>. + </para> + </listitem> + </itemizedlist> + </para> + </section> + </section> + + <section> + <title>Exported MI Functions</title> + <section> + <title> + <function moreinfo="none">arg</function> + </title> + <para> + Print command line arguments. + </para> + <para> + Name: <emphasis>arg</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis>.</para> + <para> + MI FIFO Command Format: + </para> + <programlisting format="linespecific"> + :arg:_reply_fifo_file_ + _empty_line_ + </programlisting> + </section> + <section> + <title> + <function moreinfo="none">kill</function> + </title> + <para> + Kill the application. + </para> + <para> + Name: <emphasis>kill</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis>.</para> + <para> + MI FIFO Command Format: + </para> + <programlisting format="linespecific"> + :kill:_reply_fifo_file_ + _empty_line_ + </programlisting> + </section> + <section> + <title> + <function moreinfo="none">pwd</function> + </title> + <para> + Print working directory. + </para> + <para> + Name: <emphasis>pwd</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis>.</para> + <para> + MI FIFO Command Format: + </para> + <programlisting format="linespecific"> + :pwd:_reply_fifo_file_ + _empty_line_ + </programlisting> + </section> + <section> + <title> + <function moreinfo="none">uptime</function> + </title> + <para> + Print uptime. + </para> + <para> + Name: <emphasis>uptime</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis>.</para> + <para> + MI FIFO Command Format: + </para> + <programlisting format="linespecific"> + :uptime:_reply_fifo_file_ + _empty_line_ + </programlisting> + </section> + <section> + <title> + <function moreinfo="none">version</function> + </title> + <para> + Print version information. + </para> + <para> + Name: <emphasis>version</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis>.</para> + <para> + MI FIFO Command Format: + </para> + <programlisting format="linespecific"> + :version:_reply_fifo_file_ + _empty_line_ + </programlisting> + </section> + <section> + <title> + <function moreinfo="none">which</function> + </title> + <para> + Print list of available MI commands. + </para> + <para> + Name: <emphasis>which</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis>.</para> + <para> + MI FIFO Command Format: + </para> + <programlisting format="linespecific"> + :which:_reply_fifo_file_ + _empty_line_ + </programlisting> + </section> + </section> + +</chapter> +

15 years, 9 months

git:master: mi_fifo: start FIFO listener process using SR interface

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 90c2431e4c98bce05e59d8ee8421c0db3d16fefb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90c2431… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 16 18:16:04 2009 +0200 mi_fifo: start FIFO listener process using SR interface - register one extra process to SR core - start the extra process from child PROC_MAIN --- modules_k/mi_fifo/mi_fifo.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/modules_k/mi_fifo/mi_fifo.c b/modules_k/mi_fifo/mi_fifo.c index a697626..b1425ce 100644 --- a/modules_k/mi_fifo/mi_fifo.c +++ b/modules_k/mi_fifo/mi_fifo.c @@ -43,6 +43,7 @@ #include "../../sr_module.h" #include "../../dprint.h" #include "../../ut.h" +#include "../../pt.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" #include "../../lib/kmi/mi.h" @@ -170,6 +171,9 @@ static int mi_mod_init(void) } } + /* add space for one extra process */ + register_procs(1); + return 0; } @@ -177,6 +181,8 @@ static int mi_mod_init(void) /*! \brief Initialize module for child processes */ static int mi_child_init(int rank) { + int pid; + if (rank==PROC_TIMER || rank>0 ) { if ( mi_writer_init(read_buf_size, mi_reply_indent)!=0 ) { LM_CRIT("failed to init the reply writer\n"); @@ -184,6 +190,16 @@ static int mi_child_init(int rank) } } + if (rank==PROC_MAIN) { + pid=fork_process(100, "MI FIFO", 1); + if (pid<0) + return -1; /* error */ + if(pid==0){ + /* child */ + fifo_process(1); + } + } + return 0; }

15 years, 9 months

Shared git Repository Ready

by Jan Janak

Folks, I am happy to announce that we finished the migration of SER and Kamailio modules into a shared git repository and the git repository is now ready for everyone to use. You can browse the repository here: http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=summary There are currently three directories with modules: * modules: This is the directory that contains modules that have been merged from both projects. * modules_k: This is the directory that contains updated Kamailio modules. * modules_s: This is the directory that contains updated SER modules. We have reached a significant milestone on our way towards one common project. It took a tremendous amount of work to get us where we are now and I would like to take the opportunity to thank all the people from both projects who made this possible. I will resist the temptation to list names, because there are too many of them, it's not necessarily only the people who you see active on the mailing lists. So here is your "thank you" in big friendly letters: T H A N K Y O U There is still a lot of work waiting for us, but it will hopefully be more exciting and interesting than the migration process itself. There are still some modules that don't compile, scripts and tools that are missing, and so on. But we are on the track and if we keep shoveling coal into the machine, I am sure the train will get to the "sip-router" station soon, no matter how far the station may seem now :-). Jan.

15 years, 9 months

git commit message guidelines

by Daniel-Constantin Mierla

Hello, you can find guidelines to write the commit message at: http://sip-router.org/wiki/devel/git-commit-guidelines The goal is to get to kind of common format to make life easier for tracking changes and building summaries out of the logs. Please add if you think something should be there in the commit messages. Thanks, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

15 years, 9 months

git:master: port from kamailio 1.5 branch r5795, related to bug #2416621

by Henning Westerholt

Module: sip-router Branch: master Commit: 4ae3936acf4cf24fd28abcf46826277cb85c3a8a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ae3936… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 16 14:11:04 2009 +0200 port from kamailio 1.5 branch r5795, related to bug #2416621 --- modules_k/nat_traversal/nat_traversal.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/modules_k/nat_traversal/nat_traversal.c b/modules_k/nat_traversal/nat_traversal.c index 86e2731..dfe7e4d 100644 --- a/modules_k/nat_traversal/nat_traversal.c +++ b/modules_k/nat_traversal/nat_traversal.c @@ -1,6 +1,6 @@ /* $Id$ * - * Copyright (C) 2007-2008 Dan Pascu + * Copyright (C) 2007-2009 Dan Pascu * * This file is part of Kamailio, a free SIP server. * @@ -1406,23 +1406,26 @@ NAT_Keepalive(struct sip_msg *msg) static int FixContact(struct sip_msg *msg) { - str before_host, after; + str before_host, after, newip; + unsigned short port, newport; contact_t* contact; struct lump* anchor; struct sip_uri uri; - char *newip, *buf; - int len, newiplen, offset; + int len, offset; + char *buf; if (!get_contact_uri(msg, &uri, &contact)) return -1; - newip = ip_addr2a(&msg->rcv.src_ip); - newiplen = strlen(newip); + newip.s = ip_addr2a(&msg->rcv.src_ip); + newip.len = strlen(newip.s); + newport = msg->rcv.src_port; - // Don't do anything if the IP's are the same, just return success. - if (newiplen==uri.host.len && memcmp(uri.host.s, newip, newiplen)==0) { + port = uri.port_no ? uri.port_no : 5060; + + // Don't do anything if the address is the same, just return success. + if (STR_MATCH_STR(uri.host, newip) && port==newport) return 1; - } if (uri.port.len == 0) uri.port.s = uri.host.s + uri.host.len; @@ -1432,7 +1435,7 @@ FixContact(struct sip_msg *msg) after.s = uri.port.s + uri.port.len; after.len = contact->uri.s + contact->uri.len - after.s; - len = before_host.len + newiplen + after.len + 20; + len = before_host.len + newip.len + after.len + 20; // first try to alloc mem. if we fail we don't want to have the lump // deleted and not replaced. at least this way we keep the original. @@ -1451,7 +1454,7 @@ FixContact(struct sip_msg *msg) } len = sprintf(buf, "%.*s%s:%d%.*s", before_host.len, before_host.s, - newip, msg->rcv.src_port, after.len, after.s); + newip.s, newport, after.len, after.s); if (insert_new_lump_after(anchor, buf, len, HDR_CONTACT_F) == 0) { pkg_free(buf);

15 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev