Browse code

Temporarily backout addition of Server header field parser until decision is adapted on how to overcome current limit of max 32 headers. Just for the record, I think that the easiest way out is to increase flags storage size from 32bits to 64bits, which should be sufficiend at least for the next year.

Requested by: Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.fraunhofer.de>

Maxim Sobolev authored on 28/12/2004 23:41:30
Showing 6 changed files
... ...
@@ -130,10 +130,10 @@ void clean_hdr_field(struct hdr_field* hf)
130 130
 
131 131
 		case HDR_ACCEPTLANGUAGE:
132 132
 			break;
133
-
133
+			
134 134
 		case HDR_ORGANIZATION:
135 135
 			break;
136
-
136
+			
137 137
 		case HDR_PRIORITY:
138 138
 			break;
139 139
 
... ...
@@ -158,9 +158,6 @@ void clean_hdr_field(struct hdr_field* hf)
158 158
 			free_to(hf->parsed);
159 159
 			break;
160 160
 
161
-		case HDR_SERVER:
162
-			break;
163
-
164 161
 		default:
165 162
 			LOG(L_CRIT, "BUG: clean_hdr_field: unknown header type %d\n",
166 163
 			    hf->type);
... ...
@@ -73,8 +73,7 @@
73 73
 #define HDR_CONTENTDISPOSITION (1 << 27)  /* Content-Disposition hdr field */
74 74
 #define HDR_DIVERSION          (1 << 28)  /* Diversion header field */
75 75
 #define HDR_RPID               (1 << 29)  /* Remote-Party-ID header field */
76
-#define HDR_SERVER             (1 << 30)  /* Server header field */
77
-#define HDR_OTHER              (1 << 31)  /* Some other header field */
76
+#define HDR_OTHER              (1 << 30)  /* Some other header field */
78 77
 
79 78
 
80 79
 /* returns true if the header links allocated memory on parse field */
... ...
@@ -116,8 +116,6 @@
116 116
 #define _ispo_ 0x6f707369   /* "ispo" */
117 117
 #define _siti_ 0x69746973   /* "siti" */
118 118
 
119
-#define _serv_ 0x76726573   /* "serv" */
120
-
121 119
 #define _dive_ 0x65766964   /* "dive" */
122 120
 #define _rsio_ 0x6f697372   /* "rsio" */
123 121
 
... ...
@@ -204,7 +204,6 @@ char* get_hdr_field(char* buf, char* end, struct hdr_field* hdr)
204 204
 	        case HDR_ACCEPTDISPOSITION:
205 205
 	        case HDR_DIVERSION:
206 206
 	        case HDR_RPID:
207
-	        case HDR_SERVER:
208 207
 		case HDR_OTHER:
209 208
 			/* just skip over it */
210 209
 			hdr->body.s=tmp;
... ...
@@ -408,10 +407,6 @@ int parse_headers(struct sip_msg* msg, int flags, int next)
408 407
 				if (msg->rpid==0) msg->rpid = hf;
409 408
 				msg->parsed_flag|=HDR_RPID;
410 409
 				break;
411
-		        case HDR_SERVER:
412
-				if (msg->server==0) msg->server = hf;
413
-				msg->parsed_flag|=HDR_SERVER;
414
-				break;
415 410
 			case HDR_VIA:
416 411
 				msg->parsed_flag|=HDR_VIA;
417 412
 				DBG("parse_headers: Via found, flags=%d\n", flags);
... ...
@@ -193,7 +193,6 @@ struct sip_msg {
193 193
 	struct hdr_field* accept_disposition;
194 194
 	struct hdr_field* diversion;
195 195
 	struct hdr_field* rpid;
196
-	struct hdr_field* server;
197 196
 
198 197
 	char* eoh;        /* pointer to the end of header (if found) or null */
199 198
 	char* unparsed;   /* here we stopped parsing*/
... ...
@@ -84,7 +84,6 @@ static inline char* skip_ws(char* p, unsigned int size)
84 84
 #include "case_supp.h"     /* Supported */
85 85
 #include "case_dive.h"     /* Diversion */
86 86
 #include "case_remo.h"     /* Remote-Party-ID */
87
-#include "case_serv.h"     /* Server */
88 87
 
89 88
 
90 89
 #define READ(val) \
... ...
@@ -115,8 +114,7 @@ static inline char* skip_ws(char* p, unsigned int size)
115 114
         case _subj_: subj_CASE; \
116 115
         case _user_: user_CASE; \
117 116
         case _dive_: dive_CASE; \
118
-        case _remo_: remo_CASE; \
119
-        case _serv_: serv_CASE;
117
+        case _remo_: remo_CASE;
120 118
 
121 119
 
122 120
 #define PARSE_COMPACT(id)          \