sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
429 discussions

git:master: dialog: SDP can be passed to MI/RPC dlg_bridge
by Daniel-Constantin Mierla 31 Mar '13

31 Mar '13

Module: sip-router Branch: master Commit: 2df6f560bcc54d2966732d397713a9cf3233d5fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2df6f56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 31 21:49:10 2013 +0200 dialog: SDP can be passed to MI/RPC dlg_bridge - rework from a patch of Patrick E. --- modules/dialog/dialog.c | 31 ++++++++++++++++++++++++++++--- modules/dialog/dlg_transfer.c | 11 ++++++++--- modules/dialog/dlg_transfer.h | 2 +- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index 804bc46..e560b4e 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -1097,7 +1097,7 @@ static int w_dlg_bridge(struct sip_msg *msg, char *from, char *to, char *op) return -1; } - if(dlg_bridge(&sf, &st, &so)!=0) + if(dlg_bridge(&sf, &st, &so, NULL)!=0) return -1; return 1; } @@ -1345,6 +1345,7 @@ struct mi_root * mi_dlg_bridge(struct mi_root *cmd_tree, void *param) str from = {0,0}; str to = {0,0}; str op = {0,0}; + str bd = {0,0}; struct mi_node* node; node = cmd_tree->node.kids; @@ -1374,9 +1375,23 @@ struct mi_root * mi_dlg_bridge(struct mi_root *cmd_tree, void *param) { return init_mi_tree(500, "Bad OP value", 12); } + if(op.len==1 && *op.s=='.') + { + op.s = NULL; + op.len = 0; + } + node= node->next; + if(node != NULL) + { + bd = node->value; + if(bd.len<=0 || bd.s==NULL) + { + return init_mi_tree(500, "Bad SDP value", 13); + } + } } - if(dlg_bridge(&from, &to, &op)!=0) + if(dlg_bridge(&from, &to, &op, &bd)!=0) return init_mi_tree(500, MI_INTERNAL_ERR_S, MI_INTERNAL_ERR_LEN); return init_mi_tree(200, MI_OK_S, MI_OK_LEN); @@ -1676,6 +1691,7 @@ static void rpc_dlg_bridge(rpc_t *rpc, void *c) { str from = {NULL,0}; str to = {NULL,0}; str op = {NULL,0}; + str bd = {NULL,0}; int n; n = rpc->scan(c, "SS", &from, &to); @@ -1687,9 +1703,18 @@ static void rpc_dlg_bridge(rpc_t *rpc, void *c) { if(rpc->scan(c, "*S", &op)<1) { op.s = NULL; op.len = 0; + } else { + if(op.len==1 && *op.s=='.') { + op.s = NULL; + op.len = 0; + } + if(rpc->scan(c, "*S", &bd)<1) { + bd.s = NULL; + bd.len = 0; + } } - dlg_bridge(&from, &to, &op); + dlg_bridge(&from, &to, &op, &bd); } static rpc_export_t rpc_methods[] = { diff --git a/modules/dialog/dlg_transfer.c b/modules/dialog/dlg_transfer.c index 25d9e8d..7245435 100644 --- a/modules/dialog/dlg_transfer.c +++ b/modules/dialog/dlg_transfer.c @@ -311,7 +311,7 @@ error: } -int dlg_bridge(str *from, str *to, str *op) +int dlg_bridge(str *from, str *to, str *op, str *bd) { dlg_transfer_ctx_t *dtc; int ret; @@ -350,8 +350,13 @@ int dlg_bridge(str *from, str *to, str *op) LM_DBG("bridge <%.*s> to <%.*s>\n", dtc->from.len, dtc->from.s, dtc->to.len, dtc->to.s); - s_body.s = DLG_HOLD_SDP; - s_body.len = DLG_HOLD_SDP_LEN; + if(bd!=NULL && bd->s!=NULL && bd->len>0) { + s_body.s = bd->s; + s_body.len = bd->len; + } else { + s_body.s = DLG_HOLD_SDP; + s_body.len = DLG_HOLD_SDP_LEN; + } memset(&uac_r, '\0', sizeof(uac_req_t)); uac_r.method = &s_method; diff --git a/modules/dialog/dlg_transfer.h b/modules/dialog/dlg_transfer.h index ef05eeb..5337f38 100644 --- a/modules/dialog/dlg_transfer.h +++ b/modules/dialog/dlg_transfer.h @@ -32,7 +32,7 @@ typedef struct _dlg_transfer_ctx { struct dlg_cell *dlg; } dlg_transfer_ctx_t; -int dlg_bridge(str *from, str *to, str *op); +int dlg_bridge(str *from, str *to, str *op, str *bd); int dlg_transfer(struct dlg_cell *dlg, str *to, int side); int dlg_bridge_init_hdrs(void); void dlg_bridge_destroy_hdrs(void);

1 0

Re: [sr-dev] Websocket module: Suggestions
by Peter Dunkley 31 Mar '13

31 Mar '13

Feel free to commit any changes you have to outbound. There should be one difference between the enabled in WebSocket and in outbound. WebSocket already had the ability to be enabled/disabled through an MI command so the enabled cfg variable there actually does enable/disable WebSocket, but the outbound enabled variable should definitely be read-only. Regards, Peter "Olle E. Johansson" <oej(a)edvina.net> wrote: > >30 mar 2013 kl. 21:33 skrev "Peter Dunkley" <peter.dunkley(a)crocodile-rcs.com>: > >> Done. I think. >> >> I don't have a system here to test WebSockets at the moment, but the >> changes looked pretty straight-forward and it all compiles OK :-) >> >> Can you take a look and tell me if it is what you were thinking? > >kamcmd> cfg.get websocket keepalive_timeout >180 >kamcmd> cfg.get websocket enabled >1 > > >kamcmd> cfg.list >websocket: keepalive_timeout >websocket: enabled > >kamcmd> cfg.help websocket keepalive_timeout >Time (in seconds) after which to send a keep-alive on idle WebSocket connections. >(parameter type is integer) >---------------------------------------------------- > >This should be useful in snmpstats. Thanks! I'll work on that soon. > >I have a similar patch with "outbound enabled" - ok to commit in your module? > >That will be easy to copy to other module, like app_* and dnssec ;-) > >Having this functionality helps apps using RPC as well as SNMPstats users. Siremis is one good example. Ovidiu's HTTP >framework is another. > >Database connections would be another good thing to be able to monitor with SNMP. I think we're on to something here. > >- Use a read-only config framework variable to declare a module loaded, initiated and working. >- Use other variables for settings that can be changeable during runtime (but not during processing of a single message, > which is a cool thing with the config framework). >- Use this for exposing (read-only) functionality like "database connected and working" > >- Use this for modparams that you allow to change during runtime. > >Since there is a read-only flag, I suspect this was part of the design. > >What does the rest of the development gang think? Is this something useful - to use the config framework to >tell other modules about the state of a module, not just configuration parameters? > >If we agree on this, we can add these flags to more modules as we go along. > >/O

1 0

[tracker] Comment added: OpenBSD5.2 Crash on t_relay()
by sip-router 31 Mar '13

31 Mar '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#280 - OpenBSD5.2 Crash on t_relay() User who did this - Jody Rudolph (jrudolph) ---------- Unfortunately, I have yet to find the equivalent to enable this in OpenBSD. Currently trying. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=280#comment814 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: OpenBSD5.2 Crash on t_relay()
by sip-router 31 Mar '13

31 Mar '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#280 - OpenBSD5.2 Crash on t_relay() User who did this - Daniel-Constantin Mierla (miconda) ---------- Perhaps the corefile was overwritten by the main process, not by the one that crashed. You have to enable one core file per process. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=280#comment813 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task opened: OpenBSD5.2 Crash on t_relay()
by sip-router 31 Mar '13

31 Mar '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Jody Rudolph (jrudolph) Attached to Project - sip-router Summary - OpenBSD5.2 Crash on t_relay() Task Type - Bug Report Category - Core Status - Unconfirmed Assigned To - Operating System - OpenBSD Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - I am working with two systems (one CentOS Linux and one OpenBSD5.2) both with current 4.0.x GIT. When using the same minimal testing configuration settings, the OpenBSD system crashes when t_realy is called where the Linux system does not. The configurations are minimal (testing, non-production) carrier-route look-up, then t_relay The debug logging only shows (ip addresses and telephone numbers as x): 3(17327) DEBUG: carrierroute [cr_func.c:391]: searching for matching routing rules 3(17327) DEBUG: carrierroute [prime_hash.c:68]: hash: 1286613114 % 1000 = 114 3(17327) INFO: carrierroute [cr_func.c:595]: uri 17162597157 was rewritten to sip:1xxxxxxxxxx@xxx.xxx.xxx.xxx, carrier 1, domain 3 3(17327) DEBUG: <core> [socket_info.c:589]: grep_sock_info - checking if host==us: 11==12 && [xxx.xxx.xxx.xxx] == [xxx.xxx.xxx.xxx] 3(17327) DEBUG: <core> [socket_info.c:589]: grep_sock_info - checking if host==us: 11==11 && [xxx.xxx.xxx.xxx] == [xxx.xxx.xxx.xxx] 3(17327) DEBUG: tm [t_lookup.c:1395]: DEBUG: t_newtran: msg id=1 , global msg id=1 , T on entrance=0x0 3(17327) DEBUG: tm [t_lookup.c:534]: t_lookup_request: start searching: hash=63088, isACK=0 3(17327) DEBUG: tm [t_lookup.c:492]: DEBUG: RFC3261 transaction matching failed 3(17327) DEBUG: tm [t_lookup.c:716]: DEBUG: t_lookup_request: no transaction found 3(17327) DEBUG: tm [t_funcs.c:347]: SER: new INVITE 0(16201) ALERT: <core> [main.c:788]: child process 17327 exited by a signal 10 0(16201) ALERT: <core> [main.c:791]: core was generated 0(16201) INFO: <core> [main.c:803]: INFO: terminating due to SIGCHLD 20(21875) INFO: <core> [main.c:854]: INFO: signal 15 received 15(5638) INFO: <core> [main.c:854]: INFO: signal 15 received 16(1417) INFO: <core> [main.c:854]: INFO: signal 15 received The backtrace always shows this (and not much else): #0 0x000000000031ff18 in cfg_destroy () at cfg/cfg_struct.c:306 306 old_string = *(char **)(block + group->var_offset + mapping[i].offset); (gdb) bt full #0 0x000000000031ff18 in cfg_destroy () at cfg/cfg_struct.c:306 No locals. #1 0x0000000000176660 in cleanup (show_status=1) at main.c:590 memlog = Variable "memlog" is not available. (gdb) More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=280 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

Websocket module: Suggestions
by Olle E. Johansson 31 Mar '13

31 Mar '13

Hi! Looking at Websockets from a SNMP perspective, I would like to thank you for implementing counters - I just added them to SNMPstats. In addition, I would like to be able to discover sub-protocols used (msrp, sip). I fail to see how I can do that now. Do we have a Core API for publishing read-only data from modules? I guess we maybe could use PVs or XAVPs for that. An ugly way would be to implement RPC in SNMPstats and issue RPC commands internally to fetch data, but that means a lot of serializing that really is not needed as SNMPstats generally fetches one parameter (OID) at a time, not complete sets. Also, some of the modparam parameters could be exposed as cfg params - which would make it easier to change them at runtime with sercmd, but also expose them in SNMPstats. I think keepalive_interval and keepalive_timeout are candidates for this. Cheers! /O ----------------------------- Copy of my commit message, just to repeat myself: Hint to developers: If you add statistics and selects in your module, you make it very easy to add SNMP support for your module. Then SNMPstats can just use generic APIs to find your data. Please also add a generic way of finding out if a module is configured and used too, if possible. Sometimes modules are just loaded, but not used anywhere. Better to reflect real data in SNMP if possible. Using the old "SER" way of using selects for config data that is allowed to change at runtime opens up for SNMP writes to manage your module as well. And of course, using selects and counters/statistics variables also helps the RPC interface, so it's both cool and the Right Thing To Do (TM). Yes, commit messages can be informative as well. :-)

2 6

gruu lookup
by Juha Heinanen 31 Mar '13

31 Mar '13

while testing tryit client, i started to wonder how lookup is done when request uri of an in-dialog request contains a public gruu such as in this: BYE sip:bar@test.fi;gr=urn:uuid:38056f74-308b-42c9-b16d-0fa61b6ff1a1 SIP/2.0 registrar/lookup.c has: if(puri.gr.s==NULL || puri.gr_val.len>0) { /* aor or pub-gruu lookup */ ul.lock_udomain(_d, &aor); res = ul.get_urecord(_d, &aor, &r); ... why is lookup done based on aor bar(a)test.fi instead of gruu urn:uuid:38056f74-308b-42c9-b16d-0fa61b6ff1a1 found in location/instance field? -- juha

1 1

git:master: doc/rpc_list: updated the docs with lists of rpc commands
by Daniel-Constantin Mierla 30 Mar '13

30 Mar '13

Module: sip-router Branch: master Commit: aa6154afcf3e2d59ad09659d7e60bf3691f1d2e3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa6154a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 30 22:31:31 2013 +0100 doc/rpc_list: updated the docs with lists of rpc commands --- doc/rpc_list/Makefile | 46 +++++++--- .../{rpc_dispatcher_s.xml => rpc_app_lua.xml} | 12 ++-- .../{rpc_usrloc_k.xml => rpc_carrierroute.xml} | 8 +- .../docbook/{rpc_cpl-c.xml => rpc_cnxcc.xml} | 16 ++-- doc/rpc_list/docbook/rpc_core.xml | 24 +++++ .../{rpc_presence_b2b.xml => rpc_corex.xml} | 12 ++-- doc/rpc_list/docbook/rpc_db_flatstore.xml | 4 +- .../docbook/{rpc_usrloc_k.xml => rpc_db_text.xml} | 8 +- doc/rpc_list/docbook/rpc_debugger.xml | 2 +- .../{rpc_usrloc_k.xml => rpc_dialog_ng.xml} | 8 +- doc/rpc_list/docbook/rpc_dialplan.xml | 2 +- doc/rpc_list/docbook/rpc_domain.xml | 4 +- .../docbook/{rpc_usrloc_k.xml => rpc_drouting.xml} | 8 +- doc/rpc_list/docbook/rpc_htable.xml | 24 +++++ .../{rpc_usrloc_k.xml => rpc_ims_usrloc_pcscf.xml} | 8 +- .../{rpc_domain_s.xml => rpc_ims_usrloc_scscf.xml} | 12 ++-- doc/rpc_list/docbook/rpc_lcr.xml | 8 ++ doc/rpc_list/docbook/rpc_list.xml | 46 +++++++--- .../docbook/{rpc_usrloc_k.xml => rpc_msrp.xml} | 8 +- .../docbook/{rpc_usrloc_k.xml => rpc_mtree.xml} | 8 +- doc/rpc_list/docbook/rpc_pdt.xml | 15 +--- doc/rpc_list/docbook/rpc_permissions.xml | 68 ++++++++++++++ doc/rpc_list/docbook/rpc_pike.xml | 2 +- doc/rpc_list/docbook/rpc_pipelimit.xml | 65 ++++++++++++++ doc/rpc_list/docbook/rpc_prefix_route.xml | 4 +- .../docbook/{rpc_usrloc_k.xml => rpc_presence.xml} | 9 +- .../docbook/{rpc_domain_s.xml => rpc_pv.xml} | 12 ++-- doc/rpc_list/docbook/rpc_sca.xml | 92 ++++++++++++++++++++ .../{rpc_usrloc_k.xml => rpc_sipcapture.xml} | 8 +- .../docbook/{rpc_usrloc_k.xml => rpc_siptrace.xml} | 9 +- doc/rpc_list/docbook/rpc_sl.xml | 2 +- doc/rpc_list/docbook/rpc_tls.xml | 8 +- doc/rpc_list/docbook/rpc_tm.xml | 17 +++-- .../{rpc_domain_s.xml => rpc_uid_domain.xml} | 4 +- .../docbook/{rpc_gflags.xml => rpc_uid_gflags.xml} | 4 +- doc/rpc_list/docbook/rpc_usrloc.xml | 8 ++ doc/rpc_list/docbook/rpc_usrloc_s.xml | 77 ---------------- .../docbook/{rpc_usrloc_k.xml => rpc_xhttp_pi.xml} | 8 +- doc/rpc_list/rpc_app_lua.txt | 12 +++ doc/rpc_list/rpc_carrierroute.txt | 9 ++ doc/rpc_list/rpc_cnxcc.txt | 15 +++ doc/rpc_list/rpc_core.txt | 61 ++++++++------ doc/rpc_list/rpc_corex.txt | 12 +++ doc/rpc_list/rpc_cpl-c.txt | 15 --- doc/rpc_list/rpc_db_flatstore.txt | 4 +- doc/rpc_list/rpc_db_text.txt | 9 ++ doc/rpc_list/rpc_debugger.txt | 2 +- doc/rpc_list/rpc_dialog_ng.txt | 9 ++ doc/rpc_list/rpc_dialplan.txt | 2 +- doc/rpc_list/rpc_dispatcher_s.txt | 12 --- doc/rpc_list/rpc_domain.txt | 4 +- .../{rpc_usrloc_k.txt => rpc_drouting.txt} | 6 +- doc/rpc_list/rpc_htable.txt | 9 ++ doc/rpc_list/rpc_ims_usrloc_pcscf.txt | 9 ++ doc/rpc_list/rpc_ims_usrloc_scscf.txt | 12 +++ doc/rpc_list/rpc_lcr.txt | 3 + doc/rpc_list/rpc_msrp.txt | 9 ++ doc/rpc_list/rpc_mtree.txt | 9 ++ doc/rpc_list/rpc_pdt.txt | 12 +-- doc/rpc_list/rpc_permissions.txt | 28 ++++++ doc/rpc_list/rpc_pike.txt | 2 +- doc/rpc_list/rpc_pipelimit.txt | 27 ++++++ doc/rpc_list/rpc_prefix_route.txt | 4 +- doc/rpc_list/rpc_presence.txt | 10 ++ doc/rpc_list/rpc_presence_b2b.txt | 12 --- doc/rpc_list/rpc_pv.txt | 12 +++ doc/rpc_list/rpc_sca.txt | 37 ++++++++ doc/rpc_list/rpc_sipcapture.txt | 9 ++ doc/rpc_list/rpc_siptrace.txt | 10 ++ doc/rpc_list/rpc_sl.txt | 2 +- doc/rpc_list/rpc_tls.txt | 8 +- doc/rpc_list/rpc_tm.txt | 17 +++-- .../{rpc_domain_s.txt => rpc_uid_domain.txt} | 4 +- .../{rpc_gflags.txt => rpc_uid_gflags.txt} | 4 +- doc/rpc_list/rpc_usrloc.txt | 3 + doc/rpc_list/rpc_usrloc_s.txt | 32 ------- .../{rpc_usrloc_k.txt => rpc_xhttp_pi.txt} | 6 +- 77 files changed, 788 insertions(+), 354 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=aa6…

1 0

git:master: dialog_ng: set kamailio mod interface always
by Daniel-Constantin Mierla 30 Mar '13

30 Mar '13

Module: sip-router Branch: master Commit: 11bc294a9d64e31014ccb836290467984c28ce65 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11bc294… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 30 20:59:24 2013 +0100 dialog_ng: set kamailio mod interface always - it breaks rpc list generation otherwise --- modules/dialog_ng/Makefile | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/modules/dialog_ng/Makefile b/modules/dialog_ng/Makefile index a41c949..082ee36 100644 --- a/modules/dialog_ng/Makefile +++ b/modules/dialog_ng/Makefile @@ -7,9 +7,7 @@ auto_gen= NAME=dialog_ng.so LIBS= -ifeq ($(CFG_NAME),kamailio) - DEFS += -DKAMAILIO_MOD_INTERFACE -endif +DEFS += -DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kmi/kmi

1 0

git:master: modules/websocket: moved some configuration across to the cfg framework
by Peter Dunkley 30 Mar '13

30 Mar '13

Module: sip-router Branch: master Commit: 688f2902977ee52d0c3d89a1f6459ca0d8c624f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=688f290… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Mar 30 20:28:03 2013 +0000 modules/websocket: moved some configuration across to the cfg framework - As suggested by @oej --- modules/websocket/ws_frame.c | 6 +--- modules/websocket/ws_frame.h | 3 -- modules/websocket/ws_handshake.c | 6 ++-- modules/websocket/ws_mod.c | 47 ++++++++++++++++++++++++++++--------- modules/websocket/ws_mod.h | 8 +++++- 5 files changed, 47 insertions(+), 23 deletions(-) diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index 4e2b91f..4212158 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -93,9 +93,6 @@ typedef enum #define OPCODE_PONG (0xa) /* 0xb - 0xf are reserved for further control frames */ -/* Time (in seconds) after which to send a keepalive on an idle connection */ -int ws_keepalive_timeout = DEFAULT_KEEPALIVE_TIMEOUT; -int ws_keepalive_mechanism = DEFAULT_KEEPALIVE_MECHANISM; str ws_ping_application_data = {0, 0}; stat_var *ws_failed_connections; @@ -812,7 +809,8 @@ struct mi_root *ws_mi_pong(struct mi_root *cmd, void *param) void ws_keepalive(unsigned int ticks, void *param) { - int check_time = (int) time(NULL) - ws_keepalive_timeout; + int check_time = (int) time(NULL) + - cfg_get(websocket, ws_cfg, keepalive_timeout); ws_connection_t *wsc = wsconn_used_list->head; while (wsc && wsc->last_used < check_time) diff --git a/modules/websocket/ws_frame.h b/modules/websocket/ws_frame.h index b674d07..2a6942e 100644 --- a/modules/websocket/ws_frame.h +++ b/modules/websocket/ws_frame.h @@ -36,9 +36,6 @@ typedef enum REMOTE_CLOSE } ws_close_type_t; -#define DEFAULT_KEEPALIVE_TIMEOUT 180 /* seconds */ -extern int ws_keepalive_timeout; - enum { KEEPALIVE_MECHANISM_NONE = 0, diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index 15d3181..739e7cf 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -128,7 +128,7 @@ int ws_handle_handshake(struct sip_msg *msg) msg->rpl_send_flags.f |= SND_F_CON_CLOSE; msg->rpl_send_flags.f |= SND_F_FORCE_CON_REUSE; - if (*ws_enabled == 0) + if (cfg_get(websocket, ws_cfg, enabled) == 0) { LM_INFO("disabled: bouncing handshake\n"); ws_send_reply(msg, 503, &str_status_service_unavailable, @@ -396,14 +396,14 @@ int ws_handle_handshake(struct sip_msg *msg) struct mi_root *ws_mi_disable(struct mi_root *cmd, void *param) { - *ws_enabled = 0; + cfg_get(websocket, ws_cfg, enabled) = 0; LM_WARN("disabling websockets - new connections will be dropped\n"); return init_mi_tree(200, MI_OK_S, MI_OK_LEN); } struct mi_root *ws_mi_enable(struct mi_root *cmd, void *param) { - *ws_enabled = 1; + cfg_get(websocket, ws_cfg, enabled) = 1; LM_WARN("enabling websockets\n"); return init_mi_tree(200, MI_OK_S, MI_OK_LEN); } diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index d7262c9..54ea209 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -28,6 +28,7 @@ #include "../../sr_module.h" #include "../../tcp_conn.h" #include "../../timer_proc.h" +#include "../../cfg/cfg.h" #include "../../lib/kcore/kstats_wrapper.h" #include "../../lib/kmi/mi.h" #include "../../mem/mem.h" @@ -47,11 +48,13 @@ static int child_init(int rank); static void destroy(void); sl_api_t ws_slb; -int *ws_enabled; #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 static int ws_keepalive_processes = DEFAULT_KEEPALIVE_PROCESSES; @@ -151,6 +154,30 @@ 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) @@ -189,14 +216,6 @@ static int mod_init(void) goto error; } - if ((ws_enabled = (int *) shm_malloc(sizeof(int))) == NULL) - { - LM_ERR("allocating shared memory\n"); - goto error; - } - *ws_enabled = 1; - - if (ws_ping_application_data.s != 0) ws_ping_application_data.len = strlen(ws_ping_application_data.s); @@ -249,12 +268,17 @@ static int mod_init(void) goto error; } + if (cfg_declare("websocket", ws_cfg_def, &default_ws_cfg, + cfg_sizeof(websocket), &ws_cfg)) { + LM_ERR("declaring configuration\n"); + return -1; + } + cfg_get(websocket, ws_cfg, keepalive_timeout) = ws_keepalive_timeout; + return 0; error: wsconn_destroy(); - shm_free(ws_enabled); - return -1; } @@ -287,5 +311,4 @@ static int child_init(int rank) static void destroy(void) { wsconn_destroy(); - shm_free(ws_enabled); } diff --git a/modules/websocket/ws_mod.h b/modules/websocket/ws_mod.h index fb96212..fa47b3b 100644 --- a/modules/websocket/ws_mod.h +++ b/modules/websocket/ws_mod.h @@ -35,9 +35,15 @@ enum }; extern sl_api_t ws_slb; -extern int *ws_enabled; 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013