sr-dev May 2013

sr-dev@lists.kamailio.org

29 participants
317 discussions

git:master: Makefile.defs: version set to 4.1.0-dev6

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2e6675bd92968fd96865ee266ca4ba10c7cc1cdc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e6675b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 25 17:14:23 2013 +0200 Makefile.defs: version set to 4.1.0-dev6 --- Makefile.defs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index b5fe3bb..7026f5d 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -161,11 +161,11 @@ SCTP ?= 1 # what to install INSTALL_FLAVOUR=$(FLAVOUR) -#version number +# version number VERSION = 4 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -dev5 +EXTRAVERSION = -dev6 # memory manager switcher # 0 - f_malloc (fast malloc)

11 years, 6 months

git:master: sctp: added skeleton files for docbook module documentation

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c4cf64ea992e0f0f46f1c6fc23c6f38c05a80b0f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4cf64e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 25 17:05:58 2013 +0200 sctp: added skeleton files for docbook module documentation --- modules/sctp/README | 98 ++++++++++++++++++++++++++++++++++ modules/sctp/doc/Makefile | 4 ++ modules/sctp/doc/sctp.xml | 34 ++++++++++++ modules/sctp/doc/sctp_admin.xml | 110 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 246 insertions(+), 0 deletions(-) diff --git a/modules/sctp/README b/modules/sctp/README new file mode 100644 index 0000000..c6d1e02 --- /dev/null +++ b/modules/sctp/README @@ -0,0 +1,98 @@ +SCTP Module + +Daniel-Constantin Mierla + + <miconda(a)gmail.com> + +Andrei Pelinescu-Onciul + __________________________________________________________________ + + Table of Contents + + 1. Admin Guide + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Parameters + + 3.1. sctp_socket_rcvbuf (int) + 3.2. sctp_ (int) + + List of Examples + + 1.1. Set sctp_socket_rcvbuf parameter + 1.2. Set sctp_ parameter + +Chapter 1. Admin Guide + + Table of Contents + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Parameters + + 3.1. sctp_socket_rcvbuf (int) + 3.2. sctp_ (int) + +1. Overview + + This module provides SCTP transport layer for Kamailio. SCTP is an + acronym for Stream Control Transmission Protocol, read more about it + at: http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol + + The module itself implements the callbacks required by the core to + receive and send SIP messages over SCTP sockets. + + The core Makefile variable SCTP must be set to 1 (which is by default + set to 1 in Makefile.defs) and sources compiled with -DUSE_SCTP + (automatically set when SCTP=1). In other words, if core Makefiles are + not changed and SCTP variable is not overwritten from command line, + then the SCTP support in core is enabled. + +2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + +2.1. Kamailio Modules + + The following modules must be loaded before this module: + * none. + +2.2. External Libraries or Applications + + The following libraries or applications must be installed before + running Kamailio with this module loaded: + * libsctp - SCTP user space library available on Linux. To compile + the module, libsctp-dev is required as well. + +3. Parameters + + 3.1. sctp_socket_rcvbuf (int) + 3.2. sctp_ (int) + +3.1. sctp_socket_rcvbuf (int) + + Default value is automatically set based on OS limits. + + Example 1.1. Set sctp_socket_rcvbuf parameter +... +modparam("sctp", "sctp_socket_rcvbuf", ) +... + +3.2. sctp_ (int) + + Default value is 1. + + Example 1.2. Set sctp_ parameter +... +modparam("sctp", "sctp", ) +... diff --git a/modules/sctp/doc/Makefile b/modules/sctp/doc/Makefile new file mode 100644 index 0000000..953e62d --- /dev/null +++ b/modules/sctp/doc/Makefile @@ -0,0 +1,4 @@ +docs = sctp.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/sctp/doc/sctp.xml b/modules/sctp/doc/sctp.xml new file mode 100644 index 0000000..4f03c2f --- /dev/null +++ b/modules/sctp/doc/sctp.xml @@ -0,0 +1,34 @@ +<?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>SCTP Module</title> + <productname class="trade">kamailio.org</productname> + <authorgroup> + <author> + <firstname>Daniel-Constantin</firstname> + <surname>Mierla</surname> + <email>miconda(a)gmail.com</email> + </author> + <author> + <firstname>Andrei</firstname> + <surname>Pelinescu-Onciul</surname> + <address> + <email>andrei(a)iptel.org</email> + </address> + </author> + </authorgroup> + </bookinfo> + <toc></toc> + + <xi:include href="sctp_admin.xml"/> + +</book> diff --git a/modules/sctp/doc/sctp_admin.xml b/modules/sctp/doc/sctp_admin.xml new file mode 100644 index 0000000..f95bc9e --- /dev/null +++ b/modules/sctp/doc/sctp_admin.xml @@ -0,0 +1,110 @@ +<?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> + This module provides SCTP transport layer for &kamailio;. SCTP is an + acronym for Stream Control Transmission Protocol, read more about it + at: <ulink url="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol"> + http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol</ulink> + </para> + <para> + The module itself implements the callbacks required by the core to + receive and send SIP messages over SCTP sockets. + </para> + <para> + The core Makefile variable SCTP must be set to 1 (which is by default set + to 1 in Makefile.defs) and sources compiled with -DUSE_SCTP (automatically + set when SCTP=1). In other words, if core Makefiles are not changed and + SCTP variable is not overwritten from command line, then the SCTP + support in core is enabled. + </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>none</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>libsctp</emphasis> - SCTP user space library available + on Linux. To compile the module, libsctp-dev is required as well. + </para> + </listitem> + </itemizedlist> + </para> + </section> + </section> + <section> + <title>Parameters</title> + <section id="sctp.p.sctp_socket_rcvbuf"> + <title><varname>sctp_socket_rcvbuf</varname> (int)</title> + <para> + </para> + <para> + <emphasis> + Default value is automatically set based on OS limits. + </emphasis> + </para> + <example> + <title>Set <varname>sctp_socket_rcvbuf</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sctp", "sctp_socket_rcvbuf", ) +... +</programlisting> + </example> + </section> + + <section id="sctp.p."> + <title><varname>sctp_</varname> (int)</title> + <para> + </para> + <para> + <emphasis> + Default value is 1. + </emphasis> + </para> + <example> + <title>Set <varname>sctp_</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sctp", "sctp", ) +... +</programlisting> + </example> + </section> + </section> + +</chapter> +

