Commit a3324773 authored by rennoch's avatar rennoch
Browse files

addition of SIP header field due to adapter compatibility with STF306: 

AllowEvents, Event, SubscriptionState, ReferTo, ReferredBy, HistoryInfo
parent c317aadf

SIPAts/ttcn/SIPI_SIP_Templates.ttcn

+138 −0
Original line number Diff line number Diff line
@@ -773,6 +773,12 @@ group Requests 
		  wwwAuthenticate := omit,

		  rAck := omit, // due to new message header field

		  rSeq := omit,  // due to new message header field

		  allowEvents := omit, 			// RFC3265

		  event := omit, 				// RFC3265

		  subscriptionState := omit, 	// RFC3265

		  referTo := omit, 		// 3515

		  referredBy := omit,	// 3892

		  historyInfo := omit,	// 4244

		  reason := omit, // due to new message header field

		  pAssertedID := omit, // due to new message header field

		  pPreferredID := omit, // due to new message header field
@@ -856,6 +862,12 @@ group Requests 
		wwwAuthenticate := omit,

	rAck := omit, // due to new message header field

	rSeq := omit,  // due to new message header field

      allowEvents := omit, 			// RFC3265

      event := omit, 				// RFC3265

      subscriptionState := omit, 	// RFC3265

      referTo := omit, 		// 3515

      referredBy := omit,	// 3892

      historyInfo := omit,	// 4244

	reason := omit, // due to new message header field

	pAssertedID := omit, // due to new message header field

	pPreferredID := omit, // due to new message header field
@@ -1229,6 +1241,12 @@ group Requests 
		  wwwAuthenticate := *,

	  rAck := *, // due to new message header field

	  rSeq := *,  // due to new message header field

	  allowEvents := *, 		// RFC3265

	  event := *, 				// RFC3265

	  subscriptionState := *, 	// RFC3265

	  referTo := *, 		// 3515

	  referredBy := *,	// 3892

	  historyInfo := *,	// 4244

	  reason := *, // due to new message header field

	  pAssertedID := *,  // due to new message header field

	  pPreferredID := *,  // due to new message header field
@@ -1431,6 +1449,12 @@ group Requests 
		wwwAuthenticate := omit,

	rAck := omit, // due to new message header field

	rSeq := omit,  // due to new message header field

	  allowEvents := omit, 			// RFC3265

	  event := omit, 				// RFC3265

	  subscriptionState := omit, 	// RFC3265

	  referTo := omit, 		// 3515

	  referredBy := omit,	// 3892

	  historyInfo := omit,	// 4244

	reason := omit, // due to new message header field

	pAssertedID := omit, // due to new message header field

	pPreferredID := omit, // due to new message header field
@@ -1509,6 +1533,12 @@ group Requests 
		  wwwAuthenticate := omit,

	  rAck := omit, // due to new message header field

	  rSeq := omit,  // due to new message header field

		  allowEvents := omit, 			// RFC3265

		  event := omit, 				// RFC3265

		  subscriptionState := omit, 	// RFC3265

		  referTo := omit, 		// 3515

		  referredBy := omit,	// 3892

		  historyInfo := omit,	// 4244

	  reason := omit, // due to new message header field

	  pAssertedID := omit, // due to new message header field

	  pPreferredID := omit, // due to new message header field
@@ -1584,6 +1614,12 @@ group Requests 
		  wwwAuthenticate := *,

	  rAck := *, // due to new message header field

	  rSeq := *,  // due to new message header field

	  allowEvents := *, 		// RFC3265

	  event := *, 				// RFC3265

	  subscriptionState := *, 	// RFC3265

	  referTo := *, 		// 3515

	  referredBy := *,	// 3892

	  historyInfo := *,	// 4244

	  reason := *, // due to new message header field

	  pAssertedID := *,  // due to new message header field

	  pPreferredID := *,  // due to new message header field
@@ -1691,6 +1727,12 @@ group Requests 
		  wwwAuthenticate := omit,

	  rAck := omit, // due to new message header field

	  rSeq := omit,  // due to new message header field

		  allowEvents := omit, 			// RFC3265

		  event := omit, 				// RFC3265

		  subscriptionState := omit, 	// RFC3265

		  referTo := omit, 		// 3515

		  referredBy := omit,	// 3892

		  historyInfo := omit,	// 4244

	  reason := omit, // due to new message header field

	  pAssertedID := omit, // due to new message header field

	  pPreferredID := omit, // due to new message header field
