AddFlow message's Protocol fields needs to be 16 bits. For backward compatibility with NetPerfMeter 1.x, it is in Little Endian.

Author: dreibh

src/control.cc

@@ -182,8 +182,7 @@ bool performNetPerfMeterAddFlow(MessageReader* messageReader,
    addFlowMsg->MeasurementID = hton64(flow->getMeasurementID());
    addFlowMsg->FlowID        = htonl(flow->getFlowID());
    addFlowMsg->StreamID      = htons(flow->getStreamID());
-   addFlowMsg->Protocol      = flow->getTrafficSpec().Protocol;
-   addFlowMsg->pad           = 0x00;
+   addFlowMsg->Protocol      = htole16(flow->getTrafficSpec().Protocol);
    for(size_t i = 0;i < NETPERFMETER_RNG_INPUT_PARAMETERS;i++) {
       addFlowMsg->FrameRate[i] = doubleToNetwork(flow->getTrafficSpec().InboundFrameRate[i]);
       addFlowMsg->FrameSize[i] = doubleToNetwork(flow->getTrafficSpec().InboundFrameSize[i]);
@@ -779,8 +778,7 @@ static bool handleNetPerfMeterAddFlow(MessageReader*                    messageR
    else {
       // ====== Create new flow =============================================
       FlowTrafficSpec trafficSpec;
-      trafficSpec.Protocol    = addFlowMsg->Protocol;
-      assure(addFlowMsg->Protocol <= 255);
+      trafficSpec.Protocol    = le16toh(addFlowMsg->Protocol);
       trafficSpec.Description = std::string(description);
       for(size_t i = 0;i < NETPERFMETER_RNG_INPUT_PARAMETERS;i++) {
          trafficSpec.OutboundFrameRate[i] = networkToDouble(addFlowMsg->FrameRate[i]);

src/netperfmeterpackets.h

@@ -97,8 +97,7 @@ struct NetPerfMeterAddFlowMessage
    uint32_t               FlowID;
    uint64_t               MeasurementID;
    uint16_t               StreamID;
-   uint8_t                Protocol;
-   uint8_t                pad;
+   uint16_t               Protocol;   // Little Endian, due to compatibility!
 
    char                   Description[NETPERFMETER_DESCRIPTION_SIZE];