diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-11-08 14:02:08 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-11-09 16:08:25 +0000 |
| commit | 39967011836c1e23dff188ffaadb747d9dcda062 (patch) | |
| tree | 768e37aa23b5ad8775a47543ce26f1fdb3f3269d /extcap/androiddump.c | |
| parent | 2ebc41050e43c508edbc8c0fa8cccb9797c463cf (diff) | |
Replace inet_addr() with our inet_pton() wrapper
Error checking omitted like in original code.
Change-Id: If8b4181d30ddf5717951aaf7ec61db25c0bc5322
Reviewed-on: https://code.wireshark.org/review/24309
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'extcap/androiddump.c')
| -rw-r--r-- | extcap/androiddump.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c index 9635dd5e5d..9fa0e4ce00 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -33,6 +33,7 @@ #include <wsutil/strtoi.h> #include <wsutil/filesystem.h> #include <wsutil/cmdarg_err.h> +#include <wsutil/inet_addr.h> #include "ui/failure_message.h" @@ -539,7 +540,7 @@ static socket_handle_t adb_connect(const char *server_ip, unsigned short *server server.sin_family = AF_INET; server.sin_port = GINT16_TO_BE(*server_tcp_port); - server.sin_addr.s_addr = inet_addr(server_ip); + ws_inet_pton4(server_ip, &(server.sin_addr.s_addr)); if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == INVALID_SOCKET) { g_warning("Cannot open system TCP socket: %s", strerror(errno)); @@ -1680,7 +1681,7 @@ static int capture_android_bluetooth_external_parser(char *interface, memset(&server, 0 , sizeof(server)); server.sin_family = AF_INET; server.sin_port = GINT16_TO_BE(*bt_local_tcp_port); - server.sin_addr.s_addr = inet_addr(bt_local_ip); + ws_inet_pton4(bt_local_ip, &(server.sin_addr.s_addr)); useSndTimeout(sock); @@ -1755,7 +1756,7 @@ static int capture_android_bluetooth_external_parser(char *interface, server.sin_family = AF_INET; server.sin_port = GINT16_TO_BE(*bt_local_tcp_port); - server.sin_addr.s_addr = inet_addr(bt_local_ip); + ws_inet_pton4(bt_local_ip, &(server.sin_addr.s_addr)); useSndTimeout(sock); |