@@ -1780,6 +1822,12 @@ group Requests 
		  wwwAuthenticate := *,

	  rAck := *, // due to new message header field

	  rSeq := *,  // due to new message header field

	  allowEvents := *, 		// RFC3265

	  event := *, 				// RFC3265

	  subscriptionState := *, 	// RFC3265

	  referTo := *, 		// 3515

	  referredBy := *,	// 3892

	  historyInfo := *,	// 4244

	  reason := *, // due to new message header field

	  pAssertedID := *,  // due to new message header field

	  pPreferredID := *,  // due to new message header field
@@ -1876,6 +1924,12 @@ group Requests 
		  wwwAuthenticate := omit,

	  rAck := omit, // due to new message header field

	  rSeq := omit,  // due to new message header field

		  allowEvents := omit, 			// RFC3265

		  event := omit, 				// RFC3265

		  subscriptionState := omit, 	// RFC3265

		  referTo := omit, 		// 3515

		  referredBy := omit,	// 3892

		  historyInfo := omit,	// 4244

	  reason := omit, // due to new message header field

	  pAssertedID := omit, // due to new message header field

	  pPreferredID := omit, // due to new message header field
@@ -1955,6 +2009,12 @@ group Requests 
		  wwwAuthenticate := *,

	  rAck := *, // due to new message header field

	  rSeq := *,  // due to new message header field

	  allowEvents := *, 		// RFC3265

	  event := *, 				// RFC3265

	  subscriptionState := *, 	// RFC3265

	  referTo := *, 		// 3515

	  referredBy := *,	// 3892

	  historyInfo := *,	// 4244

	  reason := *, // due to new message header field

	  pAssertedID := *,  // due to new message header field

	  pPreferredID := *,  // due to new message header field
@@ -2030,6 +2090,12 @@ group Requests 
	  wwwAuthenticate := omit,

	  rAck := loc_RAck,

	  rSeq := omit,

	  allowEvents := omit, 			// RFC3265

	  event := omit, 				// RFC3265

	  subscriptionState := omit, 	// RFC3265

	  referTo := omit, 		// 3515

	  referredBy := omit,	// 3892

	  historyInfo := omit,	// 4244

	  reason := omit, // due to new message header field

	  pAssertedID := omit, // due to new message header field

	  pPreferredID := omit, // due to new message header field
@@ -2097,6 +2163,12 @@ group Requests 
	  wwwAuthenticate := *,

  rAck := *, // due to new message header field

  rSeq := *,  // due to new message header field

	  allowEvents := *, 		// RFC3265

	  event := *, 				// RFC3265

	  subscriptionState := *, 	// RFC3265

	  referTo := *, 		// 3515

	  referredBy := *,	// 3892

	  historyInfo := *,	// 4244

  reason := *, // due to new message header field

  pAssertedID := *,  // due to new message header field

  pPreferredID := *,  // due to new message header field
@@ -2172,6 +2244,12 @@ group Requests 
	  wwwAuthenticate := omit,

	  rAck := omit,

	  rSeq := omit,

	  allowEvents := omit, 			// RFC3265

	  event := omit, 				// RFC3265

	  subscriptionState := omit, 	// RFC3265

	  referTo := omit, 		// 3515

	  referredBy := omit,	// 3892

	  historyInfo := omit,	// 4244

	  reason := omit, // due to new message header field

	  pAssertedID := omit, // due to new message header field

	  pPreferredID := omit, // due to new message header field
@@ -2238,6 +2316,12 @@ group Requests 
	  wwwAuthenticate := *,

  rAck := *, // due to new message header field

  rSeq := *,  // due to new message header field

	  allowEvents := *, 		// RFC3265

	  event := *, 				// RFC3265

	  subscriptionState := *, 	// RFC3265

	  referTo := *, 		// 3515

	  referredBy := *,	// 3892

	  historyInfo := *,	// 4244

  reason := *, // due to new message header field

  pAssertedID := *,  // due to new message header field

  pPreferredID := *,  // due to new message header field