11 years, 6 months

git:master: Makefile.groups: added compile group for sctp module

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 25c3df171d219eb71c63f4832b69f33b470c9c96 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25c3df1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 25 16:42:21 2013 +0200 Makefile.groups: added compile group for sctp module - depends on libsctp-dev --- Makefile.groups | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Makefile.groups b/Makefile.groups index ff2aa57..f27cdcb 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -101,6 +101,9 @@ mod_list_stun=stun # - modules depending on libval-threads libcrypto libsres libpthread mod_list_dnssec=dnssec +# - modules depending on libsctp +mod_list_sctp=sctp + # - modules related to SIMPLE presence extensions mod_list_presence=presence presence_conference presence_dialoginfo \ presence_mwi presence_profile presence_reginfo \ @@ -172,7 +175,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_iptrtpproxy) $(mod_list_mi_xmlrpc) \ $(mod_list_outbound) $(mod_list_osp) \ $(mod_list_java) $(mod_list_stun) \ - $(mod_list_dnssec)) + $(mod_list_dnssec) $(mod_list_sctp)) @@ -327,6 +330,9 @@ module_group_kstun=$(mod_list_stun) # pkg dnssec module module_group_kdnssec=$(mod_list_dnssec) +# pkg sctp module +module_group_ksctp=$(mod_list_sctp) + # list of static modules # static_modules:=

11 years, 6 months

git:master: protoshoot: use Makefile pattern for utils

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1bdbdb64e4862ddb69c2bf13be0f9be93968bb1e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1bdbdb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 25 16:30:33 2013 +0200 protoshoot: use Makefile pattern for utils - link to libsctp if SCTP support is enabled --- utils/protoshoot/Makefile | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/utils/protoshoot/Makefile b/utils/protoshoot/Makefile index 1adba1f..9f6efd4 100644 --- a/utils/protoshoot/Makefile +++ b/utils/protoshoot/Makefile @@ -1,13 +1,26 @@ # -include ../../Makefile.defs +COREPATH=../.. +include $(COREPATH)/Makefile.defs +include $(COREPATH)/Makefile.targets auto_gen= NAME=protoshoot +RELEASE=0.2 -include ../../Makefile.sources +ifneq (,$(findstring -DUSE_SCTP,$(C_DEFS))) +SCTP=1 +endif -include ../../Makefile.rules +ifeq ($(SCTP),1) +ifeq ($(OS), linux) + LIBS+= -lsctp +endif +endif + +include $(COREPATH)/Makefile.utils + +$(NAME).o: modules:

