sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
402 discussions

git:master: modules/sipt: initial import of module
by Torrey Searle 04 Apr '13

04 Apr '13

Module: sip-router Branch: master Commit: a45583716671406f6a76cfdf8778517a28cbf2e3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a455837… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Thu Apr 4 10:20:08 2013 +0200 modules/sipt: initial import of module --- modules/sipt/Makefile | 18 ++ modules/sipt/README | 86 ++++++++ modules/sipt/doc/Makefile | 4 + modules/sipt/doc/sipt.xml | 31 +++ modules/sipt/doc/sipt_admin.xml | 83 ++++++++ modules/sipt/sipt.c | 419 +++++++++++++++++++++++++++++++++++++++ modules/sipt/ss7.h | 149 ++++++++++++++ modules/sipt/ss7_parser.c | 302 ++++++++++++++++++++++++++++ 8 files changed, 1092 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a45…

1 0

New developer: Torrey Searle
by Daniel-Constantin Mierla 04 Apr '13

04 Apr '13

Hello, I want to announce that a new person got developer GIT write access to repository: Torrey Searle - he is going to add and maintain the sipt module, facilitating operations over SIP-T/SIP-I messages, the patch being on tracker: - http://sip-router.org/tracker/index.php?do=details&task_id=281&project=1 His git commit id is: tsearle My warm welcome and looking forward to future work within the project! Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, April 16-17, 2013, Berlin - http://conference.kamailio.com -

3 2

git:master: doc/cfg_list: added stun to cfg docbook Makefile
by Peter Dunkley 03 Apr '13

03 Apr '13

Module: sip-router Branch: master Commit: 6a547b27a6e4715f2ccc3094018ed564066f7834 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a547b2… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 4 00:38:56 2013 +0100 doc/cfg_list: added stun to cfg docbook Makefile --- doc/cfg_list/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/doc/cfg_list/Makefile b/doc/cfg_list/Makefile index 5274e84..854f25c 100644 --- a/doc/cfg_list/Makefile +++ b/doc/cfg_list/Makefile @@ -30,7 +30,8 @@ files_list= \ $(COREPATH)/modules/tls/tls_cfg.c:tls \ $(COREPATH)/modules/dispatcher/config.c:dispatcher \ $(COREPATH)/modules/websocket/config.c:websocket \ - $(COREPATH)/modules/outbound/config.c:outbound + $(COREPATH)/modules/outbound/config.c:outbound \ + $(COREPATH)/modules/stun/config.c:stun # list of excluded groups

1 0

git:master: modules/outbound: a bit of tidying up
by Peter Dunkley 03 Apr '13

03 Apr '13

Module: sip-router Branch: master Commit: fc1f1b750f911f7fa2d453f6ce61f011844536a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc1f1b7… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 4 00:37:22 2013 +0100 modules/outbound: a bit of tidying up --- modules/outbound/config.c | 25 +++++++++++++------------ modules/outbound/config.h | 15 ++++++++++----- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/modules/outbound/config.c b/modules/outbound/config.c index 6c90a04..bcb6fbb 100644 --- a/modules/outbound/config.c +++ b/modules/outbound/config.c @@ -1,19 +1,20 @@ /* * $Id$ - * This file is part of SIP-router, a free SIP server. * - * SIP-router is free software; you can redistribute it and/or modify + * 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 * - * SIP-router is distributed in the hope that it will be useful, + * 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 + * 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 * */ @@ -25,18 +26,18 @@ */ #include "../../cfg/cfg.h" -#include "../../parser/msg_parser.h" /* method types */ - #include "config.h" struct cfg_group_outbound default_outbound_cfg = { 0, /* Read only variable to mark if outbound is enabled */ - }; +}; + +void *outbound_cfg = &default_outbound_cfg; -void *outbound_cfg = &default_outbound_cfg; +cfg_def_t outbound_cfg_def[] = { + { "outbound_enabled", CFG_VAR_INT | CFG_ATOMIC | CFG_READONLY, + 0, 0, 0, 0, + "If set to one (true) Outbound is enabled." }, -cfg_def_t outbound_cfg_def[] = { - {"outbound_enabled", CFG_VAR_INT | CFG_ATOMIC | CFG_READONLY, 0, 0, 0, 0, - "If set to one (true) Outbound is enabled."}, {0, 0, 0, 0, 0, 0} }; diff --git a/modules/outbound/config.h b/modules/outbound/config.h index a2cea4c..0410ff5 100644 --- a/modules/outbound/config.h +++ b/modules/outbound/config.h @@ -1,7 +1,14 @@ /* * $Id$ * - * SIP-router is distributed in the hope that it will be useful, + * 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. @@ -9,6 +16,7 @@ * 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 + * */ /*! @@ -21,10 +29,7 @@ #ifndef _OUTBOUND_CONFIG_H #define _OUTBOUND_CONFIG_H -#include "../../qvalue.h" - #include "../../cfg/cfg.h" -#include "../../str.h" struct cfg_group_outbound { int outbound_active; @@ -34,4 +39,4 @@ extern struct cfg_group_outbound default_outbound_cfg; extern void *outbound_cfg; extern cfg_def_t outbound_cfg_def[]; -#endif +#endif /* _OUTBOUND_CONFIG_H */