@@ -2305,6 +2389,12 @@ group Requests 
	  wwwAuthenticate := *,

  rAck := *, // due to new message header field

  rSeq := *,  // due to new message header field

	  allowEvents := *, 		// RFC3265

	  event := *, 				// RFC3265

	  subscriptionState := *, 	// RFC3265

	  referTo := *, 		// 3515

	  referredBy := *,	// 3892

	  historyInfo := *,	// 4244

  reason := *, // due to new message header field

  pAssertedID := *,  // due to new message header field

  pPreferredID := *,  // due to new message header field
@@ -2379,6 +2469,12 @@ group Requests 
		wwwAuthenticate := omit,

		rAck := omit,

		rSeq := omit,

		  allowEvents := omit, 			// RFC3265

		  event := omit, 				// RFC3265

		  subscriptionState := omit, 	// RFC3265

		  referTo := omit, 		// 3515

		  referredBy := omit,	// 3892

		  historyInfo := omit,	// 4244

		reason := omit, // due to new message header field

		pAssertedID := omit, // due to new message header field

		pPreferredID := omit, // due to new message header field
@@ -2445,6 +2541,12 @@ group Requests 
		wwwAuthenticate := *,

		rAck := *, // due to new message header field

		rSeq := *,  // due to new message header field

	  allowEvents := *, 		// RFC3265

	  event := *, 				// RFC3265

	  subscriptionState := *, 	// RFC3265

	  referTo := *, 		// 3515

	  referredBy := *,	// 3892

	  historyInfo := *,	// 4244

		reason := *, // due to new message header field

		pAssertedID := *,  // due to new message header field

		pPreferredID := *,  // due to new message header field
@@ -2692,6 +2794,12 @@ group Responses 
//		  the following header field is due to RFC3261 (rel. prov. response)

	  rAck := *, // due to new message header field

	  rSeq := *,  // due to new message header field 

	  allowEvents := *, 		// RFC3265

	  event := *, 				// RFC3265

	  subscriptionState := *, 	// RFC3265

	  referTo := *, 		// 3515

	  referredBy := *,	// 3892

	  historyInfo := *,	// 4244

	  reason := *, // due to new message header field

	  pAssertedID := *,  // due to new message header field

	  pPreferredID := *,  // due to new message header field
@@ -2756,6 +2864,12 @@ group Responses 
//		  the following header field is due to RFC3261 (rel. prov. response)

	  rAck := *, // due to new message header field

	  rSeq := *,  // due to new message header field 

	  allowEvents := *, 		// RFC3265

	  event := *, 				// RFC3265

	  subscriptionState := *, 	// RFC3265

	  referTo := *, 		// 3515

	  referredBy := *,	// 3892

	  historyInfo := *,	// 4244

	  reason := *, // due to new message header field

	  pAssertedID := *,  // due to new message header field

	  pPreferredID := *,  // due to new message header field
@@ -2837,6 +2951,12 @@ group Responses 
//		  the following header field is due to RFC3261 (rel. prov. response)

	  rAck := omit, // due to new message header field

	  rSeq := omit,  // due to new message header field 

		  allowEvents := omit, 			// RFC3265

		  event := omit, 				// RFC3265

		  subscriptionState := omit, 	// RFC3265

		  referTo := omit, 		// 3515

		  referredBy := omit,	// 3892

		  historyInfo := omit,	// 4244

	  reason := omit, // due to new message header field

	  pAssertedID := omit, // due to new message header field

	  pPreferredID := omit, // due to new message header field
@@ -2932,6 +3052,12 @@ group Responses 
//		  the following header field is due to RFC3261 (rel. prov. response)

	  rAck := omit, // due to new message header field

	  rSeq := omit,  // due to new message header field 

		  allowEvents := omit, 			// RFC3265

		  event := omit, 				// RFC3265

		  subscriptionState := omit, 	// RFC3265

		  referTo := omit, 		// 3515

		  referredBy := omit,	// 3892

		  historyInfo := omit,	// 4244

	  reason := omit, // due to new message header field

	  pAssertedID := omit, // due to new message header field

	  pPreferredID := omit, // due to new message header field
