Skip to content

Commit ffe2f4c

Browse files
GIC-deGIC-de
committed
fix regression tests
1 parent 7ec2ca4 commit ffe2f4c

2 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎code/bngblaster/src/bbl_session.c‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,15 +1276,6 @@ bbl_session_json(bbl_session_s *session)
12761276
session_traffic = json_pack("{si si}",
12771277
"total-flows", session->session_traffic.flows,
12781278
"verified-flows", session->session_traffic.flows_verified);
1279-
if(session->session_traffic.ipv4_down) {
1280-
stream = session->session_traffic.ipv4_down;
1281-
json_object_set_new(session_traffic, "downstream-ipv4-flow-id", json_integer(stream->flow_id));
1282-
json_object_set_new(session_traffic, "downstream-ipv4-tx-packets", json_integer(stream->tx_packets - stream->reset_packets_tx));
1283-
json_object_set_new(session_traffic, "downstream-ipv4-rx-packets", json_integer(stream->rx_packets - stream->reset_packets_rx));
1284-
json_object_set_new(session_traffic, "downstream-ipv4-rx-first-seq", json_integer(stream->rx_first_seq));
1285-
json_object_set_new(session_traffic, "downstream-ipv4-loss", json_integer(stream->rx_loss - stream->reset_loss));
1286-
json_object_set_new(session_traffic, "downstream-ipv4-wrong-session", json_integer(stream->rx_wrong_session));
1287-
}
12881279
if(session->session_traffic.ipv4_up) {
12891280
stream = session->session_traffic.ipv4_up;
12901281
json_object_set_new(session_traffic, "upstream-ipv4-flow-id", json_integer(stream->flow_id));
@@ -1294,14 +1285,14 @@ bbl_session_json(bbl_session_s *session)
12941285
json_object_set_new(session_traffic, "upstream-ipv4-loss", json_integer(stream->rx_loss - stream->reset_loss));
12951286
json_object_set_new(session_traffic, "upstream-ipv4-wrong-session", json_integer(stream->rx_wrong_session));
12961287
}
1297-
if(session->session_traffic.ipv6_down) {
1298-
stream = session->session_traffic.ipv6_down;
1299-
json_object_set_new(session_traffic, "downstream-ipv6-flow-id", json_integer(stream->flow_id));
1300-
json_object_set_new(session_traffic, "downstream-ipv6-tx-packets", json_integer(stream->tx_packets - stream->reset_packets_tx));
1301-
json_object_set_new(session_traffic, "downstream-ipv6-rx-packets", json_integer(stream->rx_packets - stream->reset_packets_rx));
1302-
json_object_set_new(session_traffic, "downstream-ipv6-rx-first-seq", json_integer(stream->rx_first_seq));
1303-
json_object_set_new(session_traffic, "downstream-ipv6-loss", json_integer(stream->rx_loss - stream->reset_loss));
1304-
json_object_set_new(session_traffic, "downstream-ipv6-wrong-session", json_integer(stream->rx_wrong_session));
1288+
if(session->session_traffic.ipv4_down) {
1289+
stream = session->session_traffic.ipv4_down;
1290+
json_object_set_new(session_traffic, "downstream-ipv4-flow-id", json_integer(stream->flow_id));
1291+
json_object_set_new(session_traffic, "downstream-ipv4-tx-packets", json_integer(stream->tx_packets - stream->reset_packets_tx));
1292+
json_object_set_new(session_traffic, "downstream-ipv4-rx-packets", json_integer(stream->rx_packets - stream->reset_packets_rx));
1293+
json_object_set_new(session_traffic, "downstream-ipv4-rx-first-seq", json_integer(stream->rx_first_seq));
1294+
json_object_set_new(session_traffic, "downstream-ipv4-loss", json_integer(stream->rx_loss - stream->reset_loss));
1295+
json_object_set_new(session_traffic, "downstream-ipv4-wrong-session", json_integer(stream->rx_wrong_session));
13051296
}
13061297
if(session->session_traffic.ipv6_up) {
13071298
stream = session->session_traffic.ipv6_up;
@@ -1312,14 +1303,14 @@ bbl_session_json(bbl_session_s *session)
13121303
json_object_set_new(session_traffic, "upstream-ipv6-loss", json_integer(stream->rx_loss - stream->reset_loss));
13131304
json_object_set_new(session_traffic, "upstream-ipv6-wrong-session", json_integer(stream->rx_wrong_session));
13141305
}
1315-
if(session->session_traffic.ipv6pd_down) {
1316-
stream = session->session_traffic.ipv6pd_down;
1317-
json_object_set_new(session_traffic, "downstream-ipv6pd-flow-id", json_integer(stream->flow_id));
1318-
json_object_set_new(session_traffic, "downstream-ipv6pd-tx-packets", json_integer(stream->tx_packets - stream->reset_packets_tx));
1319-
json_object_set_new(session_traffic, "downstream-ipv6pd-rx-packets", json_integer(stream->rx_packets - stream->reset_packets_rx));
1320-
json_object_set_new(session_traffic, "downstream-ipv6pd-rx-first-seq", json_integer(stream->rx_first_seq));
1321-
json_object_set_new(session_traffic, "downstream-ipv6pd-loss", json_integer(stream->rx_loss - stream->reset_loss));
1322-
json_object_set_new(session_traffic, "downstream-ipv6pd-wrong-session", json_integer(stream->rx_wrong_session));
1306+
if(session->session_traffic.ipv6_down) {
1307+
stream = session->session_traffic.ipv6_down;
1308+
json_object_set_new(session_traffic, "downstream-ipv6-flow-id", json_integer(stream->flow_id));
1309+
json_object_set_new(session_traffic, "downstream-ipv6-tx-packets", json_integer(stream->tx_packets - stream->reset_packets_tx));
1310+
json_object_set_new(session_traffic, "downstream-ipv6-rx-packets", json_integer(stream->rx_packets - stream->reset_packets_rx));
1311+
json_object_set_new(session_traffic, "downstream-ipv6-rx-first-seq", json_integer(stream->rx_first_seq));
1312+
json_object_set_new(session_traffic, "downstream-ipv6-loss", json_integer(stream->rx_loss - stream->reset_loss));
1313+
json_object_set_new(session_traffic, "downstream-ipv6-wrong-session", json_integer(stream->rx_wrong_session));
13231314
}
13241315
if(session->session_traffic.ipv6pd_up) {
13251316
stream = session->session_traffic.ipv6pd_up;
@@ -1330,6 +1321,15 @@ bbl_session_json(bbl_session_s *session)
13301321
json_object_set_new(session_traffic, "upstream-ipv6pd-loss", json_integer(stream->rx_loss - stream->reset_loss));
13311322
json_object_set_new(session_traffic, "upstream-ipv6pd-wrong-session", json_integer(stream->rx_wrong_session));
13321323
}
1324+
if(session->session_traffic.ipv6pd_down) {
1325+
stream = session->session_traffic.ipv6pd_down;
1326+
json_object_set_new(session_traffic, "downstream-ipv6pd-flow-id", json_integer(stream->flow_id));
1327+
json_object_set_new(session_traffic, "downstream-ipv6pd-tx-packets", json_integer(stream->tx_packets - stream->reset_packets_tx));
1328+
json_object_set_new(session_traffic, "downstream-ipv6pd-rx-packets", json_integer(stream->rx_packets - stream->reset_packets_rx));
1329+
json_object_set_new(session_traffic, "downstream-ipv6pd-rx-first-seq", json_integer(stream->rx_first_seq));
1330+
json_object_set_new(session_traffic, "downstream-ipv6pd-loss", json_integer(stream->rx_loss - stream->reset_loss));
1331+
json_object_set_new(session_traffic, "downstream-ipv6pd-wrong-session", json_integer(stream->rx_wrong_session));
1332+
}
13331333
}
13341334
if(session->a10nsp_session) {
13351335
a10nsp_session = json_pack("{ss si sb sb ss* ss* ss* ss* ss* ss* sI sI}",

‎code/bngblaster/src/bbl_stream.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1983,37 +1983,37 @@ bbl_stream_session_init(bbl_session_s *session)
19831983
if(!bbl_stream_session_add(g_ctx->config.stream_config_session_ipv4_up, session)) {
19841984
return false;
19851985
}
1986-
session->session_traffic.ipv4_up = session->streams.head;
1986+
session->session_traffic.ipv4_up = session->streams.tail;
19871987
}
19881988
if(g_ctx->config.stream_config_session_ipv4_down && session->endpoint.ipv4) {
19891989
if(!bbl_stream_session_add(g_ctx->config.stream_config_session_ipv4_down, session)) {
19901990
return false;
19911991
}
1992-
session->session_traffic.ipv4_down = session->streams.head;
1992+
session->session_traffic.ipv4_down = session->streams.tail;
19931993
}
19941994
if(g_ctx->config.stream_config_session_ipv6_up && session->endpoint.ipv6) {
19951995
if(!bbl_stream_session_add(g_ctx->config.stream_config_session_ipv6_up, session)) {
19961996
return false;
19971997
}
1998-
session->session_traffic.ipv6_up = session->streams.head;
1998+
session->session_traffic.ipv6_up = session->streams.tail;
19991999
}
20002000
if(g_ctx->config.stream_config_session_ipv6_down && session->endpoint.ipv6) {
20012001
if(!bbl_stream_session_add(g_ctx->config.stream_config_session_ipv6_down, session)) {
20022002
return false;
20032003
}
2004-
session->session_traffic.ipv6_down = session->streams.head;
2004+
session->session_traffic.ipv6_down = session->streams.tail;
20052005
}
20062006
if(g_ctx->config.stream_config_session_ipv6pd_up && session->endpoint.ipv6pd) {
20072007
if(!bbl_stream_session_add(g_ctx->config.stream_config_session_ipv6pd_up, session)) {
20082008
return false;
20092009
}
2010-
session->session_traffic.ipv6pd_up = session->streams.head;
2010+
session->session_traffic.ipv6pd_up = session->streams.tail;
20112011
}
20122012
if(g_ctx->config.stream_config_session_ipv6pd_down && session->endpoint.ipv6pd) {
20132013
if(!bbl_stream_session_add(g_ctx->config.stream_config_session_ipv6pd_down, session)) {
20142014
return false;
20152015
}
2016-
session->session_traffic.ipv6pd_down = session->streams.head;
2016+
session->session_traffic.ipv6pd_down = session->streams.tail;
20172017
}
20182018

20192019
/** Add streams of corresponding stream-group-id */

0 commit comments

Comments
 (0)