Browse Source

websocket: replace STR_PARAM with PARAM_STR

Alekzander Spiridonov 11 years ago
parent
commit
b09c462b79
2 changed files with 2 additions and 5 deletions
  1. 1 1
      modules/websocket/ws_frame.c
  2. 1 4
      modules/websocket/ws_mod.c

+ 1 - 1
modules/websocket/ws_frame.c

@@ -106,7 +106,7 @@ typedef enum
 /* 0xb - 0xf are reserved for further control frames */
 /* 0xb - 0xf are reserved for further control frames */
 
 
 int ws_keepalive_mechanism = DEFAULT_KEEPALIVE_MECHANISM;
 int ws_keepalive_mechanism = DEFAULT_KEEPALIVE_MECHANISM;
-str ws_ping_application_data = {0, 0};
+str ws_ping_application_data = STR_NULL;
 
 
 stat_var *ws_failed_connections;
 stat_var *ws_failed_connections;
 stat_var *ws_local_closed_connections;
 stat_var *ws_local_closed_connections;

+ 1 - 4
modules/websocket/ws_mod.c

@@ -91,7 +91,7 @@ static param_export_t params[]=
 	/* ws_frame.c */
 	/* ws_frame.c */
 	{ "keepalive_mechanism",	INT_PARAM, &ws_keepalive_mechanism },
 	{ "keepalive_mechanism",	INT_PARAM, &ws_keepalive_mechanism },
 	{ "keepalive_timeout",		INT_PARAM, &ws_keepalive_timeout },
 	{ "keepalive_timeout",		INT_PARAM, &ws_keepalive_timeout },
-	{ "ping_application_data",	STR_PARAM, &ws_ping_application_data.s },
+	{ "ping_application_data",	PARAM_STR, &ws_ping_application_data },
 
 
 	/* ws_handshake.c */
 	/* ws_handshake.c */
 	{ "sub_protocols",		INT_PARAM, &ws_sub_protocols },
 	{ "sub_protocols",		INT_PARAM, &ws_sub_protocols },
@@ -211,9 +211,6 @@ static int mod_init(void)
 		goto error;
 		goto error;
 	}
 	}
 
 
-	if (ws_ping_application_data.s != 0)
-		ws_ping_application_data.len =
-					strlen(ws_ping_application_data.s);
 	if (ws_ping_application_data.len < 1
 	if (ws_ping_application_data.len < 1
 		|| ws_ping_application_data.len > 125)
 		|| ws_ping_application_data.len > 125)
 	{
 	{