[SR-Dev] git:janakj/kcore DELETED: Make the parser work with the sr core

[Jan Janak]

Module: sip-router
Branch: janakj/kcore DELETED
Commit: 0f17a8a5a322bc75fdd5e2fb158b33dd059b25d9
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f17a8a5a322bc75fdd5e2fb158b33dd059b25d9

Author: Jan Janak <jan at iptel.org>
Committer: Jan Janak <jan at iptel.org>
Date:   Sun Mar 29 22:01:50 2009 +0200

Make the parser work with the sr core

List of changes:
 * Fix header paths
 * Include defines that are missing from keys.h
 * Replace hf->sibling with next_sibling_hdr

---

 lib/kcore/parse_supported.c |    9 ++++++---
 lib/kcore/parse_supported.h |    4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/kcore/parse_supported.c b/lib/kcore/parse_supported.c
index ddecf50..e655d30 100644
--- a/lib/kcore/parse_supported.c
+++ b/lib/kcore/parse_supported.c
@@ -26,10 +26,13 @@
  * \ingroup parser
  */
 
-#include "../mem/mem.h"
-#include "keys.h"
+#include "../../mem/mem.h"
+#include "../../parser/keys.h"
 #include "parse_supported.h"
 
+#define _100r_ 0x72303031   /* "100r" for "100rel" */
+#define _time_ 0x656d6974   /*!< "time" */
+
 #define IS_DELIM(c) (*(c) == ' ' || *(c) == '\t' || *(c) == '\r' || *(c) == '\n' || *(c) == ',')
 
 /* from parser/parse_hname2.c: */
@@ -119,7 +122,7 @@ int parse_supported( struct sip_msg *msg)
 
 	/* bad luck! :-( - we have to parse them */
 	supported = 0;
-	for( hdr=msg->supported ; hdr ; hdr=hdr->sibling) {
+	for( hdr=msg->supported ; hdr ; hdr=next_sibling_hdr(hdr)) {
 		if (hdr->parsed) {
 			supported |= ((struct supported_body*)hdr->parsed)->supported;
 			continue;
diff --git a/lib/kcore/parse_supported.h b/lib/kcore/parse_supported.h
index 9a177fd..c618b8d 100644
--- a/lib/kcore/parse_supported.h
+++ b/lib/kcore/parse_supported.h
@@ -35,8 +35,8 @@
 #ifndef PARSE_SUPPORTED_H
 #define PARSE_SUPPORTED_H
 
-#include "msg_parser.h"
-#include "../mem/mem.h"
+#include "../../parser/msg_parser.h"
+#include "../../mem/mem.h"
 
 
 #define F_SUPPORTED_PATH	(1 << 0)