Commit 29531bb2 authored by berge's avatar berge
Browse files

Fixed "NextHdr vs NextHeader" bug

parent 0dba9e25
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -1324,7 +1324,7 @@ module LibIpv6_Interface_Templates {
			in UInt32 p_spi,
			in UInt32 p_seqNr,
			in template EspIpDatagram p_espIpDatagram,
			in UInt8 p_nextHdr) := {
			in UInt8 p_nextHeader) := {
			espHeader := {
				// Header
				spi := p_spi, seqNbr := p_seqNr,
@@ -1336,7 +1336,7 @@ module LibIpv6_Interface_Templates {
				// Trailer
				padding := omit,
				padLength := 0,
				nextHdr := p_nextHdr,
				nextHeader := p_nextHeader,
				icv := omit}
		}

@@ -1344,7 +1344,7 @@ module LibIpv6_Interface_Templates {
			in UInt32 p_spi,
			in UInt32 p_seqNr,
			in template EspIpDatagram p_espIpDatagram,
			in UInt8 p_nextHdr,
			in UInt8 p_nextHeader,
			octetstring p_icv) := {
			espHeader := {
				// Header
@@ -1357,7 +1357,7 @@ module LibIpv6_Interface_Templates {
				// Trailer
				padding := omit,
				padLength := 0,
				nextHdr := p_nextHdr,
				nextHeader := p_nextHeader,
				icv := p_icv}
		}

@@ -1365,7 +1365,7 @@ module LibIpv6_Interface_Templates {
			in UInt32 p_spi,
			in template UInt32 p_seqNr,
			in template EspIpDatagram p_espIpDatagram,
			in UInt8 p_nextHdr) := {
			in UInt8 p_nextHeader) := {
			espHeader := {
				// Header
				spi := p_spi, seqNbr := p_seqNr,
@@ -1377,7 +1377,7 @@ module LibIpv6_Interface_Templates {
				// Trailer
				padding := *,
				padLength := ?,
				nextHdr := p_nextHdr,
				nextHeader := p_nextHeader,
				icv := *}
		}

+1 −1
Original line number Diff line number Diff line
@@ -1061,7 +1061,7 @@ module LibIpv6_Interface_TypesAndValues {
				// Trailer
/*encrypted*/	Oct1to255			padding optional,//depends on enc-algo
/*encrypted*/	UInt8				padLength,//depends on enc-algo
/*encrypted*/	UInt8				nextHdr,
/*encrypted*/	UInt8				nextHeader,
				octetstring			icv optional// depends on integrity-algo
			}
			with {