1 0

git:master: modules/stun: added read-only stun_active cfg value
by Peter Dunkley 03 Apr '13

03 Apr '13

Module: sip-router Branch: master Commit: 91b357872f06e988fd09003cffc02742d2731ce3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91b3578… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 4 00:38:25 2013 +0100 modules/stun: added read-only stun_active cfg value --- modules/stun/config.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ modules/stun/config.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ modules/stun/stun_mod.c | 8 ++++++++ 3 files changed, 97 insertions(+), 0 deletions(-) diff --git a/modules/stun/config.c b/modules/stun/config.c new file mode 100644 index 0000000..422d376 --- /dev/null +++ b/modules/stun/config.c @@ -0,0 +1,45 @@ +/* + * $Id$ + * + * Copyright (C) 2013 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 + * + */ + +/*! + * \file + * \brief STUN :: Configuration + * \ingroup stun + */ + +#include "../../cfg/cfg.h" +#include "config.h" + +struct cfg_group_stun default_stun_cfg = { + 0, /* Read only variable to mark if stun is enabled */ + }; + +void *stun_cfg = &default_stun_cfg; + +cfg_def_t stun_cfg_def[] = { + { "stun_enabled", CFG_VAR_INT | CFG_ATOMIC | CFG_READONLY, + 0, 0, 0, 0, + "If set to one (true) STUN is enabled." }, + + {0, 0, 0, 0, 0, 0} +}; diff --git a/modules/stun/config.h b/modules/stun/config.h new file mode 100644 index 0000000..2855e54 --- /dev/null +++ b/modules/stun/config.h @@ -0,0 +1,44 @@ +/* + * $Id$ + * + * Copyright (C) 2013 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 + * + */ + +/*! + * \file + * \brief STUN :: Configuration Framework support + * \ingroup stun + */ + + +#ifndef _STUN_CONFIG_H +#define _STUN_CONFIG_H + +#include "../../cfg/cfg.h" + +struct cfg_group_stun { + int stun_active; +}; + +extern struct cfg_group_stun default_stun_cfg; +extern void *stun_cfg; +extern cfg_def_t stun_cfg_def[]; + +#endif /* _STUN_CONFIG_H */ diff --git a/modules/stun/stun_mod.c b/modules/stun/stun_mod.c index 5797de6..ae1c981 100644 --- a/modules/stun/stun_mod.c +++ b/modules/stun/stun_mod.c @@ -26,6 +26,7 @@ #include "../../ip_addr.h" #include "../../sr_module.h" #include "kam_stun.h" +#include "config.h" MODULE_VERSION @@ -56,6 +57,13 @@ static int mod_init(void) return -1; } + if (cfg_declare("stun", stun_cfg_def, &default_stun_cfg, + cfg_sizeof(stun), &stun_cfg)) { + LM_ERR("declaring config framework variable\n"); + return -1; + } + default_stun_cfg.stun_active = 1; + return 0; }

1 0

git:master: modules/websocket: removed some unnecessary includes
by Peter Dunkley 03 Apr '13

03 Apr '13