@@ -3079,6 +3205,12 @@ group Responses 
//		  the following header field is due to RFC3261 (rel. prov. response)

	  rAck := *, // due to new message header field

	  rSeq := *,  // due to new message header field 

	  allowEvents := *, 		// RFC3265

	  event := *, 				// RFC3265

	  subscriptionState := *, 	// RFC3265

	  referTo := *, 		// 3515

	  referredBy := *,	// 3892

	  historyInfo := *,	// 4244

	  reason := *, // due to new message header field

	  pAssertedID := *,  // due to new message header field

	  pPreferredID := *,  // due to new message header field
@@ -3240,6 +3372,12 @@ group Responses 
//		  the following header field is due to RFC3261 (rel. prov. response)

	  rAck := *, // due to new message header field

	  rSeq := *,  // due to new message header field     

	  allowEvents := *, 		// RFC3265

	  event := *, 				// RFC3265

	  subscriptionState := *, 	// RFC3265

	  referTo := *, 		// 3515

	  referredBy := *,	// 3892

	  historyInfo := *,	// 4244

	  reason := *, // due to new message header field

	  pAssertedID := *,  // due to new message header field

	  pPreferredID := *,  // due to new message header field

SIPAts/ttcn/SIPI_SIP_Types.ttcn

+83 −1
Original line number Diff line number Diff line
@@ -248,6 +248,19 @@ group SubTypes{// Subtypes 
		// [3262/7.1]

		RACK_E,

		RSEQ_E,

		

		// [3265/7.2]

		ALLOW_EVENTS_E,

		EVENT_E,

		SUBSCRIPTION_STATE_E,

		

		// REFER method

		REFER_TO_E, 	// 3515

		REFERRED_BY_E,	// 3892

		

		// [4244]

		HISTORY_INFO_E,

		       

		// [3326]

		REASON_E,

		// [3325]
@@ -896,6 +909,33 @@ group SubTypes{// Subtypes 
		  charstring method

	  }



	  // [3265/7.2]

	  type record AllowEvents {

		  FieldName fieldName(ALLOW_EVENTS_E),

		  EventType_List eventTypes

	  }

	  

	  type set of EventType EventType_List;

	  type charstring EventType;

	  

	  // [3265/7.2]

	  type record Event {

		  FieldName fieldName(EVENT_E),

		  EventType eventType,

		  SemicolonParam_List eventParams optional

	  }

	  

	  // [3265/7.2]

	  type record SubscriptionState {

		  FieldName fieldName(SUBSCRIPTION_STATE_E),

		  SubState subState,

		  SemicolonParam_List substateParams optional

	  }

	  

//	  type record of SubState SubStates;

	  type charstring SubState;





//	  // [3326] //note-axr: to be refined

//	  type record Reason {

//		  FieldName fieldName(REASON_E),
@@ -934,6 +974,36 @@ group SubTypes{// Subtypes 
		  PrivacyValue_List privValueList

	  }

	  

	  // [3515]

	  type record ReferTo {

		  FieldName fieldName(REFER_TO_E),

		  NameAddr nameAddr,

		  SemicolonParam_List referToParams optional

	  }



	  // [3892]

	  type record ReferredBy {

		  FieldName fieldName(REFERRED_BY_E),

		  NameAddr nameAddr,

		  SemicolonParam_List referredbyIdParams optional

	  }



	  // [4244]

	  type record HistoryInfo {

		  FieldName fieldName(HISTORY_INFO_E),

		  HistoryInfo_List historyInfoList

	  }

	  

	  type record of HistoryInfoEntry HistoryInfo_List;



	  type record of integer IntegerList;



	  type record HistoryInfoEntry {

		  NameAddr nameAddr,

		  IntegerList hiIndex optional,

		  SemicolonParam_List hiExtention optional

	  }      

      

    } // end group HeaderFieldTypes

    

    group MessageHeaderTypes
@@ -997,6 +1067,18 @@ group SubTypes{// Subtypes 
		RAck rAck optional,

		RSeq rSeq optional,



		// 3265/7.2

		AllowEvents allowEvents optional,

		Event event optional,

		SubscriptionState subscriptionState optional,

		

		// REFER method

		ReferTo referTo optional, 		// 3515

		ReferredBy referredBy optional,	// 3892

		

		// 4244

		HistoryInfo historyInfo optional,

				

		// 3326

		Reason reason optional,