Commit 8f468eb6 authored by fischer's avatar fischer
Browse files

TC added

parent 371c67ec
Loading
Loading
Loading
Loading
+60 −10
Original line number Diff line number Diff line
@@ -85,6 +85,26 @@ module LibItsGeoNetworking_Templates {
                longPosVec := ?    
            }
            
            template CommonHeader mw_commonHeaderBeacon (
            	in template (present) StationTypeIdentifier p_stationType,
            	in template (present) TrafficClass p_trafficClass,
            	in template (present) UInt8 p_hopLimit,
                in template (present) LongPosVector p_senderLongPosVec
        ) := {
				version := c_geoNwProtocolVersion,
				nextHeader := e_any, // 0
				headerTST := {
					beaconHdr := {	headerType := e_beacon, // 0
					    			headerSubType := 0}
				},
				reserved := c_uInt8Zero,
				flags := mw_flags(p_stationType),
				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,
@@ -137,6 +157,32 @@ module LibItsGeoNetworking_Templates {
                latency := e_veryLow
            }
            
            template GN_Address mw_gnAddressAny := {
                typeOfAddress := ?,
                stationType := ?,
                stationSubType := ?,
                stationCountryCode := ?,
                mid := ?
            }
         
            
            template LongPosVector mw_longPosVectorAny(
            	in template (present) GN_Address p_gnAddress
        	) := {
                    gnAddr := p_gnAddress,
                    timestamp := ?,
                    latitute := ?,
                    longitude := ?,
                    speed := ?,
                    heading := ?,
                    altitude := ?,
                    timeAccuracy := ?,
                    posAccuracy := ?,
                    speedAccuracy := ?,
                    headingAccuracy := ?,
                    altitudeAccuracy := ?
            }
         
	   	} // end geoNwCommonHeaderTemplates
    
    	group geoUnicastHeaderTemplates {
@@ -217,14 +263,14 @@ module LibItsGeoNetworking_Templates {
    	    template (value) HeaderTST m_geoUnicastHeaderType := {
                geoUnicastHdr := {
                	headerType := e_geoUnicast,
                	reserved := c_uInt4Zero
                    headerSubType := c_uInt4Zero
                }
            }      
            
            template HeaderTST mw_geoUnicastHeaderType := {
                geoUnicastHdr := {
                	headerType := e_geoUnicast,
                	reserved := ?
                    headerSubType := ?
                }
            }       
    	    
@@ -681,13 +727,17 @@ module LibItsGeoNetworking_Templates {
            }
            
            template Header mw_beaconHeader(
    			in template (present) StationTypeIdentifier p_stationType
            in template (present) StationTypeIdentifier p_stationType,
            in template (present) TrafficClass p_trafficClass,
            in template (present) UInt8 p_hopLimit,
            in template (present) LongPosVector p_senderLongPosVec
            ) := {
                beaconHeader := {
                   	commonHeader := mw_commonHeader(
                    	e_any,
                    	mw_beaconHeaderType,
                    	p_stationType
                   	commonHeader := mw_commonHeaderBeacon(
                    p_stationType,
                    p_trafficClass,
                    p_hopLimit,
                    p_senderLongPosVec
                    )
                }
            }
@@ -695,14 +745,14 @@ module LibItsGeoNetworking_Templates {
            template (value) HeaderTST m_beaconHeaderType := {
                beaconHdr := {
                	headerType := e_beacon,
                	reserved := c_uInt4Zero
                    headerSubType := c_uInt4Zero
                }
            }      
            
            template HeaderTST mw_beaconHeaderType := {
                beaconHdr := {
                	headerType := e_beacon,
                	reserved := ?
                    headerSubType := ?
                }
            }   
		    
@@ -841,7 +891,7 @@ module LibItsGeoNetworking_Templates {
                },
                stationSubType := e_private,
                reserved := c_uInt2Zero,
                stationCountryCode := c_uInt12Zero,
                stationCountryCode := ²,
                slac := c_uInt8Zero,
                mid := c_uInt36Zero              
            }
+5 −7
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ module LibItsGeoNetworking_TypesAndValues {
                 */
                type record AnyHeaderType {
                    HeaderType  headerType(e_any),
                    UInt4       reserved
                    UInt4       headerSubType 
                }
                
                /**
@@ -315,7 +315,7 @@ module LibItsGeoNetworking_TypesAndValues {
                 */
                type record BeaconHeaderType {
                    HeaderType  headerType(e_beacon),
                    UInt4       reserved
                    UInt4       headerSubType
                }
                
                /**
@@ -385,7 +385,7 @@ module LibItsGeoNetworking_TypesAndValues {
                 */
                type record GeoUnicastHeaderType {
                    HeaderType  headerType(e_geoUnicast),
                    UInt4       reserved
                    UInt4       headerSubType
                }
                
                /**
@@ -628,10 +628,8 @@ module LibItsGeoNetworking_TypesAndValues {
                        TypeOfAddress   typeOfAddress,
                        StationType     stationType,
                        StationSubType  stationSubType,
                        UInt2           reserved,
                        UInt12          stationCountryCode,
                        UInt8           slac,
                        UInt36          mid
                        UInt10          stationCountryCode,
                        UInt48          mid
                    }
                    
                    group geoNetworkingAddressSubtypes {