modules/websocket: updated copyright year

- also remove configuration framework stuff in preparation for putting it
  in separate files.

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

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>

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.
  *

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.
  *

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

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

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)
 

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.
  *

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)

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 */