11 years, 6 months

git:master: core: filled sctp core api

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a2afc3d42224d0c35e4867ad50251e7aa6231879 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2afc3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 25 15:42:14 2013 +0200 core: filled sctp core api - cleanup of not needed members --- sctp_core.c | 29 ++++++++++------------------- sctp_core.h | 2 -- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/sctp_core.c b/sctp_core.c index 19ffda6..49b1da6 100644 --- a/sctp_core.c +++ b/sctp_core.c @@ -44,29 +44,20 @@ int sctp_core_init(void) */ void sctp_core_destroy(void) { -} - -/** - * - */ -int sctp_core_init_sock(struct socket_info* sock_info) -{ - return 0; -} + if(_sctp_srapi_set==0) { + LM_INFO("SCTP API not initialized\n"); + return; + } -/** - * - */ -void sctp_core_init_options(void) -{ + _sctp_srapi.destroy(); } /** * */ -int sctp_core_check_compiled_sockopts(char* buf, int size) +int sctp_core_init_sock(struct socket_info* sock_info) { - return 0; + return _sctp_srapi.init_sock(sock_info); } /** @@ -74,7 +65,7 @@ int sctp_core_check_compiled_sockopts(char* buf, int size) */ int sctp_core_check_support(void) { - return 0; + return _sctp_srapi.check_support(); } /** @@ -82,7 +73,7 @@ int sctp_core_check_support(void) */ int sctp_core_rcv_loop(void) { - return 0; + return _sctp_srapi.rcv_loop(); } /** @@ -90,7 +81,7 @@ int sctp_core_rcv_loop(void) */ int sctp_core_msg_send(struct dest_info* dst, char* buf, unsigned len) { - return 0; + return _sctp_srapi.msg_send(dst, buf, len); } /** diff --git a/sctp_core.h b/sctp_core.h index 362dd38..88e0470 100644 --- a/sctp_core.h +++ b/sctp_core.h @@ -52,8 +52,6 @@ typedef struct sctp_srapi { sctp_srapi_init_f init; sctp_srapi_destroy_f destroy; sctp_srapi_init_sock_f init_sock; - sctp_srapi_init_options_f init_options; - sctp_srapi_check_compiled_sockopts_f check_compiled_sockopts; sctp_srapi_check_support_f check_support; sctp_srapi_rcv_loop_f rcv_loop; sctp_srapi_msg_send_f msg_send;

11 years, 6 months

git:master: sctp: register sctp core api

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 61f5f6a63409f856a03b48e9ced22ad5c724acb2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61f5f6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 25 15:41:27 2013 +0200 sctp: register sctp core api - done in mod_register() function - initialize the sctp options before modparams --- modules/sctp/sctp_mod.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/modules/sctp/sctp_mod.c b/modules/sctp/sctp_mod.c index 2d71244..1469e6d 100644 --- a/modules/sctp/sctp_mod.c +++ b/modules/sctp/sctp_mod.c @@ -27,13 +27,18 @@ #include "../../sr_module.h" #include "../../dprint.h" +#include "../../shm_init.h" +#include "../../sctp_core.h" #include "sctp_options.h" +#include "sctp_server.h" #include "sctp_rpc.h" MODULE_VERSION static int mod_init(void); +static int sctp_mod_pre_init(void); + static cmd_export_t cmds[]={ {0, 0, 0, 0, 0, 0} @@ -78,10 +83,30 @@ struct module_exports exports = { 0 /* per child init function */ }; +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + if(!shm_initialized() && init_shm()<0) + return -1; + +#ifdef USE_SCTP + /* shm is used, be sure it is initialized */ + if(sctp_mod_pre_init()<0) + return -1; + return 0; +#else + LOG(L_CRIT, "sctp core support not enabled\n"); + return -1; +#endif +} static int mod_init(void) { #ifdef USE_SCTP + char tmp[256]; + if (sctp_check_compiled_sockopts(tmp, 256)!=0){ + LM_WARN("sctp unsupported socket options: %s\n", tmp); + } + if (sctp_register_cfg()){ LOG(L_CRIT, "could not register the sctp configuration\n"); return -1; @@ -96,3 +121,25 @@ static int mod_init(void) return -1; #endif /* USE_SCTP */ } + +static int sctp_mod_pre_init(void) +{ + sctp_srapi_t api; + + /* set defaults before the config mod params */ + init_sctp_options(); + + memset(&api, 0, sizeof(sctp_srapi_t)); + api.init = init_sctp; + api.destroy = destroy_sctp; + api.init_sock = sctp_init_sock; + api.check_support = sctp_check_support; + api.rcv_loop = sctp_rcv_loop; + api.msg_send = sctp_msg_send; + + if(sctp_core_register_api(&api)<0) { + LM_ERR("cannot regiser sctp core api\n"); + return -1; + } + return 0; +}

