Browse code

Rename Contact parameter select 'method' to 'methods'

According RFC3840 the correct name of the parameter is 'methods',
not 'method'.

Reported by Daniel-Constantin Mierla

Jan Janak authored on 19/03/2009 15:15:51
Showing 2 changed files
... ...
@@ -236,8 +236,8 @@ int select_contact_params_spec(str* res, select_t* s, struct sip_msg* msg)
236 236
 		TEST_RET_res_body(c->q);
237 237
 	case SEL_PARAM_EXPIRES:
238 238
 		TEST_RET_res_body(c->expires);
239
-	case SEL_PARAM_METHOD:
240
-		TEST_RET_res_body(c->method);
239
+	case SEL_PARAM_METHODS:
240
+		TEST_RET_res_body(c->methods);
241 241
 	case SEL_PARAM_RECEIVED:
242 242
 		TEST_RET_res_body(c->received);
243 243
 	case SEL_PARAM_INSTANCE:
... ...
@@ -41,7 +41,7 @@
41 41
 
42 42
 enum {
43 43
 	SEL_PARAM_TAG, 
44
-	SEL_PARAM_Q, SEL_PARAM_EXPIRES, SEL_PARAM_METHOD, SEL_PARAM_RECEIVED, SEL_PARAM_INSTANCE, 
44
+	SEL_PARAM_Q, SEL_PARAM_EXPIRES, SEL_PARAM_METHODS, SEL_PARAM_RECEIVED, SEL_PARAM_INSTANCE, 
45 45
 	SEL_PARAM_BRANCH, SEL_PARAM_RPORT, SEL_PARAM_I, SEL_PARAM_ALIAS
46 46
        };
47 47
 
... ...
@@ -251,7 +251,7 @@ static select_row_t select_core[] = {
251 251
 	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("name"), select_contact_name, 0}, 
252 252
 	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("q"), select_contact_params_spec, DIVERSION | SEL_PARAM_Q}, 
253 253
 	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("expires"), select_contact_params_spec, DIVERSION | SEL_PARAM_EXPIRES}, 
254
-	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("method"), select_contact_params_spec, DIVERSION | SEL_PARAM_METHOD}, 
254
+	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("methods"), select_contact_params_spec, DIVERSION | SEL_PARAM_METHODS}, 
255 255
 	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("received"), select_contact_params_spec, DIVERSION | SEL_PARAM_RECEIVED}, 
256 256
 	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("instance"), select_contact_params_spec, DIVERSION | SEL_PARAM_INSTANCE}, 	
257 257
 	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("params"), select_contact_params, CONSUME_NEXT_STR},