- added support for parsing the Retry-After header

Makefile.defs

@@ -76,7 +76,7 @@ MAIN_NAME=ser
 VERSION = 2
 PATCHLEVEL = 1
 SUBLEVEL =  0
-EXTRAVERSION = -dev9-dns
+EXTRAVERSION = -dev10
 
 SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \
 			$(SUBLEVEL) )

modules/tm/sip_msg.c

@@ -361,6 +361,7 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg, int *sip_msg_len )
 		case HDR_RECORDROUTE_T:
 		case HDR_CONTENTTYPE_T:
 		case HDR_CONTENTLENGTH_T:
+		case HDR_RETRY_AFTER_T:
 		case HDR_EXPIRES_T:
 		case HDR_SUPPORTED_T:
 		case HDR_REQUIRE_T:
@@ -538,6 +539,7 @@ do { \
 		case HDR_DATE_T:
 		case HDR_IDENTITY_T:
 		case HDR_IDENTITY_INFO_T:
+		case HDR_RETRY_AFTER_T:
 			break;
 
 		case HDR_VIA_T:

parser/hf.c

@@ -30,6 +30,7 @@
  * 2003-04-26 ZSW (jiri)
  * 2003-08-05 free the parsed part of Accept header (bogdan)
  * 2007-01-26 HDR_DATE_T, HDR_IDENTITY_T, HDR_IDENTITY_INFO_T added (gergo)
+ * 2007-07-27 added HDR_RETRY_AFTER_T (andrei)
  */
 
 
@@ -107,6 +108,9 @@ void clean_hdr_field(struct hdr_field* hf)
 		case HDR_CONTENTLENGTH_T:
 			break;
 
+		case HDR_RETRY_AFTER_T:
+			break;
+
 		case HDR_AUTHORIZATION_T:
 			free_credentials((auth_body_t**)h_parsed);
 			break;

parser/hf.h

@@ -32,6 +32,7 @@
  * 2005-02-14 hdr_flags_t && hdr_flags_f defined, split HDR_xxx into
  *             HDR_xxx_F & HDR_xxx_T [WARNING: don't mix them!] (andrei)
  * 2007-01-26 HDR_DATE_T, HDR_IDENTITY_T, HDR_IDENTITY_INFO_T added (gergo)
+ * 2007-07-27 HDR_RETRY_AFTER_[TF] added (andrei)
  */
 
 
@@ -105,6 +106,7 @@ enum _hdr_types_t {
 	HDR_DATE_T			       /* Date header field */,
 	HDR_IDENTITY_T			       /* Identity header field */,
 	HDR_IDENTITY_INFO_T		       /* Identity-info header field */,
+	HDR_RETRY_AFTER_T		           /* Retry-After header field */,
 
 	HDR_EOH_T					       /* End of message header */
 };
@@ -172,6 +174,7 @@ typedef unsigned long long hdr_flags_t;
 #define HDR_DATE_F			HDR_F_DEF(DATE)
 #define HDR_IDENTITY_F			HDR_F_DEF(IDENTITY)
 #define HDR_IDENTITY_INFO_F		HDR_F_DEF(IDENTITY_INFO)
+#define HDR_RETRY_AFTER_F			HDR_F_DEF(RETRY_AFTER)
 
 #define HDR_OTHER_F					HDR_F_DEF(OTHER)
 

parser/keys.h

@@ -174,4 +174,10 @@
 
 #define _min__ 0x2d6e696d   /* "min-" */
 
+
+#define _retr_ 0x72746572   /* "retr" */
+#define _y_af_ 0x66612d79   /* "y-af" */
+#define _ter1_ 0x3a726574   /* "ter:" */
+#define _ter2_ 0x20726574   /* "ter " */
+
 #endif /* KEYS_H */

parser/msg_parser.c

@@ -58,6 +58,7 @@
 #include "parse_hname2.h"
 #include "parse_uri.h"
 #include "parse_content.h"
+#include "../compiler_opt.h"
 
 #ifdef DEBUG_DMALLOC
 #include <mem/dmalloc.h>
@@ -82,7 +83,8 @@ char* get_hdr_field(char* buf, char* end, struct hdr_field* hdr)
 	struct date_body* date_b;
 	struct identity_body* identity_b;
 	struct identityinfo_body* identityinfo_b;
-	int integer;
+	int integer, err;
+	unsigned uval;
 
 	if ((*buf)=='\n' || (*buf)=='\r'){
 		/* double crlf or lflf or crcr */
@@ -186,6 +188,18 @@ char* get_hdr_field(char* buf, char* end, struct hdr_field* hdr)
 			DBG("DEBUG: get_hdr_body : content_length=%d\n",
 					(int)(long)hdr->parsed);
 			break;
+		case HDR_RETRY_AFTER_T:
+			hdr->body.s=tmp;
+			tmp=parse_retry_after(tmp,end, &uval, &err);
+			if (err){
+				LOG(L_ERR, "ERROR:get_hdr_field: bad retry_after header\n");
+				goto error;
+			}
+			hdr->parsed=(void*)(unsigned long)uval;
+			hdr->body.len=tmp-hdr->body.s;
+			DBG("DEBUG: get_hdr_body : retry_after=%d\n",
+					(unsigned)(long)hdr->parsed);
+			break;
 		case HDR_DATE_T:
 			date_b=pkg_malloc(sizeof(*date_b));
 			if (date_b==0){
@@ -351,8 +365,9 @@ int parse_headers(struct sip_msg* msg, hdr_flags_t flags, int next)
 
 	DBG("parse_headers: flags=%llx\n", (unsigned long long)flags);
 	while( tmp<end && (flags & msg->parsed_flag) != flags){
+		prefetch_loc_r(tmp+64, 1);
 		hf=pkg_malloc(sizeof(struct hdr_field));
-		if (hf==0){
+		if (unlikely(hf==0)){
 			ser_error=E_OUT_OF_MEM;
 			LOG(L_ERR, "ERROR:parse_headers: memory allocation error\n");
 			goto error;
@@ -377,6 +392,7 @@ int parse_headers(struct sip_msg* msg, hdr_flags_t flags, int next)
 			case HDR_REQUESTDISPOSITION_T:
 			case HDR_WWW_AUTHENTICATE_T:
 			case HDR_PROXY_AUTHENTICATE_T:
+			case HDR_RETRY_AFTER_T:
 			case HDR_OTHER_T: /*do nothing*/
 				break;
 			case HDR_CALLID_T:

parser/msg_parser.h

@@ -65,6 +65,7 @@
 #include "parse_to.h"
 #include "parse_via.h"
 #include "parse_fline.h"
+#include "parse_retry_after.h"
 #include "hf.h"
 #include "../error.h"
 

parser/parse_hname2.c

@@ -32,6 +32,7 @@
  * 2003-01-27 next baby-step to removing ZT - PRESERVE_ZT (jiri)
  * 2003-05-01 added support for Accept HF (janakj)
  * 2007-01-26 Date, Identity, Identity_info HF support added (gergo)
+ * 2007-07-27 added support for Retry-After (andrei)
  */
 
 
@@ -96,6 +97,7 @@ static inline char* skip_ws(char* p, unsigned int size)
 #include "case_www.h"      /* WWW-Authenticate */
 #include "case_date.h"     /* Date */
 #include "case_iden.h"     /* Identity, Identity-info */
+#include "case_retr.h"     /* Retry-After */
 
 
 #define READ(val) \
@@ -140,6 +142,7 @@ static inline char* skip_ws(char* p, unsigned int size)
 	case _www__: www_CASE; \
 	case _date_: date_CASE; \
 	case _iden_: iden_CASE; \
+	case _retr_: retr_CASE; \