11 years, 6 months

git:master: core: remove sctp options init from core

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e9f7980602cadcc179425cad57a4d0f89c63fb55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9f7980… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 25 15:39:13 2013 +0200 core: remove sctp options init from core - will be done in mod_register() from sctp module - don't print anymore info about sctp unsupported socket options in output of -v, they are known now only in sctp module which is not loaded at that time - sctp will print a warn message in mod init about unsupported socket options --- main.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/main.c b/main.c index e489daf..05f45b5 100644 --- a/main.c +++ b/main.c @@ -1901,9 +1901,6 @@ int main(int argc, char** argv) #ifdef USE_TCP init_tcp_options(); /* set the defaults before the config */ #endif -#ifdef USE_SCTP - sctp_core_init_options(); /* set defaults before the config */ -#endif /* process command line (cfg. file path etc) */ optind = 1; /* reset getopt */ /* switches required before script processing */ @@ -1941,12 +1938,6 @@ int main(int argc, char** argv) printf("version: %s\n", full_version); printf("flags: %s\n", ver_flags ); print_ct_constants(); -#ifdef USE_SCTP - tmp=malloc(256); - if (tmp && (sctp_core_check_compiled_sockopts(tmp, 256)!=0)) - printf("sctp unsupported socket options: %s\n", tmp); - if (tmp) free(tmp); -#endif printf("id: %s\n", ver_id); printf("compiled on %s with %s\n", ver_compiled_time, ver_compiler );

11 years, 6 months

