rollback patch pending new ser release and discussion with core maintainer

parser/hf.c

@@ -45,8 +45,6 @@
 #include "parse_rr.h"
 #include "contact/parse_contact.h"
 #include "parse_disposition.h"
-#include "parse_allow.h"
-#include "parse_sipifmatch.h"
 #include "../ut.h"
 
 
@@ -120,7 +118,6 @@ void clean_hdr_field(struct hdr_field* hf)
 			break;
 
 		case HDR_ALLOW:
-			free_allow((unsigned int **)(&(hf->parsed)));
 			break;
 
 		case HDR_EVENT:
@@ -161,10 +158,6 @@ void clean_hdr_field(struct hdr_field* hf)
 			free_to(hf->parsed);
 			break;
 
-		case HDR_SIPIFMATCH:
-			free_sipifmatch((str**)(&(hf->parsed)));
-			break;
-
 		default:
 			LOG(L_CRIT, "BUG: clean_hdr_field: unknown header type %d\n",
 			    hf->type);

parser/hf.h

@@ -73,8 +73,7 @@
 #define HDR_CONTENTDISPOSITION (1 << 27)  /* Content-Disposition hdr field */
 #define HDR_DIVERSION          (1 << 28)  /* Diversion header field */
 #define HDR_RPID               (1 << 29)  /* Remote-Party-ID header field */
-#define HDR_SIPIFMATCH         (1 << 30)  /* SIP-If-Match header field */
-#define HDR_OTHER              (1 << 31)  /* Some other header field */
+#define HDR_OTHER              (1 << 30)  /* Some other header field */
 
 
 /* returns true if the header links allocated memory on parse field */

parser/keys.h

@@ -47,9 +47,6 @@
 #define _oriz_ 0x7a69726f   /* "oriz" */
 #define _atio_ 0x6f697461   /* "atio" */
 #define _call_ 0x6c6c6163   /* "call" */
-#define _sip_  0x2d706973   /* "sip-" */
-#define _ifm_  0x6d2d6669   /* "if-m" */
-#define _atch_ 0x68637461   /* "atch" */
 #define __id2_ 0x2064692d   /* "-id " */
 #define __id1_ 0x3a64692d   /* "-id:" */
 #define _cont_ 0x746e6f63   /* "cont" */

parser/msg_parser.c

@@ -204,7 +204,6 @@ char* get_hdr_field(char* buf, char* end, struct hdr_field* hdr)
 	        case HDR_ACCEPTDISPOSITION:
 	        case HDR_DIVERSION:
 	        case HDR_RPID:
-	        case HDR_SIPIFMATCH:
 		case HDR_OTHER:
 			/* just skip over it */
 			hdr->body.s=tmp;
@@ -365,7 +364,7 @@ int parse_headers(struct sip_msg* msg, int flags, int next)
 				msg->parsed_flag|=HDR_ALLOW;
 				break;
 			case HDR_EVENT:
-				if (msg->event==0) msg->event = hf;
+				if (msg->allow==0) msg->event = hf;
 				msg->parsed_flag|=HDR_EVENT;
 				break;
 		        case HDR_ACCEPT:
@@ -426,12 +425,6 @@ int parse_headers(struct sip_msg* msg, int flags, int next)
 					DBG("parse_headers: this is the second via\n");
 				}
 				break;
-			case HDR_SIPIFMATCH:
-				if (msg->sipifmatch==0)
-					msg->sipifmatch=hf;
-
-				msg->parsed_flag|=HDR_SIPIFMATCH;
-				break;
 			default:
 				LOG(L_CRIT, "BUG: parse_headers: unknown header type %d\n",
 							hf->type);

parser/msg_parser.h

@@ -193,7 +193,6 @@ struct sip_msg {
 	struct hdr_field* accept_disposition;
 	struct hdr_field* diversion;
 	struct hdr_field* rpid;
-	struct hdr_sipifmatch* sipifmatch;
 
 	char* eoh;        /* pointer to the end of header (if found) or null */
 	char* unparsed;   /* here we stopped parsing*/

parser/parse_hname2.c

@@ -84,7 +84,7 @@ static inline char* skip_ws(char* p, unsigned int size)
 #include "case_supp.h"     /* Supported */
 #include "case_dive.h"     /* Diversion */
 #include "case_remo.h"     /* Remote-Party-ID */
-#include "case_sip.h"      /* SIP-If-Match */
+
 
 #define READ(val) \
 (*(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)
         case _acce_: acce_CASE; \
         case _orga_: orga_CASE; \
         case _prio_: prio_CASE; \
-        case _sip_:  sip_CASE; \
         case _subj_: subj_CASE; \
         case _user_: user_CASE; \
         case _dive_: dive_CASE; \