Module: sip-router Branch: master Commit: 0c49defdd27567e522c0555a9a40b0c76f5ef865 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c49def… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 4 00:38:01 2013 +0100 modules/websocket: removed some unnecessary includes --- modules/websocket/config.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/websocket/config.h b/modules/websocket/config.h index f053dbc..690649e 100644 --- a/modules/websocket/config.h +++ b/modules/websocket/config.h @@ -30,8 +30,6 @@ #ifndef _WS_CONFIG_H #define _WS_CONFIG_H -#include "../../qvalue.h" -#include "../../str.h" #include "../../cfg/cfg.h" struct cfg_group_websocket

1 0

git:master: modules/websocket: moved config framework stuff to separate files
by Peter Dunkley 03 Apr '13

03 Apr '13

Module: sip-router Branch: master Commit: fe912bc27e41906902f5d25838eac95304c332eb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe912bc… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 4 00:22:49 2013 +0100 modules/websocket: moved config framework stuff to separate files - To facilitate docbook --- modules/websocket/config.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ modules/websocket/config.h | 46 ++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 0 deletions(-) diff --git a/modules/websocket/config.c b/modules/websocket/config.c new file mode 100644 index 0000000..e6e6a50 --- /dev/null +++ b/modules/websocket/config.c @@ -0,0 +1,56 @@ +/* + * $Id$ + * + * Copyright (C) 2012-2013 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 + * + */ + +/*! + * \file + * \brief WebSocket :: Configuration + * \ingroup WebSocket + */ + +#include "../../cfg/cfg.h" +#include "ws_frame.h" +#include "config.h" + +struct cfg_group_websocket default_ws_cfg = +{ + DEFAULT_KEEPALIVE_TIMEOUT, /* keepalive_timeout */ + 1 /* enabled */ +}; + +void *ws_cfg = &default_ws_cfg; + +cfg_def_t ws_cfg_def[] = +{ + /* ws_frame.c */ + { "keepalive_timeout", CFG_VAR_INT | CFG_ATOMIC, + 0, 0, 0, 0, + "Time (in seconds) after which to send a keep-alive on idle" + " WebSocket connections." }, + + /* ws_handshake.c */ + { "enabled", CFG_VAR_INT | CFG_ATOMIC, + 0, 0, 0, 0, + "Shows whether WebSockets are enabled or not." }, + + { 0, 0, 0, 0, 0, 0 } +}; diff --git a/modules/websocket/config.h b/modules/websocket/config.h new file mode 100644 index 0000000..f053dbc --- /dev/null +++ b/modules/websocket/config.h @@ -0,0 +1,46 @@ +/* + * $Id$ + * + * Copyright (C) 2012-2013 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 + * + */ + +/*! + * \file + * \brief WebSocket :: Configuration Framework support + * \ingroup WebSocket + */ + +#ifndef _WS_CONFIG_H +#define _WS_CONFIG_H + +#include "../../qvalue.h" +#include "../../str.h" +#include "../../cfg/cfg.h" + +struct cfg_group_websocket +{ + int keepalive_timeout; + int enabled; +}; +extern struct cfg_group_websocket default_ws_cfg; +extern void *ws_cfg; +extern cfg_def_t ws_cfg_def[]; + +#endif /* _WS_CONFIG_H */

1 0

git:master: modules/websocket: updated copyright year
by Peter Dunkley 03 Apr '13

03 Apr '13