git:master: core: added sctp callbacks api

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 66e90f9888daefdb92dcebd28e188ce7f912a4f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=66e90f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 25 10:56:11 2013 +0200 core: added sctp callbacks api - functions needed in core - callbacks to be set by sctp module --- sctp_core.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ sctp_core.h | 22 +++++++++++++++++++ 2 files changed, 82 insertions(+), 7 deletions(-) diff --git a/sctp_core.c b/sctp_core.c index 863d578..19ffda6 100644 --- a/sctp_core.c +++ b/sctp_core.c @@ -20,40 +20,93 @@ #include "sctp_core.h" -int sctp_core_msg_send(struct dest_info* dst, char* buf, unsigned len) +/** + * + */ +static sctp_srapi_t _sctp_srapi = { 0 }; +static int _sctp_srapi_set = 0; + +/** + * + */ +int sctp_core_init(void) { - return 0; + if(_sctp_srapi_set==0) { + LM_ERR("SCTP API not initialized\n"); + return -1; + } + + return _sctp_srapi.init(); } +/** + * + */ void sctp_core_destroy(void) { } +/** + * + */ int sctp_core_init_sock(struct socket_info* sock_info) { return 0; } -int sctp_core_rcv_loop(void) +/** + * + */ +void sctp_core_init_options(void) +{ +} + +/** + * + */ +int sctp_core_check_compiled_sockopts(char* buf, int size) { return 0; } -void sctp_core_init_options(void) +/** + * + */ +int sctp_core_check_support(void) { + return 0; } -int sctp_core_check_compiled_sockopts(char* buf, int size) +/** + * + */ +int sctp_core_rcv_loop(void) { return 0; } -int sctp_core_check_support(void) +/** + * + */ +int sctp_core_msg_send(struct dest_info* dst, char* buf, unsigned len) { return 0; } -int sctp_core_init(void) +/** + * + */ +int sctp_core_register_api(sctp_srapi_t *api) { + if(api==NULL || api->init==NULL) { + LM_ERR("invalid parameters\n"); + return -1; + } + if(_sctp_srapi_set==1) { + LM_ERR("SCTP API already initialized\n"); + return -1; + } + _sctp_srapi_set = 1; + memcpy(&_sctp_srapi, api, sizeof(sctp_srapi_t)); return 0; } diff --git a/sctp_core.h b/sctp_core.h index 4e113c4..362dd38 100644 --- a/sctp_core.h +++ b/sctp_core.h @@ -24,19 +24,41 @@ #include "ip_addr.h" int sctp_core_init(void); +typedef int (*sctp_srapi_init_f)(void); void sctp_core_destroy(void); +typedef void (*sctp_srapi_destroy_f)(void); int sctp_core_init_sock(struct socket_info* sock_info); +typedef int (*sctp_srapi_init_sock_f)(struct socket_info* sock_info); void sctp_core_init_options(void); +typedef void (*sctp_srapi_init_options_f)(void); int sctp_core_check_compiled_sockopts(char* buf, int size); +typedef int (*sctp_srapi_check_compiled_sockopts_f)(char* buf, int size); int sctp_core_check_support(void); +typedef int (*sctp_srapi_check_support_f)(void); int sctp_core_rcv_loop(void); +typedef int (*sctp_srapi_rcv_loop_f)(void); int sctp_core_msg_send(struct dest_info* dst, char* buf, unsigned len); +typedef int (*sctp_srapi_msg_send_f)(struct dest_info* dst, char* buf, + unsigned len); + +typedef struct sctp_srapi { + sctp_srapi_init_f init; + sctp_srapi_destroy_f destroy; + sctp_srapi_init_sock_f init_sock; + sctp_srapi_init_options_f init_options; + sctp_srapi_check_compiled_sockopts_f check_compiled_sockopts; + sctp_srapi_check_support_f check_support; + sctp_srapi_rcv_loop_f rcv_loop; + sctp_srapi_msg_send_f msg_send; +} sctp_srapi_t; + +int sctp_core_register_api(sctp_srapi_t *api); #endif

11 years, 6 months

git:master: sctp: exported sctp parameters via module interface

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cbbaf9abd5f34b50c47ac2ac350c77d3f36b511b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbbaf9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 25 11:57:02 2013 +0200 sctp: exported sctp parameters via module interface --- modules/sctp/sctp_mod.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/modules/sctp/sctp_mod.c b/modules/sctp/sctp_mod.c index d8c0684..2d71244 100644 --- a/modules/sctp/sctp_mod.c +++ b/modules/sctp/sctp_mod.c @@ -40,6 +40,26 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ + {"sctp_socket_rcvbuf", PARAM_INT, &sctp_default_cfg.so_rcvbuf}, + {"sctp_socket_sndbuf", PARAM_INT, &sctp_default_cfg.so_sndbuf}, + {"sctp_autoclose", PARAM_INT, &sctp_default_cfg.autoclose}, + {"sctp_send_ttl", PARAM_INT, &sctp_default_cfg.send_ttl}, + {"sctp_send_retries", PARAM_INT, &sctp_default_cfg.send_retries}, + {"sctp_assoc_tracking", PARAM_INT, &sctp_default_cfg.assoc_tracking}, + {"sctp_assoc_reuse", PARAM_INT, &sctp_default_cfg.assoc_reuse}, + {"sctp_max_assocs", PARAM_INT, &sctp_default_cfg.max_assocs}, + {"sctp_srto_initial", PARAM_INT, &sctp_default_cfg.srto_initial}, + {"sctp_srto_max", PARAM_INT, &sctp_default_cfg.srto_max}, + {"sctp_srto_min", PARAM_INT, &sctp_default_cfg.srto_min}, + {"sctp_asocmaxrxt", PARAM_INT, &sctp_default_cfg.asocmaxrxt}, + {"sctp_init_max_attempts", PARAM_INT, &sctp_default_cfg.init_max_attempts}, + {"sctp_init_max_timeo", PARAM_INT, &sctp_default_cfg.init_max_timeo}, + {"sctp_hbinterval", PARAM_INT, &sctp_default_cfg.hbinterval}, + {"sctp_pathmaxrxt", PARAM_INT, &sctp_default_cfg.pathmaxrxt}, + {"sctp_sack_delay", PARAM_INT, &sctp_default_cfg.sack_delay}, + {"sctp_sack_freq", PARAM_INT, &sctp_default_cfg.sack_freq}, + {"sctp_max_burst", PARAM_INT, &sctp_default_cfg.max_burst}, + {0, 0, 0} };

