Commit 3140302a authored by rennoch's avatar rennoch
Browse files

add Geolocation-Routing header field from RFC6442

parent 31a2e540

ttcn/LibSip_SIPTypesAndValues.ttcn

+18 −6
Original line number Diff line number Diff line
@@ -519,7 +519,9 @@ group SubTypes{// Subtypes 
        //Transporting User to User Call Control Information in SIP for ISDN Interworking

        USER_TO_USER_E,

        

        GEOLOCATION_E, // draft-ietf-sipcore-location-conveyance-04

        //[6442] /* @sic R5-133151 update of header fields sic@ */

        GEOLOCATION_E,

        GEOLOCATION_ROUTING_E, 

        

        SESSION_ID_E,
@@ -1514,16 +1516,25 @@ group SubTypes{// Subtypes 
          PAssertedServiceValue pAssertedServiceValue

      }



      group RFC6442GeolocationHeader

      {

      group RFC6442GeolocationConveyance

      { /* @sic R5-133151 update of header fields sic@ */

      // [6442]

          type record Geolocation {       // RFC6442 clause 4.1

            FieldName fieldName(GEOLOCATION_E),

            SipUrl    addrSpec,

            SemicolonParam_List geolocParam optional

          }

      

      }//end group RFC6442GeolocationHeader

          type enumerated GeolocationRoutingState 

          {GEOLOCATION_ROUTING_YES_E,

           GEOLOCATION_ROUTING_NO_E,

           GEOLOCATION_ROUTING_OTHER_E

          };

          type record GeolocationRouting {       // RFC6442 clause 4.2

            FieldName fieldName(GEOLOCATION_ROUTING_E),

            GeolocationRoutingState state,

            GenericParam genericValue optional

          }      

      }//end group RFC6442GeolocationConveyance



      type charstring SessIdString length(32);
@@ -1576,7 +1587,8 @@ group SubTypes{// Subtypes 
        Event               event optional, // 3265/7.2

        Expires             expires optional,

        From                fromField,

        Geolocation         geolocation optional, //   http://tools.ietf.org/html/draft-ietf-sipcore-location-conveyance-04

        Geolocation         geolocation optional, // 6442

        GeolocationRouting  geolocationRouting optional, // 6442  @sic R5-133151 update of header fields sic@

        HistoryInfo         historyInfo optional, // 4244

        InReplyTo           inReplyTo optional, // only in requests

        MaxForwards         maxForwards optional, // mandatory in requests not required in responses!

ttcn/LibSip_Templates.ttcn

+2 −0
Original line number Diff line number Diff line
@@ -1108,6 +1108,7 @@ group dummy_templates { 
		expires := omit,

		fromField := c_empty_From,

		geolocation := omit,

        geolocationRouting := omit,

		historyInfo := omit, //*  RFC4244

		inReplyTo := omit,

		maxForwards := c_maxForwards70,
@@ -1205,6 +1206,7 @@ group dummy_templates { 
		expires := *,

		fromField := ?,

		geolocation := *,

        geolocationRouting := *,

		historyInfo := *, //*  RFC4244

		inReplyTo := *,

		maxForwards := *,