Browse code

rollback patch pending new ser release and discussion with core maintainer

Jamey Hicks authored on 03/12/2004 17:11:36
Showing 6 changed files
... ...
@@ -45,8 +45,6 @@
45 45
 #include "parse_rr.h"
46 46
 #include "contact/parse_contact.h"
47 47
 #include "parse_disposition.h"
48
-#include "parse_allow.h"
49
-#include "parse_sipifmatch.h"
50 48
 #include "../ut.h"
51 49
 
52 50
 
... ...
@@ -120,7 +118,6 @@ void clean_hdr_field(struct hdr_field* hf)
120 118
 			break;
121 119
 
122 120
 		case HDR_ALLOW:
123
-			free_allow((unsigned int **)(&(hf->parsed)));
124 121
 			break;
125 122
 
126 123
 		case HDR_EVENT:
... ...
@@ -161,10 +158,6 @@ void clean_hdr_field(struct hdr_field* hf)
161 158
 			free_to(hf->parsed);
162 159
 			break;
163 160
 
164
-		case HDR_SIPIFMATCH:
165
-			free_sipifmatch((str**)(&(hf->parsed)));
166
-			break;
167
-
168 161
 		default:
169 162
 			LOG(L_CRIT, "BUG: clean_hdr_field: unknown header type %d\n",
170 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_SIPIFMATCH         (1 << 30)  /* SIP-If-Match 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 */
... ...
@@ -47,9 +47,6 @@
47 47
 #define _oriz_ 0x7a69726f   /* "oriz" */
48 48
 #define _atio_ 0x6f697461   /* "atio" */
49 49
 #define _call_ 0x6c6c6163   /* "call" */
50
-#define _sip_  0x2d706973   /* "sip-" */
51
-#define _ifm_  0x6d2d6669   /* "if-m" */
52
-#define _atch_ 0x68637461   /* "atch" */
53 50
 #define __id2_ 0x2064692d   /* "-id " */
54 51
 #define __id1_ 0x3a64692d   /* "-id:" */
55 52
 #define _cont_ 0x746e6f63   /* "cont" */
... ...
@@ -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_SIPIFMATCH:
208 207
 		case HDR_OTHER:
209 208
 			/* just skip over it */
210 209
 			hdr->body.s=tmp;
... ...
@@ -365,7 +364,7 @@ int parse_headers(struct sip_msg* msg, int flags, int next)
365 364
 				msg->parsed_flag|=HDR_ALLOW;
366 365
 				break;
367 366
 			case HDR_EVENT:
368
-				if (msg->event==0) msg->event = hf;
367
+				if (msg->allow==0) msg->event = hf;
369 368
 				msg->parsed_flag|=HDR_EVENT;
370 369
 				break;
371 370
 		        case HDR_ACCEPT:
... ...
@@ -426,12 +425,6 @@ int parse_headers(struct sip_msg* msg, int flags, int next)
426 425
 					DBG("parse_headers: this is the second via\n");
427 426
 				}
428 427
 				break;
429
-			case HDR_SIPIFMATCH:
430
-				if (msg->sipifmatch==0)
431
-					msg->sipifmatch=hf;
432
-
433
-				msg->parsed_flag|=HDR_SIPIFMATCH;
434
-				break;
435 428
 			default:
436 429
 				LOG(L_CRIT, "BUG: parse_headers: unknown header type %d\n",
437 430
 							hf->type);
... ...
@@ -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_sipifmatch* sipifmatch;
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,7 @@ 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_sip.h"      /* SIP-If-Match */
87
+
88 88
 
89 89
 #define READ(val) \
90 90
 (*(val + 0) + (*(val + 1) << 8) + (*(val + 2) << 16) + (*(val + 3) << 24))
... ...
@@ -111,7 +111,6 @@ static inline char* skip_ws(char* p, unsigned int size)
111 111
         case _acce_: acce_CASE; \
112 112
         case _orga_: orga_CASE; \
113 113
         case _prio_: prio_CASE; \
114
-        case _sip_:  sip_CASE; \
115 114
         case _subj_: subj_CASE; \
116 115
         case _user_: user_CASE; \
117 116
         case _dive_: dive_CASE; \