Module: sip-router Branch: master Commit: a33d556fc5c6c11d6364daed01bf91dbf552784b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a33d556… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 4 00:23:16 2013 +0100 modules/websocket: updated copyright year - also remove configuration framework stuff in preparation for putting it in separate files. --- modules/websocket/README | 2 +- modules/websocket/doc/websocket.xml | 2 +- modules/websocket/ws_conn.c | 2 +- modules/websocket/ws_conn.h | 2 +- modules/websocket/ws_frame.c | 3 ++- modules/websocket/ws_frame.h | 4 +++- modules/websocket/ws_handshake.c | 3 ++- modules/websocket/ws_handshake.h | 2 +- modules/websocket/ws_mod.c | 28 ++-------------------------- modules/websocket/ws_mod.h | 9 +-------- 10 files changed, 15 insertions(+), 42 deletions(-) diff --git a/modules/websocket/README b/modules/websocket/README index 0ef44d5..dca3e3a 100644 --- a/modules/websocket/README +++ b/modules/websocket/README @@ -4,7 +4,7 @@ Peter Dunkley Crocodile RCS Ltd - Copyright © 2012 Crocodile RCS Ltd + Copyright © 2012-2013 Crocodile RCS Ltd __________________________________________________________________ Table of Contents diff --git a/modules/websocket/doc/websocket.xml b/modules/websocket/doc/websocket.xml index 74cc28d..93aef5f 100644 --- a/modules/websocket/doc/websocket.xml +++ b/modules/websocket/doc/websocket.xml @@ -23,7 +23,7 @@ </author> </authorgroup> <copyright> - <year>2012</year> + <year>2012-2013</year> <holder>Crocodile RCS Ltd</holder> </copyright> </bookinfo> diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index 0d4b9f2..92e2559 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) 2012 Crocodile RCS Ltd + * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. * diff --git a/modules/websocket/ws_conn.h b/modules/websocket/ws_conn.h index 82e1af8..d022d0e 100644 --- a/modules/websocket/ws_conn.h +++ b/modules/websocket/ws_conn.h @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) 2012 Crocodile RCS Ltd + * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. * diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index 4212158..d1f8d6c 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) 2012 Crocodile RCS Ltd + * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. * @@ -37,6 +37,7 @@ #include "ws_frame.h" #include "ws_mod.h" #include "ws_handshake.h" +#include "config.h" /* 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 diff --git a/modules/websocket/ws_frame.h b/modules/websocket/ws_frame.h index 2a6942e..e10d584 100644 --- a/modules/websocket/ws_frame.h +++ b/modules/websocket/ws_frame.h @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) 2012 Crocodile RCS Ltd + * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. * @@ -45,6 +45,8 @@ enum #define DEFAULT_KEEPALIVE_MECHANISM KEEPALIVE_MECHANISM_PING extern int ws_keepalive_mechanism; +#define DEFAULT_KEEPALIVE_TIMEOUT 180 /* seconds */ + extern str ws_ping_application_data; #define DEFAULT_PING_APPLICATION_DATA SERVER_HDR #define DEFAULT_PING_APPLICATION_DATA_LEN SERVER_HDR_LEN diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index 739e7cf..ce5dcbb 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) 2012 Crocodile RCS Ltd + * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. * @@ -39,6 +39,7 @@ #include "ws_conn.h" #include "ws_handshake.h" #include "ws_mod.h" +#include "config.h" #define WS_VERSION (13) diff --git a/modules/websocket/ws_handshake.h b/modules/websocket/ws_handshake.h index d9244ab..1ca5fc3 100644 --- a/modules/websocket/ws_handshake.h +++ b/modules/websocket/ws_handshake.h @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) 2012 Crocodile RCS Ltd + * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. * diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index 54ea209..4159a47 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) 2012 Crocodile RCS Ltd + * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. * @@ -37,6 +37,7 @@ #include "ws_handshake.h" #include "ws_frame.h" #include "ws_mod.h" +#include "config.h" MODULE_VERSION @@ -52,7 +53,6 @@ sl_api_t ws_slb; #define DEFAULT_KEEPALIVE_INTERVAL 1 static int ws_keepalive_interval = DEFAULT_KEEPALIVE_INTERVAL; -#define DEFAULT_KEEPALIVE_TIMEOUT 180 /* seconds */ static int ws_keepalive_timeout = DEFAULT_KEEPALIVE_TIMEOUT; #define DEFAULT_KEEPALIVE_PROCESSES 1 @@ -154,30 +154,6 @@ struct module_exports exports= child_init /* per-child initialization function */ }; -static cfg_def_t ws_cfg_def[] = -{ - /* ws_frame.c */ - { "keepalive_timeout", CFG_VAR_INT | CFG_ATOMIC, - 0, 0, 0, 0, - "Time (in seconds) after which to send a keep-alive on idle" - " WebSocket connections." }, - - /* ws_handshake.c */ - { "enabled", CFG_VAR_INT | CFG_ATOMIC, - 0, 0, 0, 0, - "Shows whether WebSockets are enabled or not." }, - - { 0, 0, 0, 0, 0, 0 } -}; - -struct cfg_group_websocket default_ws_cfg = -{ - DEFAULT_KEEPALIVE_TIMEOUT, /* keepalive_timeout */ - 1 /* enabled */ -}; -void *ws_cfg = &default_ws_cfg; - - static int mod_init(void) { if (sl_load_api(&ws_slb) != 0) diff --git a/modules/websocket/ws_mod.h b/modules/websocket/ws_mod.h index fa47b3b..819d3ea 100644 --- a/modules/websocket/ws_mod.h +++ b/modules/websocket/ws_mod.h @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) 2012 Crocodile RCS Ltd + * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. * @@ -39,11 +39,4 @@ extern gen_lock_t *ws_stats_lock; extern int ws_ping_interval; /* time (in seconds) between sending Pings */ -struct cfg_group_websocket -{ - int keepalive_timeout; - int enabled; -}; -extern void *ws_cfg; /* module configuration structure */ - #endif /* _WS_MOD_H */

