Merge branch 'dev' into plugin2managed

robgjansen · web-flow · commit 0db171dde6b3 · 2021-06-11T13:36:48.000-04:00
diff --git a/docs/network_graph_attributes.md b/docs/network_graph_attributes.md
@@ -23,7 +23,7 @@ graph [
     target 0
     label "path from 1.2.3.4 to 1.2.3.4"
     latency "10 ms"
-    jitter 0.0
+    jitter "0 ms"
     packet_loss 0.0
   ]
 ]
@@ -140,7 +140,7 @@ The latency that will be added to packets traversing this edge. This value is us
 
 Required: False  
 Default: n/a  
-Type: Float
+Type: String
 
 This keyword is allowed but currently nonfunctional; it is reserved for future use.
 
diff --git a/src/main/routing/topology.c b/src/main/routing/topology.c
@@ -612,7 +612,7 @@ static gboolean _topology_checkGraphAttributes(Topology* top) {
         if(_topology_isValidEdgeAttributeKey(name, EDGE_ATTR_LATENCY)) {
             isSuccess = isSuccess && _topology_checkAttributeType(name, type, IGRAPH_ATTRIBUTE_STRING);
         } else if(_topology_isValidEdgeAttributeKey(name, EDGE_ATTR_JITTER)) {
-            isSuccess = isSuccess && _topology_checkAttributeType(name, type, IGRAPH_ATTRIBUTE_NUMERIC);
+            isSuccess = isSuccess && _topology_checkAttributeType(name, type, IGRAPH_ATTRIBUTE_STRING);
         } else if(_topology_isValidEdgeAttributeKey(name, EDGE_ATTR_PACKETLOSS)) {
             isSuccess = isSuccess && _topology_checkAttributeType(name, type, IGRAPH_ATTRIBUTE_NUMERIC);
         } else if(_topology_isValidEdgeAttributeKey(name, EDGE_ATTR_LABEL)) {
@@ -957,7 +957,7 @@ static gboolean _topology_checkGraphEdgesHelperHook(Topology* top, igraph_intege
     const gchar* jitterKey = _topology_edgeAttributeToString(EDGE_ATTR_JITTER);
     gdouble jitterValue;
     if(igraph_cattribute_has_attr(&top->graph, IGRAPH_ATTRIBUTE_EDGE, jitterKey) &&
-        _topology_findEdgeAttributeDouble(top, edgeIndex, EDGE_ATTR_JITTER, &jitterValue)) {
+        _topology_findEdgeAttributeStringTimeMs(top, edgeIndex, EDGE_ATTR_JITTER, &jitterValue)) {
 
         if(jitterValue >= 0.0f) {
             g_string_append_printf(message, " %s='%f'", jitterKey, jitterValue);
diff --git a/src/test/tor/minimal/tor-minimal.yaml b/src/test/tor/minimal/tor-minimal.yaml
@@ -17,7 +17,7 @@ network:
           source 0
           target 0
           latency "50 ms"
-          jitter 0.0
+          jitter "0 ms"
           packet_loss 0.0
         ]
       ]

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ graph [`
`23`	`23`	`target 0`
`24`	`24`	`label "path from 1.2.3.4 to 1.2.3.4"`
`25`	`25`	`latency "10 ms"`
`26`		`- jitter 0.0`
	`26`	`+ jitter "0 ms"`
`27`	`27`	`packet_loss 0.0`
`28`	`28`	`]`
`29`	`29`	`]`
`@@ -140,7 +140,7 @@ The latency that will be added to packets traversing this edge. This value is us`
`140`	`140`
`141`	`141`	`Required: False`
`142`	`142`	`Default: n/a`
`143`		`-Type: Float`
	`143`	`+Type: String`
`144`	`144`
`145`	`145`	`This keyword is allowed but currently nonfunctional; it is reserved for future use.`
`146`	`146`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ network:`
`17`	`17`	`source 0`
`18`	`18`	`target 0`
`19`	`19`	`latency "50 ms"`
`20`		`- jitter 0.0`
	`20`	`+ jitter "0 ms"`
`21`	`21`	`packet_loss 0.0`
`22`	`22`	`]`
`23`	`23`	`]`