From: Richard Whitehouse <github@richardwhiuk.com>
Date: Sun, 29 Oct 2017 21:55:42 +0000 (+0000)
Subject: Support Route header
X-Git-Url: https://git.richardwhiuk.com/?a=commitdiff_plain;h=8ed5baca59be09e739483c479f0ce090fd4af2a2;p=rust-sip.git

Support Route header
---

diff --git a/src/codec.rs b/src/codec.rs
index c980030..3d28cbe 100644
--- a/src/codec.rs
+++ b/src/codec.rs
@@ -444,7 +444,8 @@ mod tests {
                            Digest realm=\"atlanta.com\"\r\nProxy-Authorization:Digest \
                            username=\"Bob\"\r\nProxy-Require:foo\r\nRecord-Route:<sip:server10.\
                            biloxi.com;lr>\r\nReply-To:<sip:bob@biloxi.com>\r\nRequire:\
-                           baz\r\nRetry-After:18000;duration=3600\r\nVia: localhost\r\n\r\n")
+                           baz\r\nRetry-After:18000;duration=3600\r\nRoute:<sip:bigbox3.site3.\
+                           atlanta.com;lr>\r\nVia: localhost\r\n\r\n")
         });
 
         let finished = request.and_then(|(socket, _request)| {
diff --git a/src/parser.rs b/src/parser.rs
index 3891e47..f414787 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -17,7 +17,7 @@ use types::{PathSegment, HostPort, Host, Hostname, UriParameter, UriHeader, UriH
             Credentials, CallId, Purpose, InfoParam, Info, NameAddr, ContactParam, Target,
             Contact, DispositionType, Handling, DispositionParam, ContentCoding, Day, Month, Date,
             Time, DateTime, ErrorUri, FromParam, From, Priority, Domain, DigestChallenge,
-            Challenge, OptionTag, Route, ReplyTo, RetryAfterParam, RetryAfter };
+            Challenge, OptionTag, Route, ReplyTo, RetryAfterParam, RetryAfter};
 
 fn is_mark(c: u8) -> bool {
     c == b'-' || c == b'_' || c == b'.' || c == b'!' || c == b'~' || c == b'*' || c == b'\'' ||
@@ -1086,6 +1086,12 @@ named!(retry_after_header<RetryAfter>, preceded!(
 			retry_after_param
 		)))));
 
+named!(route_header<Vec<Route>>, preceded!(
+	tag!(b"Route:"),
+	separated_nonempty_list!(
+		tag!(b","),
+		route)));
+
 named!(pub header<Header>, alt!(
 // RFC 3261 Headers
 	accept_header => { |a| Header::Accept(a) } |
@@ -1120,5 +1126,6 @@ named!(pub header<Header>, alt!(
 	record_route_header => { |r| Header::RecordRoute(r) } |
 	reply_to_header => { |r| Header::ReplyTo(r) } |
 	require_header => { |r| Header::Require(r) } |
-	retry_after_header => { |r| Header::RetryAfter(r) }
+	retry_after_header => { |r| Header::RetryAfter(r) } |
+	route_header => { |r| Header::Route(r) }
 ));
diff --git a/src/types.rs b/src/types.rs
index 826f660..db98598 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -422,6 +422,7 @@ pub enum Header {
     ReplyTo(Vec<ReplyTo>),
     Require(Vec<OptionTag>),
     RetryAfter(RetryAfter),
+    Route(Vec<Route>),
     To(Uri),
     Extension { name: String, value: String },
 }