From ac2043d1c0a4c921c0d41e5a1a9ff33530449bb6 Mon Sep 17 00:00:00 2001 From: "Olle E. Johansson" Date: Fri, 1 Apr 2016 17:42:31 +0200 Subject: [PATCH] websocket Rename core module name for consistensy Issue #82 --- modules/websocket/{ws_mod.c => websocket.c} | 2 +- modules/websocket/{ws_mod.h => websocket.h} | 6 +++--- modules/websocket/ws_conn.c | 2 +- modules/websocket/ws_frame.c | 2 +- modules/websocket/ws_handshake.c | 2 +- modules/websocket/ws_handshake.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename modules/websocket/{ws_mod.c => websocket.c} (99%) rename modules/websocket/{ws_mod.h => websocket.h} (95%) diff --git a/modules/websocket/ws_mod.c b/modules/websocket/websocket.c similarity index 99% rename from modules/websocket/ws_mod.c rename to modules/websocket/websocket.c index e513d09dd0c..805ea230764 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/websocket.c @@ -40,7 +40,7 @@ #include "ws_conn.h" #include "ws_handshake.h" #include "ws_frame.h" -#include "ws_mod.h" +#include "websocket.h" #include "config.h" MODULE_VERSION diff --git a/modules/websocket/ws_mod.h b/modules/websocket/websocket.h similarity index 95% rename from modules/websocket/ws_mod.h rename to modules/websocket/websocket.h index b267cf90e2f..87c01818c30 100644 --- a/modules/websocket/ws_mod.h +++ b/modules/websocket/websocket.h @@ -24,8 +24,8 @@ * */ -#ifndef _WS_MOD_H -#define _WS_MOD_H +#ifndef _WEBSOCKET_H +#define _WEBSOCKET_H #include "../../locking.h" #include "../../kstats_types.h" @@ -42,4 +42,4 @@ extern gen_lock_t *ws_stats_lock; extern int ws_ping_interval; /* time (in seconds) between sending Pings */ -#endif /* _WS_MOD_H */ +#endif /* _WEBSOCKET_H */ diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index b8ede8b4fcc..e5cceefa06d 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -32,7 +32,7 @@ #include "../../lib/kmi/tree.h" #include "../../mem/mem.h" #include "ws_conn.h" -#include "ws_mod.h" +#include "websocket.h" /* Maximum number of connections to display when using the ws.dump MI command */ #define MAX_WS_CONNS_DUMP 50 diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index 16f79015838..1180ca2857d 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -44,7 +44,7 @@ #include "../../mem/mem.h" #include "ws_conn.h" #include "ws_frame.h" -#include "ws_mod.h" +#include "websocket.h" #include "ws_handshake.h" #include "config.h" diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index f8dae83b60c..40b8852ca4b 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -41,7 +41,7 @@ #include "../tls/tls_cfg.h" #include "ws_conn.h" #include "ws_handshake.h" -#include "ws_mod.h" +#include "websocket.h" #include "config.h" #define WS_VERSION (13) diff --git a/modules/websocket/ws_handshake.h b/modules/websocket/ws_handshake.h index eb110d59a5c..b79478c2ce6 100644 --- a/modules/websocket/ws_handshake.h +++ b/modules/websocket/ws_handshake.h @@ -29,7 +29,7 @@ #include "../../sr_module.h" #include "../../parser/msg_parser.h" -#include "ws_mod.h" +#include "websocket.h" #define DEFAULT_SUB_PROTOCOLS (SUB_PROTOCOL_SIP | SUB_PROTOCOL_MSRP) #define SUB_PROTOCOL_ALL (SUB_PROTOCOL_SIP | SUB_PROTOCOL_MSRP)