Browse code

PARAM_xxx changed into SEL_PARAM_xxx to avoid conflict with global definitions

Michal Matyska authored on 07/01/2006 16:29:01
Showing 5 changed files
... ...
@@ -1301,7 +1301,7 @@ select_param : ID {
1301 1301
 		    if (sel.n >= MAX_SELECT_PARAMS-1) {
1302 1302
 			    yyerror("Select identifier too long\n");
1303 1303
 		    }
1304
-		    sel.params[sel.n].type = PARAM_STR; 
1304
+		    sel.params[sel.n].type = SEL_PARAM_STR; 
1305 1305
 		    sel.params[sel.n].v.s.s = $1;
1306 1306
 		    sel.params[sel.n].v.s.len = strlen($1);
1307 1307
 		    sel.n++;
... ...
@@ -1310,11 +1310,11 @@ select_param : ID {
1310 1310
 		     if (sel.n >= MAX_SELECT_PARAMS-2) {
1311 1311
 			    yyerror("Select identifier too long\n");
1312 1312
 		     }
1313
-		     sel.params[sel.n].type = PARAM_STR;
1313
+		     sel.params[sel.n].type = SEL_PARAM_STR;
1314 1314
 		     sel.params[sel.n].v.s.s = $1;
1315 1315
 		     sel.params[sel.n].v.s.len = strlen($1);
1316 1316
 		     sel.n++;
1317
-		     sel.params[sel.n].type = PARAM_INT;
1317
+		     sel.params[sel.n].type = SEL_PARAM_INT;
1318 1318
 		     sel.params[sel.n].v.i = $3;
1319 1319
 		     sel.n++;
1320 1320
 	     }
... ...
@@ -60,10 +60,10 @@ int resolve_select(select_t* s)
60 60
 				if (t->table[table_idx].curr_f == f) {
61 61
 					if (t->table[table_idx].type == s->params[param_idx].type) {
62 62
 						switch (t->table[table_idx].type) {
63
-						case PARAM_INT:
63
+						case SEL_PARAM_INT:
64 64
 							accept = 1;
65 65
 							break;
66
-							case PARAM_STR:
66
+							case SEL_PARAM_STR:
67 67
 							accept = (((t->table[table_idx].name.len == s->params[param_idx].v.s.len) || !t->table[table_idx].name.len)
68 68
 								   && (!t->table[table_idx].name.s || !strncasecmp(t->table[table_idx].name.s, s->params[param_idx].v.s.s, s->params[param_idx].v.s.len)));
69 69
 							break;
... ...
@@ -83,14 +83,14 @@ int resolve_select(select_t* s)
83 83
 
84 84
 		accepted:
85 85
 		if (t->table[table_idx].flags & CONSUME_NEXT_STR) {
86
-			if ((param_idx<s->n-1) && (s->params[param_idx+1].type == PARAM_STR)) {
86
+			if ((param_idx<s->n-1) && (s->params[param_idx+1].type == SEL_PARAM_STR)) {
87 87
 				param_idx++;
88 88
 			} else if (!(t->table[table_idx].flags & OPTIONAL)) {
89 89
 				goto not_found;
90 90
 			}
91 91
 		}
92 92
 		if (t->table[table_idx].flags & CONSUME_NEXT_INT) {
93
-			if ((param_idx<s->n-1) && (s->params[param_idx+1].type == PARAM_INT)) {
93
+			if ((param_idx<s->n-1) && (s->params[param_idx+1].type == SEL_PARAM_INT)) {
94 94
 				param_idx++;
95 95
 			} else if (!(t->table[table_idx].flags & OPTIONAL)) {
96 96
 				goto not_found;
... ...
@@ -104,7 +104,7 @@ int resolve_select(select_t* s)
104 104
 		f = t->table[table_idx].new_f;
105 105
 	}
106 106
 
107
-	if (t->table[table_idx].flags & PARAM_EXPECTED) goto not_found;
107
+	if (t->table[table_idx].flags & SEL_PARAM_EXPECTED) goto not_found;
108 108
 	s->f = f;
109 109
 	s->parent_f = pf;
110 110
 	return 0;
... ...
@@ -136,7 +136,7 @@ void print_select(select_t* s)
136 136
 	int i;
137 137
 	DBG("select(");
138 138
 	for(i = 0; i < s->n; i++) {
139
-		if (s->params[i].type == PARAM_INT) {
139
+		if (s->params[i].type == SEL_PARAM_INT) {
140 140
 			DBG("%d,", s->params[i].v.i);
141 141
 		} else {
142 142
 			DBG("%.*s,", s->params[i].v.s.len, s->params[i].v.s.s);
... ...
@@ -41,10 +41,10 @@
41 41
 // Flags for parser table FLAG bitfiels
42 42
 #define DIVERSION_MASK   0x00FF
43 43
 // if DIVERSION is set and the function is accepted and has STR param
44
-// the param is changed into PARAM_DIV and the value is set to (flags & DIVERSION_MASK)
44
+// the param is changed into SEL_PARAM_DIV and the value is set to (flags & DIVERSION_MASK)
45 45
 #define DIVERSION        1<<8
46 46
 // if any parameter is expected at this stage
47
-#define PARAM_EXPECTED   1<<9
47
+#define SEL_PARAM_EXPECTED   1<<9
48 48
 // accept if following parameter is STR (any)
49 49
 #define CONSUME_NEXT_STR 1<<10
50 50
 // accept if following parameter is INT
... ...
@@ -54,16 +54,16 @@
54 54
 // if conversion to common alias is needed
55 55
 // up-to now parsed function would be stored in parent_f
56 56
 // NOTE: the parameter is not consumed for ALIAS, 
57
-// so you can leave it as ..,PARAM_INT, STR_NULL,..
57
+// so you can leave it as ..,SEL_PARAM_INT, STR_NULL,..
58 58
 #define IS_ALIAS         1<<13
59 59
 
60 60
 /*
61 61
  * Selector call parameter
62 62
  */
63 63
 typedef enum {
64
-	PARAM_INT,  /* Integer parameter */
65
-	PARAM_STR,  /* String parameter */
66
-	PARAM_DIV,  /* Integer value got from parsing table */
64
+	SEL_PARAM_INT,  /* Integer parameter */
65
+	SEL_PARAM_STR,  /* String parameter */
66
+	SEL_PARAM_DIV,  /* Integer value got from parsing table */
67 67
 } select_param_type_t;
68 68
 	
69 69
 typedef union {
... ...
@@ -203,7 +203,7 @@ int select_contact_params_spec(str* res, select_t* s, struct sip_msg* msg)
203 203
 {
204 204
 	contact_t* c;
205 205
 	
206
-	if (s->params[s->n-1].type != PARAM_DIV) {
206
+	if (s->params[s->n-1].type != SEL_PARAM_DIV) {
207 207
 		BUG("Last parameter should have type DIV (converted)\n");
208 208
 		return -1;
209 209
 	}
... ...
@@ -312,7 +312,7 @@ int select_via(str* res, select_t* s, struct sip_msg* msg)
312 312
 {
313 313
 	struct via_body *p = NULL;
314 314
 	
315
-	if (((s->n == 1) || (s->params[1].type == PARAM_STR)) && (parse_via_header(msg, 1, &p)<0)) return -1;
315
+	if (((s->n == 1) || (s->params[1].type == SEL_PARAM_STR)) && (parse_via_header(msg, 1, &p)<0)) return -1;
316 316
 	else if (parse_via_header(msg, s->params[1].v.i, &p)<0) return -1;
317 317
 	if (!p) return -1;
318 318
 	res->s=p->name.s;
... ...
@@ -326,7 +326,7 @@ int select_via_name(str* res, select_t* s, struct sip_msg* msg)
326 326
 	struct via_body *p = NULL;
327 327
 	
328 328
 	// it's not neccessary to test if (s->n > 1)
329
-	if ((s->params[1].type == PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
329
+	if ((s->params[1].type == SEL_PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
330 330
 	else if (parse_via_header(msg, s->params[1].v.i, &p)<0) return -1;
331 331
 	if (!p) return -1;
332 332
 	RETURN0_res(p->name);
... ...
@@ -337,7 +337,7 @@ int select_via_version(str* res, select_t* s, struct sip_msg* msg)
337 337
 	struct via_body *p = NULL;
338 338
 	
339 339
 	// it's not neccessary to test if (s->n > 1)
340
-	if ((s->params[1].type == PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
340
+	if ((s->params[1].type == SEL_PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
341 341
 	else if (parse_via_header(msg, s->params[1].v.i, &p)<0) return -1;
342 342
 	if (!p) return -1;
343 343
 	RETURN0_res(p->version);
... ...
@@ -348,7 +348,7 @@ int select_via_transport(str* res, select_t* s, struct sip_msg* msg)
348 348
 	struct via_body *p = NULL;
349 349
 	
350 350
 	// it's not neccessary to test if (s->n > 1)
351
-	if ((s->params[1].type == PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
351
+	if ((s->params[1].type == SEL_PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
352 352
 	else if (parse_via_header(msg, s->params[1].v.i, &p)<0) return -1;
353 353
 	if (!p) return -1;
354 354
 	RETURN0_res(p->transport);
... ...
@@ -359,7 +359,7 @@ int select_via_host(str* res, select_t* s, struct sip_msg* msg)
359 359
 	struct via_body *p = NULL;
360 360
 	
361 361
 	// it's not neccessary to test if (s->n > 1)
362
-	if ((s->params[1].type == PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
362
+	if ((s->params[1].type == SEL_PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
363 363
 	else if (parse_via_header(msg, s->params[1].v.i, &p)<0) return -1;
364 364
 	if (!p) return -1;
365 365
 	RETURN0_res(p->host);
... ...
@@ -370,7 +370,7 @@ int select_via_port(str* res, select_t* s, struct sip_msg* msg)
370 370
 	struct via_body *p = NULL;
371 371
 	
372 372
 	// it's not neccessary to test if (s->n > 1)
373
-	if ((s->params[1].type == PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
373
+	if ((s->params[1].type == SEL_PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
374 374
 	else if (parse_via_header(msg, s->params[1].v.i, &p)<0) return -1;
375 375
 	if (!p) return -1;
376 376
 	RETURN0_res(p->port_str);
... ...
@@ -381,7 +381,7 @@ int select_via_comment(str* res, select_t* s, struct sip_msg* msg)
381 381
 	struct via_body *p = NULL;
382 382
 	
383 383
 	// it's not neccessary to test if (s->n > 1)
384
-	if ((s->params[1].type == PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
384
+	if ((s->params[1].type == SEL_PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
385 385
 	else if (parse_via_header(msg, s->params[1].v.i, &p)<0) return -1;
386 386
 	if (!p) return -1;
387 387
 	RETURN0_res(p->comment);
... ...
@@ -393,7 +393,7 @@ int select_via_params(str* res, select_t* s, struct sip_msg* msg)
393 393
 	struct via_param *q;
394 394
 
395 395
 	// it's not neccessary to test if (s->n > 1)
396
-	if ((s->params[1].type == PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
396
+	if ((s->params[1].type == SEL_PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
397 397
 	else if (parse_via_header(msg, s->params[1].v.i, &p)<0) return -1;
398 398
 	if (!p) return -1;
399 399
 	
... ...
@@ -410,13 +410,13 @@ int select_via_params_spec(str* res, select_t* s, struct sip_msg* msg)
410 410
 {
411 411
 	struct via_body *p = NULL;
412 412
 
413
-	if (s->params[s->n-1].type != PARAM_DIV) {
413
+	if (s->params[s->n-1].type != SEL_PARAM_DIV) {
414 414
 		BUG("Last parameter should have type DIV (converted)\n");
415 415
 		return -1;
416 416
 	}
417 417
 	
418 418
 	// it's not neccessary to test if (s->n > 1)
419
-	if ((s->params[1].type == PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
419
+	if ((s->params[1].type == SEL_PARAM_STR) && (parse_via_header(msg, 1, &p)<0)) return -1;
420 420
 	else if (parse_via_header(msg, s->params[1].v.i, &p)<0) return -1;
421 421
 	if (!p) return -1;
422 422
 	
... ...
@@ -462,7 +462,7 @@ int select_anyheader(str* res, select_t* s, struct sip_msg* msg)
462 462
 
463 463
 	/* extract header index if present */
464 464
 	if (s->n == 3) {
465
-		if (s->params[2].type == PARAM_INT) {
465
+		if (s->params[2].type == SEL_PARAM_INT) {
466 466
 			hi = s->params[2].v.i;
467 467
 		} else {
468 468
 			hi = -1;
... ...
@@ -477,9 +477,9 @@ int select_anyheader(str* res, select_t* s, struct sip_msg* msg)
477 477
 		return -1;
478 478
 	}
479 479
 	for (hf=msg->headers; hf; hf=hf->next) {
480
-		if(s->params[1].type==PARAM_DIV) {
480
+		if(s->params[1].type==SEL_PARAM_DIV) {
481 481
 			if (s->params[1].v.i!=hf->type)	continue;
482
-		} else if(s->params[1].type==PARAM_STR) {
482
+		} else if(s->params[1].type==SEL_PARAM_STR) {
483 483
 			if (s->params[1].v.s.len!=hf->name.len)	continue;
484 484
 			if (strncasecmp(s->params[1].v.s.s, hf->name.s, hf->name.len)!=0) continue;
485 485
 		}
... ...
@@ -80,55 +80,55 @@ SELECT_F(select_uri_port)
80 80
 SELECT_F(select_uri_params)
81 81
 
82 82
 static select_row_t select_core[] = {
83
-	{ NULL, PARAM_STR, STR_STATIC_INIT("from"), select_from, 0},
84
-	{ NULL, PARAM_STR, STR_STATIC_INIT("f"), select_from, 0},
85
-	{ select_from, PARAM_STR, STR_STATIC_INIT("uri"), select_from_uri, 0},
86
-	{ select_from, PARAM_STR, STR_STATIC_INIT("tag"), select_from_tag, 0},
87
-	{ select_from, PARAM_STR, STR_STATIC_INIT("name"), select_from_name, 0},
88
-	{ select_from, PARAM_STR, STR_STATIC_INIT("params"), select_from_params, CONSUME_NEXT_STR},
89
-	{ NULL, PARAM_STR, STR_STATIC_INIT("to"), select_to, 0},
90
-	{ NULL, PARAM_STR, STR_STATIC_INIT("t"), select_to, 0},
91
-	{ select_to, PARAM_STR, STR_STATIC_INIT("uri"), select_to_uri, 0},
92
-	{ select_to, PARAM_STR, STR_STATIC_INIT("tag"), select_to_tag, 0},
93
-	{ select_to, PARAM_STR, STR_STATIC_INIT("name"), select_to_name, 0},
94
-	{ select_to, PARAM_STR, STR_STATIC_INIT("params"), select_to_params, CONSUME_NEXT_STR},
95
-	{ NULL, PARAM_STR, STR_STATIC_INIT("contact"), select_contact, 0},
96
-	{ NULL, PARAM_STR, STR_STATIC_INIT("m"), select_contact, 0},
97
-	{ select_contact, PARAM_STR, STR_STATIC_INIT("uri"), select_contact_uri, 0},
98
-	{ select_contact, PARAM_STR, STR_STATIC_INIT("name"), select_contact_name, 0}, 
99
-	{ select_contact, PARAM_STR, STR_STATIC_INIT("q"), select_contact_params_spec, DIVERSION | SEL_PARAM_Q}, 
100
-	{ select_contact, PARAM_STR, STR_STATIC_INIT("expires"), select_contact_params_spec, DIVERSION | SEL_PARAM_EXPIRES}, 
101
-	{ select_contact, PARAM_STR, STR_STATIC_INIT("method"), select_contact_params_spec, DIVERSION | SEL_PARAM_METHOD}, 
102
-	{ select_contact, PARAM_STR, STR_STATIC_INIT("received"), select_contact_params_spec, DIVERSION | SEL_PARAM_RECEIVED}, 
103
-	{ select_contact, PARAM_STR, STR_STATIC_INIT("instance"), select_contact_params_spec, DIVERSION | SEL_PARAM_INSTANCE}, 	
104
-	{ select_contact, PARAM_STR, STR_STATIC_INIT("params"), select_contact_params, CONSUME_NEXT_STR},
105
-	{ NULL, PARAM_STR, STR_STATIC_INIT("via"), select_via, OPTIONAL | CONSUME_NEXT_INT},
106
-	{ NULL, PARAM_STR, STR_STATIC_INIT("v"), select_via, OPTIONAL | CONSUME_NEXT_INT},
107
-	{ select_via, PARAM_STR, STR_STATIC_INIT("name"), select_via_name, 0},
108
-	{ select_via, PARAM_STR, STR_STATIC_INIT("version"), select_via_version, 0},
109
-	{ select_via, PARAM_STR, STR_STATIC_INIT("transport"), select_via_transport, 0},
110
-	{ select_via, PARAM_STR, STR_STATIC_INIT("host"), select_via_host, 0},
111
-	{ select_via, PARAM_STR, STR_STATIC_INIT("port"), select_via_port, 0},
112
-	{ select_via, PARAM_STR, STR_STATIC_INIT("comment"), select_via_comment, 0},
113
-	{ select_via, PARAM_STR, STR_STATIC_INIT("branch"), select_via_params_spec, DIVERSION | SEL_PARAM_BRANCH},
114
-	{ select_via, PARAM_STR, STR_STATIC_INIT("received"), select_via_params_spec, DIVERSION | SEL_PARAM_RECEIVED},
115
-	{ select_via, PARAM_STR, STR_STATIC_INIT("rport"), select_via_params_spec, DIVERSION | SEL_PARAM_RPORT},
116
-	{ select_via, PARAM_STR, STR_STATIC_INIT("i"), select_via_params_spec, DIVERSION | SEL_PARAM_I},
117
-	{ select_via, PARAM_STR, STR_STATIC_INIT("alias"), select_via_params_spec, DIVERSION | SEL_PARAM_ALIAS},
118
-	{ select_via, PARAM_STR, STR_STATIC_INIT("params"), select_via_params, CONSUME_NEXT_STR},
83
+	{ NULL, SEL_PARAM_STR, STR_STATIC_INIT("from"), select_from, 0},
84
+	{ NULL, SEL_PARAM_STR, STR_STATIC_INIT("f"), select_from, 0},
85
+	{ select_from, SEL_PARAM_STR, STR_STATIC_INIT("uri"), select_from_uri, 0},
86
+	{ select_from, SEL_PARAM_STR, STR_STATIC_INIT("tag"), select_from_tag, 0},
87
+	{ select_from, SEL_PARAM_STR, STR_STATIC_INIT("name"), select_from_name, 0},
88
+	{ select_from, SEL_PARAM_STR, STR_STATIC_INIT("params"), select_from_params, CONSUME_NEXT_STR},
89
+	{ NULL, SEL_PARAM_STR, STR_STATIC_INIT("to"), select_to, 0},
90
+	{ NULL, SEL_PARAM_STR, STR_STATIC_INIT("t"), select_to, 0},
91
+	{ select_to, SEL_PARAM_STR, STR_STATIC_INIT("uri"), select_to_uri, 0},
92
+	{ select_to, SEL_PARAM_STR, STR_STATIC_INIT("tag"), select_to_tag, 0},
93
+	{ select_to, SEL_PARAM_STR, STR_STATIC_INIT("name"), select_to_name, 0},
94
+	{ select_to, SEL_PARAM_STR, STR_STATIC_INIT("params"), select_to_params, CONSUME_NEXT_STR},
95
+	{ NULL, SEL_PARAM_STR, STR_STATIC_INIT("contact"), select_contact, 0},
96
+	{ NULL, SEL_PARAM_STR, STR_STATIC_INIT("m"), select_contact, 0},
97
+	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("uri"), select_contact_uri, 0},
98
+	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("name"), select_contact_name, 0}, 
99
+	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("q"), select_contact_params_spec, DIVERSION | SEL_PARAM_Q}, 
100
+	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("expires"), select_contact_params_spec, DIVERSION | SEL_PARAM_EXPIRES}, 
101
+	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("method"), select_contact_params_spec, DIVERSION | SEL_PARAM_METHOD}, 
102
+	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("received"), select_contact_params_spec, DIVERSION | SEL_PARAM_RECEIVED}, 
103
+	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("instance"), select_contact_params_spec, DIVERSION | SEL_PARAM_INSTANCE}, 	
104
+	{ select_contact, SEL_PARAM_STR, STR_STATIC_INIT("params"), select_contact_params, CONSUME_NEXT_STR},
105
+	{ NULL, SEL_PARAM_STR, STR_STATIC_INIT("via"), select_via, OPTIONAL | CONSUME_NEXT_INT},
106
+	{ NULL, SEL_PARAM_STR, STR_STATIC_INIT("v"), select_via, OPTIONAL | CONSUME_NEXT_INT},
107
+	{ select_via, SEL_PARAM_STR, STR_STATIC_INIT("name"), select_via_name, 0},
108
+	{ select_via, SEL_PARAM_STR, STR_STATIC_INIT("version"), select_via_version, 0},
109
+	{ select_via, SEL_PARAM_STR, STR_STATIC_INIT("transport"), select_via_transport, 0},
110
+	{ select_via, SEL_PARAM_STR, STR_STATIC_INIT("host"), select_via_host, 0},
111
+	{ select_via, SEL_PARAM_STR, STR_STATIC_INIT("port"), select_via_port, 0},
112
+	{ select_via, SEL_PARAM_STR, STR_STATIC_INIT("comment"), select_via_comment, 0},
113
+	{ select_via, SEL_PARAM_STR, STR_STATIC_INIT("branch"), select_via_params_spec, DIVERSION | SEL_PARAM_BRANCH},
114
+	{ select_via, SEL_PARAM_STR, STR_STATIC_INIT("received"), select_via_params_spec, DIVERSION | SEL_PARAM_RECEIVED},
115
+	{ select_via, SEL_PARAM_STR, STR_STATIC_INIT("rport"), select_via_params_spec, DIVERSION | SEL_PARAM_RPORT},
116
+	{ select_via, SEL_PARAM_STR, STR_STATIC_INIT("i"), select_via_params_spec, DIVERSION | SEL_PARAM_I},
117
+	{ select_via, SEL_PARAM_STR, STR_STATIC_INIT("alias"), select_via_params_spec, DIVERSION | SEL_PARAM_ALIAS},
118
+	{ select_via, SEL_PARAM_STR, STR_STATIC_INIT("params"), select_via_params, CONSUME_NEXT_STR},
119 119
 	
120
-	{ select_from_uri, PARAM_INT, STR_NULL, select_any_uri, IS_ALIAS},
121
-	{ select_to_uri, PARAM_INT, STR_NULL, select_any_uri, IS_ALIAS},
122
-	{ select_contact_uri, PARAM_INT, STR_NULL, select_any_uri, IS_ALIAS},
123
-	{ select_any_uri, PARAM_STR, STR_STATIC_INIT("type"), select_uri_type, 0},
124
-	{ select_any_uri, PARAM_STR, STR_STATIC_INIT("user"), select_uri_user, 0},
125
-	{ select_any_uri, PARAM_STR, STR_STATIC_INIT("pwd"), select_uri_pwd, 0},
126
-	{ select_any_uri, PARAM_STR, STR_STATIC_INIT("host"), select_uri_host, 0},
127
-	{ select_any_uri, PARAM_STR, STR_STATIC_INIT("port"), select_uri_port, 0},
128
-	{ select_any_uri, PARAM_STR, STR_STATIC_INIT("params"), select_uri_params, 0},
129
-	{ NULL, PARAM_STR, STR_STATIC_INIT("msg"), select_msgheader, PARAM_EXPECTED},
130
-	{ select_msgheader, PARAM_STR, STR_NULL, select_anyheader, OPTIONAL | CONSUME_NEXT_INT},
131
-	{ NULL, PARAM_INT, STR_NULL, NULL, 0}
120
+	{ select_from_uri, SEL_PARAM_INT, STR_NULL, select_any_uri, IS_ALIAS},
121
+	{ select_to_uri, SEL_PARAM_INT, STR_NULL, select_any_uri, IS_ALIAS},
122
+	{ select_contact_uri, SEL_PARAM_INT, STR_NULL, select_any_uri, IS_ALIAS},
123
+	{ select_any_uri, SEL_PARAM_STR, STR_STATIC_INIT("type"), select_uri_type, 0},
124
+	{ select_any_uri, SEL_PARAM_STR, STR_STATIC_INIT("user"), select_uri_user, 0},
125
+	{ select_any_uri, SEL_PARAM_STR, STR_STATIC_INIT("pwd"), select_uri_pwd, 0},
126
+	{ select_any_uri, SEL_PARAM_STR, STR_STATIC_INIT("host"), select_uri_host, 0},
127
+	{ select_any_uri, SEL_PARAM_STR, STR_STATIC_INIT("port"), select_uri_port, 0},
128
+	{ select_any_uri, SEL_PARAM_STR, STR_STATIC_INIT("params"), select_uri_params, 0},
129
+	{ NULL, SEL_PARAM_STR, STR_STATIC_INIT("msg"), select_msgheader, SEL_PARAM_EXPECTED},
130
+	{ select_msgheader, SEL_PARAM_STR, STR_NULL, select_anyheader, OPTIONAL | CONSUME_NEXT_INT},
131
+	{ NULL, SEL_PARAM_INT, STR_NULL, NULL, 0}
132 132
 };
133 133
 
134 134
 static select_table_t select_core_table = {select_core, NULL};