1 0

git:master: doc/cfg_list: added outbound and websocket to cfg doc generation
by Peter Dunkley 03 Apr '13

03 Apr '13

Module: sip-router Branch: master Commit: 124a40aa8c2de6831bc801899aeaa9ec05bebf77 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=124a40a… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 4 00:23:54 2013 +0100 doc/cfg_list: added outbound and websocket to cfg doc generation --- doc/cfg_list/Makefile | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/cfg_list/Makefile b/doc/cfg_list/Makefile index 10bcadc..5274e84 100644 --- a/doc/cfg_list/Makefile +++ b/doc/cfg_list/Makefile @@ -28,8 +28,9 @@ files_list= \ $(COREPATH)/modules/carrierroute/config.c:carrierroute \ $(COREPATH)/modules/malloc_test/malloc_test.c:malloc_test \ $(COREPATH)/modules/tls/tls_cfg.c:tls \ - $(COREPATH)/modules/dispatcher/config.c:dispatcher - + $(COREPATH)/modules/dispatcher/config.c:dispatcher \ + $(COREPATH)/modules/websocket/config.c:websocket \ + $(COREPATH)/modules/outbound/config.c:outbound # list of excluded groups

1 0

git:master: modules/outbound: updated year in copyright statement
by Peter Dunkley 03 Apr '13

03 Apr '13

Module: sip-router Branch: master Commit: f85976ec461fc8325c9fa55e2b38ffef132098e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f85976e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 4 00:22:15 2013 +0100 modules/outbound: updated year in copyright statement --- modules/outbound/README | 2 +- modules/outbound/api.h | 2 +- modules/outbound/doc/outbound.xml | 2 +- modules/outbound/ob_mod.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/outbound/README b/modules/outbound/README index c6b52dc..505ea29 100644 --- a/modules/outbound/README +++ b/modules/outbound/README @@ -4,7 +4,7 @@ Peter Dunkley Crocodile RCS Ltd - Copyright © 2012 Crocodile RCS Ltd + Copyright © 2012-2013 Crocodile RCS Ltd __________________________________________________________________ Table of Contents diff --git a/modules/outbound/api.h b/modules/outbound/api.h index 2667fde..fc0e8b9 100644 --- a/modules/outbound/api.h +++ b/modules/outbound/api.h @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) 2012 Crocodile RCS Ltd + * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. * diff --git a/modules/outbound/doc/outbound.xml b/modules/outbound/doc/outbound.xml index fcf307c..0f770d7 100644 --- a/modules/outbound/doc/outbound.xml +++ b/modules/outbound/doc/outbound.xml @@ -23,7 +23,7 @@ </author> </authorgroup> <copyright> - <year>2012</year> + <year>2012-2013</year> <holder>Crocodile RCS Ltd</holder> </copyright> </bookinfo> diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 411e354..25edf15 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) 2012 Crocodile RCS Ltd + * Copyright (C) 2012-2013 Crocodile RCS Ltd * * This file is part of Kamailio, a free SIP server. *

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013