11 years, 6 months

git:master: core: readded conditions for core sctp forwarding functions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e549d96b571ae509a67984be789b281ed2230bc3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e549d96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 25 11:24:22 2013 +0200 core: readded conditions for core sctp forwarding functions - typo fixed in log message --- cfg.y | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/cfg.y b/cfg.y index dd95a74..968888a 100644 --- a/cfg.y +++ b/cfg.y @@ -2930,39 +2930,84 @@ cmd: | FORWARD_TLS LPAREN error RPAREN { $$=0; yyerror("bad forward_tls argument"); } | FORWARD_SCTP LPAREN host RPAREN { + #ifdef USE_SCTP $$=mk_action(FORWARD_SCTP_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); + #else + $$=0; + yyerror("sctp support not compiled in"); + #endif } | FORWARD_SCTP LPAREN STRING RPAREN { + #ifdef USE_SCTP $$=mk_action(FORWARD_SCTP_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); + #else + $$=0; + yyerror("sctp support not compiled in"); + #endif } | FORWARD_SCTP LPAREN ip RPAREN { + #ifdef USE_SCTP $$=mk_action(FORWARD_SCTP_T, 2, IP_ST, (void*)$3, NUMBER_ST, 0); set_cfg_pos($$); + #else + $$=0; + yyerror("sctp support not compiled in"); + #endif } | FORWARD_SCTP LPAREN host COMMA NUMBER RPAREN { + #ifdef USE_SCTP $$=mk_action(FORWARD_SCTP_T, 2, STRING_ST, $3, NUMBER_ST, (void*)$5); set_cfg_pos($$); + #else + $$=0; + yyerror("sctp support not compiled in"); + #endif } | FORWARD_SCTP LPAREN STRING COMMA NUMBER RPAREN { + #ifdef USE_SCTP $$=mk_action(FORWARD_SCTP_T, 2, STRING_ST, $3, NUMBER_ST, (void*)$5); set_cfg_pos($$); + #else + $$=0; + yyerror("sctp support not compiled in"); + #endif } | FORWARD_SCTP LPAREN ip COMMA NUMBER RPAREN { + #ifdef USE_SCTP $$=mk_action(FORWARD_SCTP_T, 2, IP_ST, (void*)$3, NUMBER_ST, (void*)$5); set_cfg_pos($$); + #else + $$=0; + yyerror("sctp support not compiled in"); + #endif } | FORWARD_SCTP LPAREN URIHOST COMMA URIPORT RPAREN { + #ifdef USE_SCTP $$=mk_action(FORWARD_SCTP_T, 2, URIHOST_ST, 0, URIPORT_ST, 0); set_cfg_pos($$); + #else + $$=0; + yyerror("sctp support not compiled in"); + #endif } | FORWARD_SCTP LPAREN URIHOST COMMA NUMBER RPAREN { + #ifdef USE_SCTP $$=mk_action(FORWARD_SCTP_T, 2, URIHOST_ST, 0, NUMBER_ST, (void*)$5); set_cfg_pos($$); + #else + $$=0; + yyerror("sctp support not compiled in"); + #endif } | FORWARD_SCTP LPAREN URIHOST RPAREN { + #ifdef USE_SCTP $$=mk_action(FORWARD_SCTP_T, 2, URIHOST_ST, 0, NUMBER_ST, 0); set_cfg_pos($$); + #else + $$=0; + yyerror("tls support not compiled in"); + #endif } | FORWARD_SCTP error { $$=0; yyerror("missing '(' or ')' ?"); } | FORWARD_SCTP LPAREN error RPAREN { $$=0; - yyerror("bad forward_tls argument"); } + yyerror("bad forward_sctp argument"); } | LOG_TOK LPAREN STRING RPAREN {$$=mk_action(LOG_T, 2, NUMBER_ST, (void*)(L_DBG+1), STRING_ST, $3); set_cfg_pos($$); }

11 years, 6 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 May 2013