diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2018-11-16 15:59:07 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-11-16 15:40:23 +0000 |
| commit | 377f5d0de76628371b7ef436783c6720de36b588 (patch) | |
| tree | 7c587f0f5a42b0bd8823a699cd70d4b9b93e655d /wiretap/nettrace_3gpp_32_423.c | |
| parent | 1fcdd66ddad04ba45c4703e2afd4fe0a7a87de31 (diff) | |
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>
Diffstat (limited to 'wiretap/nettrace_3gpp_32_423.c')
| -rw-r--r-- | wiretap/nettrace_3gpp_32_423.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c index 0aa056a14f..e158f2607f 100644 --- a/wiretap/nettrace_3gpp_32_423.c +++ b/wiretap/nettrace_3gpp_32_423.c @@ -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 { |