Commit 94913622 authored by berge's avatar berge
Browse files

New templates for GN6

parent e2c34640
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -378,7 +378,7 @@ module LibItsGeoNetworking_Functions {
            return f_geoArea2geoBroadcastArea(f_getArea(vc_areaTable, p_areaName));
            return f_geoArea2geoBroadcastArea(f_getArea(vc_areaTable, p_areaName));
        }
        }
        
        
        function f_getAnycastArea(in charstring p_areaName) runs on ItsNt 
        function f_getGeoAnycastArea(in charstring p_areaName) runs on ItsNt 
        return GeoAnycastArea {
        return GeoAnycastArea {
            return f_geoArea2geoAnycastArea(f_getArea(vc_areaTable, p_areaName));
            return f_geoArea2geoAnycastArea(f_getArea(vc_areaTable, p_areaName));
        }
        }
+41 −0
Original line number Original line Diff line number Diff line
@@ -306,6 +306,24 @@ module LibItsGeoNetworking_Templates {
                }
                }
    	    } 
    	    } 
    	    
    	    
    	    //TODO use a better name
            template Header mw_geoUnicastHeaderWithAreaWithChWithLt(
                in template (present) LongPosVector p_sourceLongPosVec,
                in template (present) ShortPosVector p_destinationLongPosVec,
                in template (present) UInt16 p_seqNumber,
                in template (present) CommonHeader p_commonHeader,
                in template (present) Lifetime p_lifetime
            ) := {
                geoUnicastHeader := {
                    commonHeader := p_commonHeader,
                    seqNumber := p_seqNumber,
                    lifetime := p_lifetime,
                    reserved := c_uInt8Zero,
                    srcPosVector := p_sourceLongPosVec,
                    dstPosVector := p_destinationLongPosVec
                }
            } 
    	    
    	    template (value) HeaderTST m_geoUnicastHeaderType := {
    	    template (value) HeaderTST m_geoUnicastHeaderType := {
                geoUnicastHdr := {
                geoUnicastHdr := {
                	headerType := e_geoUnicast,
                	headerType := e_geoUnicast,
@@ -617,6 +635,29 @@ module LibItsGeoNetworking_Templates {
                } 
                } 
            }
            }
            
            
            //TODO use a better name
            template Header mw_geoAnycastHeaderWithAreaWithChWithLt(
                in template (present) LongPosVector p_sourceLongPosVec,
                in template (present) UInt16 p_seqNumber,
                in template (present) GeoAnycastArea p_anycastArea,
                in template (present) CommonHeader p_commonHeader,
                in template (present) Lifetime p_lifetime
            ) := {
                geoAnycastHeader := {
                    commonHeader := p_commonHeader,
                    seqNumber := p_seqNumber,
                    lifetime := p_lifetime,
                    reserved := c_uInt8Zero,
                    srcPosVector := p_sourceLongPosVec,
                    geoAreaPosLatitude := p_anycastArea.geoAnycastArea.geoAreaPosLatitude,
                    geoAreaPosLongitude := p_anycastArea.geoAnycastArea.geoAreaPosLongitude,
                    distanceA := p_anycastArea.geoAnycastArea.distanceA,
                    distanceB := p_anycastArea.geoAnycastArea.distanceB,
                    angle := p_anycastArea.geoAnycastArea.angle,
                    reserved2 := c_uInt24Zero
                }
            } 
                        
            template (value) HeaderTST m_geoAnycastHeaderType(
            template (value) HeaderTST m_geoAnycastHeaderType(
                in template (value) HeaderSubTypeGeoAnycast p_headerSubType
                in template (value) HeaderSubTypeGeoAnycast p_headerSubType
            ) := {
            ) := {
+1 −1
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ module LibItsIpv6OverGeoNetworking_Functions {
    
    
    group sendFunctions {
    group sendFunctions {
        
        
        function f_sendGeoBroadcastWithRA(
        function f_sendGeoBroadcastWithRtAdv(
            in template (value) GvlTableEntry p_gvl,
            in template (value) GvlTableEntry p_gvl,
            in template (value) LongPosVector p_position,
            in template (value) LongPosVector p_position,
            in template (value) Ipv6Address p_sourceAddr,
            in template (value) Ipv6Address p_sourceAddr,