Commit cc6881e1 authored by berge's avatar berge
Browse files

Fixed field name in ComonHeader.Changed mw_commonHeader

parent c04a8c5b
Loading
Loading
Loading
Loading
+48 −61
Original line number Diff line number Diff line
@@ -66,10 +66,11 @@ module LibItsGeoNetworking_Templates {
                plLength := 0, // will be computed by Codec
                trafficClass := p_trafficClass,
                hopLimit := p_hopLimit,
                longPosVec := p_longPosVec    
                senderPosVector := p_longPosVec    
            }
            
            template CommonHeader mw_commonHeader (
                in template (present) LongPosVector p_senderLongPosVec,
            	in template (present) NextHeader p_nextHeader,
            	in template (present) HeaderTST p_headerTST,
            	in template (present) StationTypeIdentifier p_stationType
@@ -82,7 +83,7 @@ module LibItsGeoNetworking_Templates {
                plLength := ?, 
                trafficClass := ?,
                hopLimit := ?,
                longPosVec := ?    
                senderPosVector := p_senderLongPosVec    
            }
            
            template CommonHeader mw_commonHeaderBeacon (
@@ -102,30 +103,11 @@ module LibItsGeoNetworking_Templates {
				plLength := 0,
				trafficClass := p_trafficClass,
				hopLimit := p_hopLimit,
				longPosVec := p_senderLongPosVec
			}
            
            template CommonHeader mw_commonHeaderWithSender (
                in template (present) NextHeader p_nextHeader,
                in template (present) HeaderTST p_headerTST,
                in template (present) StationTypeIdentifier p_stationType,
                in template (present) LongPosVector p_senderLongPosVec
            ) modifies mw_commonHeader := {
                longPosVec := p_senderLongPosVec
            }
            
            template CommonHeader mw_commonHeaderWithSenderWithHopLimit (
                in template (present) NextHeader p_nextHeader,
                in template (present) HeaderTST p_headerTST,
                in template (present) StationTypeIdentifier p_stationType,
                in template (present) LongPosVector p_senderLongPosVec,
                in template (present) UInt8 p_hopLimit
            ) modifies mw_commonHeader := {
                longPosVec := p_senderLongPosVec,
                hopLimit := p_hopLimit 
				senderPosVector := p_senderLongPosVec
			}
          
            template CommonHeader mw_commonHeaderWithHopLimit (
                in template (present) LongPosVector p_senderLongPosVec,
            	in template (present) NextHeader p_nextHeader,
            	in template (present) HeaderTST p_headerTST,
            	in template (present) StationTypeIdentifier p_stationType,
@@ -234,6 +216,7 @@ module LibItsGeoNetworking_Templates {
    	    ) := {
                geoUnicastHeader := {
                    commonHeader := mw_commonHeader(
                        p_senderLongPosVec,
                    	?,
                    	mw_geoUnicastHeaderType,
                    	p_stationType
@@ -334,11 +317,11 @@ module LibItsGeoNetworking_Templates {
            	in template (present) UInt16 p_seqNumber
            ) := {
                geoBroadcastHeader := {
                    commonHeader := mw_commonHeaderWithSender(
                    commonHeader := mw_commonHeader(
                        p_senderLongPosVec,
                        ?,
                    	mw_geoBroadcastHeaderType,
                    	p_stationType, 
                    	p_senderLongPosVec
                    	p_stationType
                    ),
                    seqNumber := p_seqNumber,
                    lifetime := ?,
@@ -361,11 +344,11 @@ module LibItsGeoNetworking_Templates {
                in template (present) BroadcastArea p_broadcastArea
            ) modifies mw_geoBroadcastHeader := {
                geoBroadcastHeader := {
                    commonHeader := mw_commonHeaderWithSender(
                    commonHeader := mw_commonHeader(
                        p_senderLongPosVec,
                        ?,
                        mw_geoBroadcastHeaderTypeWithSubType(p_broadcastArea.geoBroadcastSubType),
                        p_stationType,
                        p_senderLongPosVec
                        p_stationType
                    ),
                    geoAreaPosLatitude := p_broadcastArea.geoBroadcastArea.geoAreaPosLatitude,
                    geoAreaPosLongitude := p_broadcastArea.geoBroadcastArea.geoAreaPosLongitude,
@@ -384,11 +367,11 @@ module LibItsGeoNetworking_Templates {
                in template (present) UInt8 p_hopLimit
            ) modifies mw_geoBroadcastHeaderWithArea := {
                geoBroadcastHeader := {
                    commonHeader := mw_commonHeaderWithSenderWithHopLimit(
                    commonHeader := mw_commonHeaderWithHopLimit(
                        p_senderLongPosVec,
                        ?,
                        mw_geoBroadcastHeaderType,
                        p_stationType, 
                        p_senderLongPosVec,
                        p_hopLimit
                    )
                } 
@@ -483,11 +466,11 @@ module LibItsGeoNetworking_Templates {
                in template (present) UInt16 p_seqNumber
            ) := {
                geoAnycastHeader := {
                    commonHeader := mw_commonHeaderWithSender(
                    commonHeader := mw_commonHeader(
                        p_senderLongPosVec,
                        ?,
                        mw_geoAnycastHeaderType,
                        p_stationType, 
                        p_senderLongPosVec
                        p_stationType                        
                    ),
                    seqNumber := p_seqNumber,
                    lifetime := ?,
@@ -510,11 +493,11 @@ module LibItsGeoNetworking_Templates {
                in template (present) AnycastArea p_anycastArea
            ) modifies mw_geoAnycastHeader := {
                geoAnycastHeader := {
                    commonHeader := mw_commonHeaderWithSender(
                    commonHeader := mw_commonHeader(
                        p_senderLongPosVec,
                        ?,
                        mw_geoAnycastHeaderTypeWithSubType(p_anycastArea.geoAnycastSubType),
                        p_stationType,
                        p_senderLongPosVec
                        p_stationType                 
                    ),
                    geoAreaPosLatitude := p_anycastArea.geoAnycastArea.geoAreaPosLatitude,
                    geoAreaPosLongitude := p_anycastArea.geoAnycastArea.geoAreaPosLongitude,
@@ -533,11 +516,11 @@ module LibItsGeoNetworking_Templates {
                in template (present) UInt8 p_hopLimit
            ) modifies mw_geoAnycastHeaderWithArea := {
                geoAnycastHeader := {
                    commonHeader := mw_commonHeaderWithSenderWithHopLimit(
                    commonHeader := mw_commonHeaderWithHopLimit(
                        p_senderLongPosVec,
                        ?,
                        mw_geoAnycastHeaderType,
                        p_stationType, 
                        p_senderLongPosVec,
                        p_hopLimit
                    )
                } 
@@ -602,6 +585,7 @@ module LibItsGeoNetworking_Templates {
            ) := {
                lsRequestHeader := {
                	commonHeader := mw_commonHeader(
                        ?,
                    	e_any,
                    	mw_lsRequestHeaderType,
                    	p_stationType
@@ -675,6 +659,7 @@ module LibItsGeoNetworking_Templates {
            ) := {
                lsReplyHeader := {
                commonHeader := mw_commonHeader(
                    ?,
                    e_any,
                    m_lsReplyHeaderType,
                    p_stationType
@@ -781,6 +766,7 @@ module LibItsGeoNetworking_Templates {
            ) := {
                shbHeader := {
                    commonHeader := mw_commonHeader(
                        ?,
                        ?,
                        m_shbHeaderType,
                        p_stationType
@@ -842,6 +828,7 @@ module LibItsGeoNetworking_Templates {
            ) := {
                tsbHeader := {
                    commonHeader := mw_commonHeader(
                        ?,
                        e_any,
                        m_tsbHeaderType,
                        p_stationType
+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ module LibItsGeoNetworking_TypesAndValues {
                    UInt16          plLength,
                    TrafficClass    trafficClass,
                    UInt8           hopLimit,
                    LongPosVector   longPosVec
                    LongPosVector   senderPosVector
                }
                
                /**