[sr-dev] git:master: modules/websocket: updated copyright year

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 &lt;peter.dunkley(a)crocodile-rcs.com&gt; Committer: Peter Dunkley &lt;peter.dunkley(a)crocodile-rcs.com&gt; 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 */