Commit d2804ee1 authored by berge's avatar berge
Browse files

Misc bug fixes in PON_FPB_*

New Lifetime parameter for UT primitive generateGeoBroadcast/generateGeoAnycast
parent 3ad95d60
Loading
Loading
Loading
Loading
+49 −1
Original line number Diff line number Diff line
@@ -155,7 +155,24 @@ module LibItsGeoNetworking_Templates {
                utGnEvent := {
                    geoBroadcast := {
                        area := p_area,
                        payload := omit
                        payload := omit,
                        lifetime := omit
                    }
                }
            }
            
            /**
             * @desc    Request IUT to send a GeoBroadcast message to a specific area
             * @param   p_area      Destination area of the message
             * @param   p_lifetime  Packet's lifetime
             */
            template UtEvent m_generateGeoBroadcastMessageWithLifetime(
                GeoArea p_area,
                integer p_lifetime
            ) modifies m_generateGeoBroadcastMessage := {
                utGnEvent := {
                    geoBroadcast := {
                        lifetime := p_lifetime
                    }
                }
            }
@@ -725,6 +742,27 @@ module LibItsGeoNetworking_Templates {
                }
            }    
            
            /**
             * @desc    Send template for GeoUnicast header with Lifetime
             * @param   p_sourceLongPosVec      Long position vector of source 
             * @param   p_destinationLongPosVec Long position vector of destination 
             * @param   p_senderLongPosVec      Long position vector of sender
             * @param   p_seqNumber             Sequence number of GeoUnicast packet
             * @param   p_lifetime              Packet's lifetime 
             * @see     m_geoUnicastHeader
             */
            template (value) Header m_geoUnicastHeaderWithLifetime(
                in template (value) LongPosVector p_sourceLongPosVec,
                in template (value) ShortPosVector p_destinationLongPosVec,
                in template (value) LongPosVector p_senderLongPosVec,
                in template (value) UInt16 p_seqNumber,
                in template (value) Lifetime p_lifetime
            ) modifies m_geoUnicastHeader := {
                geoUnicastHeader := {
                    lifetime := p_lifetime
                }
            }   

            /**
             * @desc    Receive template for GeoUnicast header
             * @param   p_senderLongPosVec          Long position vector of sender
@@ -1058,6 +1096,16 @@ module LibItsGeoNetworking_Templates {
                ltBase := e_100s
            }
            
            /**
             * @desc    Send template for Lifetime field (Base = 1s)
             */
            template (value) Lifetime m_lifetimeBase1s(
                in template (value) UInt6 p_multiplier
            ) := {
                multiplier := p_multiplier,
                ltBase := e_1s
            }
            
            /**
             * @desc    Receive template for lifetime 0
             */
+1 −0
Original line number Diff line number Diff line
@@ -977,6 +977,7 @@ module LibItsGeoNetworking_TypesAndValues {
         */
        type record GenerateGeoBroadcastMessage {
            GeoArea area,
            integer lifetime optional,
            Payload payload optional
        }