Support Record-Route header

diff --git a/src/codec.rs b/src/codec.rs
index 7deb71f933cc1cac901d85629b703cd9c2b900f5..c28439bea83c4313d91be518a64a6602ac40d283 100644 (file)
--- a/src/codec.rs
+++ b/src/codec.rs
@@ -442,7 +442,8 @@ mod tests {
                            bell-tel.com\r\nMax-Forwards:32\r\nMIME-Version:2.0\r\nMin-Expires:\
                            30\r\nOrganization:Foobar\r\nPriority:normal\r\nProxy-Authenticate:\
                            Digest realm=\"atlanta.com\"\r\nProxy-Authorization:Digest \
-                           username=\"Bob\"\r\nProxy-Require:foo\r\nVia: localhost\r\n\r\n")
+                           username=\"Bob\"\r\nProxy-Require:foo\r\nRecord-Route:<sip:server10.\
+                           biloxi.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 712388304d98d567d9ac0a8e55417c48a2737b9c..45dc9efb40c3b5136a3c317dd4df927504f3ba3f 100644 (file)
--- 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};
+            Challenge, OptionTag, Route};
 
 fn is_mark(c: u8) -> bool {
     c == b'-' || c == b'_' || c == b'.' || c == b'!' || c == b'~' || c == b'*' || c == b'\'' ||
@@ -1043,6 +1043,18 @@ named!(proxy_require_header<Vec<OptionTag>>, preceded!(
                tag!(b","),
                token)));
 
+named!(route<Route>, pair!(
+       name_addr,
+       many0!(preceded!(
+               tag!(b";"),
+               generic_param))));
+
+named!(record_route_header<Vec<Route>>, preceded!(
+       tag!(b"Record-Route:"),
+       separated_nonempty_list!(
+               tag!(b","),
+               route)));
+
 named!(pub header<Header>, alt!(
 // RFC 3261 Headers
        accept_header => { |a| Header::Accept(a) } |
@@ -1073,5 +1085,6 @@ named!(pub header<Header>, alt!(
        priority_header => { |p| Header::Priority(p) } |
        proxy_authenticate_header => { |p| Header::ProxyAuthenticate(p) } |
        proxy_authorization_header => { |p| Header::ProxyAuthorization(p) } |
-       proxy_require_header => { |p| Header::ProxyRequire(p) }
+       proxy_require_header => { |p| Header::ProxyRequire(p) } |
+       record_route_header => { |r| Header::RecordRoute(r) }
 ));

diff --git a/src/types.rs b/src/types.rs
index 17fa3a39b7f415f98b10e404a7fca5641b374725..2b4a2a17922aabde671a475ad50f8840b8e7ca8a 100644 (file)
--- a/src/types.rs
+++ b/src/types.rs
@@ -375,6 +375,8 @@ pub enum Challenge {
 
 pub type OptionTag = Vec<u8>;
 
+pub type Route = (NameAddr, Vec<GenericParam>);
+
 #[derive(Debug)]
 pub enum Header {
     Accept(Vec<AcceptRange>),
@@ -406,6 +408,7 @@ pub enum Header {
     ProxyAuthenticate(Challenge),
     ProxyAuthorization(Credentials),
     ProxyRequire(Vec<OptionTag>),
+    RecordRoute(Vec<Route>),
     To(Uri),
     Extension { name: String, value: String },
 }