osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

nettrace: Handle failure to parse IPv6. 

Reading of Address needs refacoring.

Change-Id: Icca094a50bda4314bda72005bfc0d722e3d185d2
Reviewed-on: https://code.wireshark.org/review/30672
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Anders Broman 2018-11-16 15:59:07 +01:00 committed by Anders Broman
parent 1fcdd66dda
commit 377f5d0de7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wiretap/nettrace_3gpp_32_423.c
View File

@ -1046,7 +1046,8 @@ create_temp_pcapng_file(wtap *wth, int *err, gchar **err_info, nettrace_3gpp_32_
}
}
}
/* g_warning("scan_found:%u, %u.%u.%u.%u Port %u transport %s", scan_found, d1, d2, d3, d4, port, transp_str); */
/* Failed to parse address */
curr_pos = next_pos;
}
} else {
/* address not found*/
@ -1073,9 +1074,10 @@ create_temp_pcapng_file(wtap *wth, int *err, gchar **err_info, nettrace_3gpp_32_
char transp_str[5];
curr_pos = curr_pos + 7;
/* Excample from one trace, unsure if it's generic...
/* Excample from traces, unsure if it's generic...
* {address == 192.168.73.1, port == 5062, transport == Udp}
* {address == [2001:1b70:8294:210a::78], port == 34189, transport == Tcp}
* {address == 2001:1B70:8294:210A::90, port == 7777, transport == TCP}
*/
scan_found = sscanf(curr_pos, "%*s %3u.%3u.%3u.%3u, %*s %*s %5u, %*s %*s %4s",
&d1, &d2, &d3, &d4, &port, transp_str);
@ -1122,7 +1124,8 @@ create_temp_pcapng_file(wtap *wth, int *err, gchar **err_info, nettrace_3gpp_32_
}
}
}
/* g_warning("scan_found:%u, %u.%u.%u.%u Port %u transport %s", scan_found, d1, d2, d3, d4, port, transp_str); */
/* Failed to parse address */
curr_pos = next_pos;
}
}
else {