osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

androiddump 1.0.2: Fix a lot of usage of recv() 

recv() can return negative value or 0 in "error cases".
There is need to check it. This also solved empty interfaces
list if there is unauthenticated device.

Bug: 12080
Change-Id: If6cd0e0933b64e9ac9bbb66b3b8138f7177451d1
Reviewed-on: https://code.wireshark.org/review/14316
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
This commit is contained in:
Michal Labedzki 2016-02-06 19:14:20 +01:00
parent a69d07dca0
commit 3c143d2846
2 changed files with 175 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/androiddump.pod
View File

@ -50,7 +50,8 @@ PATH should contain directory with tools like "adb" and "android".
Android SDK for various platform are available on: Android SDK for various platform are available on:
https://developer.android.com/sdk/index.html#Other https://developer.android.com/sdk/index.html#Other
2. You must have permission to Android devices. 2. You must have permission to Android devices. Some Android devices requires
on-screen authentication.
Supported interfaces: Supported interfaces:
@ -73,13 +74,12 @@ Supported interfaces:
=item 8. Bluetooth BtsnoopNet (Lollipop) =item 8. Bluetooth BtsnoopNet (Lollipop)
=item 9. WiFi tcpdump
=back =back
Please note that it will work also for FirefoxOS. Please note that it will work also for FirefoxOS.
NOTE: If one of device require ADB Authentication you need accept or reject that
request. Otherwise no devices will be available.
=head1 OPTIONS =head1 OPTIONS
=over 4 =over 4

244
extcap/androiddump.c
View File

@ -97,7 +97,7 @@
#define ANDROIDDUMP_VERSION_MAJOR "1" #define ANDROIDDUMP_VERSION_MAJOR "1"
#define ANDROIDDUMP_VERSION_MINOR "0" #define ANDROIDDUMP_VERSION_MINOR "0"
#define ANDROIDDUMP_VERSION_RELEASE "1" #define ANDROIDDUMP_VERSION_RELEASE "2"
#define SERIAL_NUMER_LENGTH_MAX 512 #define SERIAL_NUMER_LENGTH_MAX 512
@ -357,7 +357,7 @@ static socket_handle_t adb_connect(const char *server_ip, unsigned short *server
return INVALID_SOCKET; return INVALID_SOCKET;
} }
#else #else
verbose_print("Cannot connect to ADB: <%s> Please check that adb daemon is running.", strerror(errno)); verbose_print("Cannot connect to ADB: <%s> Please check that adb daemon is running.\n", strerror(errno));
closesocket(sock); closesocket(sock);
return INVALID_SOCKET; return INVALID_SOCKET;
#endif #endif
@ -379,7 +379,7 @@ static socket_handle_t adb_connect(const char *server_ip, unsigned short *server
return INVALID_SOCKET; return INVALID_SOCKET;
} }
errmsg_print("VERBOSE: Client port %u", GUINT16_FROM_BE(client.sin_port)); verbose_print("VERBOSE: Client port %u\n", GUINT16_FROM_BE(client.sin_port));
} }
return sock; return sock;
@ -407,7 +407,15 @@ static char *adb_send_and_receive(socket_handle_t sock, const char *adb_service,
used_buffer_length = 0; used_buffer_length = 0;
while (used_buffer_length < 8) { while (used_buffer_length < 8) {
used_buffer_length += recv(sock, buffer + used_buffer_length, (int)(buffer_length - used_buffer_length), 0); result = recv(sock, buffer + used_buffer_length, (int)(buffer_length - used_buffer_length), 0);
if (result <= 0) {
errmsg_print("ERROR: Broken socket connection.");
return 0;
}
used_buffer_length += result;
} }
memcpy(status, buffer, 4); memcpy(status, buffer, 4);
@ -417,7 +425,15 @@ static char *adb_send_and_receive(socket_handle_t sock, const char *adb_service,
buffer[8] = tmp_buffer; buffer[8] = tmp_buffer;
while (used_buffer_length < length + 8) { while (used_buffer_length < length + 8) {
used_buffer_length += recv(sock, buffer + used_buffer_length, (int)(buffer_length - used_buffer_length), 0); result = recv(sock, buffer + used_buffer_length, (int)(buffer_length - used_buffer_length), 0);
if (result <= 0) {
errmsg_print("ERROR: Broken socket connection.");
return 0;
}
used_buffer_length += result;
} }
if (data_length) if (data_length)
@ -453,15 +469,31 @@ static char *adb_send_and_read(socket_handle_t sock, const char *adb_service, ch
used_buffer_length = 0; used_buffer_length = 0;
while (used_buffer_length < 4) { while (used_buffer_length < 4) {
used_buffer_length += recv(sock, buffer + used_buffer_length, (int)(buffer_length - used_buffer_length), 0); result = recv(sock, buffer + used_buffer_length, (int)(buffer_length - used_buffer_length), 0);
if (result <= 0) {
errmsg_print("ERROR: Broken socket connection.");
return 0;
}
used_buffer_length += result;
} }
memcpy(status, buffer, 4); memcpy(status, buffer, 4);
while (result > 0) { while (result > 0) {
result= recv(sock, buffer + used_buffer_length, (int)(buffer_length - used_buffer_length), 0); result= recv(sock, buffer + used_buffer_length, (int)(buffer_length - used_buffer_length), 0);
if (result > 0)
used_buffer_length += result; if (result < 0) {
errmsg_print("ERROR: Broken socket connection.");
return 0;
} else if (result == 0) {
break;
}
used_buffer_length += result;
} }
if (data_length) if (data_length)
@ -494,12 +526,21 @@ static int adb_send(socket_handle_t sock, const char *adb_service) {
used_buffer_length = 0; used_buffer_length = 0;
while (used_buffer_length < 4) { while (used_buffer_length < 4) {
used_buffer_length += recv(sock, buffer + used_buffer_length, (int)(sizeof(buffer) - used_buffer_length), 0); result = recv(sock, buffer + used_buffer_length, (int)(sizeof(buffer) - used_buffer_length), 0);
if (result <= 0) {
errmsg_print("ERROR: Broken socket connection.");
return 2;
}
used_buffer_length += result;
} }
if (memcmp(buffer, "OKAY", 4)) { if (memcmp(buffer, "OKAY", 4)) {
errmsg_print("ERROR: Error while receiving by ADB for <%s>", adb_service); errmsg_print("ERROR: Error while receiving by ADB for <%s>", adb_service);
return 2;
return 3;
} }
return 0; return 0;
@ -566,6 +607,12 @@ static int register_interfaces(extcap_parameters * extcap_conf, const char *adb_
device_list = adb_send_and_receive(sock, adb_devices, packet, sizeof(packet), &device_length); device_list = adb_send_and_receive(sock, adb_devices, packet, sizeof(packet), &device_length);
closesocket(sock); closesocket(sock);
if (!device_list) {
errmsg_print("ERROR: Cannot get list of interfaces from devices");
return -2;
}
device_list[device_length] = '\0'; device_list[device_length] = '\0';
pos = (char *) device_list; pos = (char *) device_list;
@ -575,13 +622,15 @@ static int register_interfaces(extcap_parameters * extcap_conf, const char *adb_
result = (int) (pos - prev_pos); result = (int) (pos - prev_pos);
pos = strchr(pos, '\n') + 1; pos = strchr(pos, '\n') + 1;
if (result >= (int) sizeof(serial_number)) { if (result >= (int) sizeof(serial_number)) {
errmsg_print("WARNING: Serial number too long, ignore device"); verbose_print("WARNING: Serial number too long, ignore device\n");
continue; continue;
} }
memcpy(serial_number, prev_pos, result); memcpy(serial_number, prev_pos, result);
serial_number[result] = '\0'; serial_number[result] = '\0';
serial_number_length = strlen(serial_number); serial_number_length = strlen(serial_number);
verbose_print("VERBOSE: Processing device: \"%s\"\n" , serial_number);
/* Check for the presence of tcpdump in the android device. */ /* Check for the presence of tcpdump in the android device. */
sock = adb_connect(adb_server_ip, adb_server_tcp_port); sock = adb_connect(adb_server_ip, adb_server_tcp_port);
@ -590,36 +639,46 @@ static int register_interfaces(extcap_parameters * extcap_conf, const char *adb_
sprintf((char *) helpful_packet, adb_transport_serial_templace, 15 + serial_number_length, serial_number); sprintf((char *) helpful_packet, adb_transport_serial_templace, 15 + serial_number_length, serial_number);
result = adb_send(sock, helpful_packet); result = adb_send(sock, helpful_packet);
if (result) { if (result) {
errmsg_print("ERROR: Error while setting adb transport for <%s>", helpful_packet); verbose_print("WARNING: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
} else {
response = adb_send_and_read(sock, adb_tcpdump_help, helpful_packet, sizeof(helpful_packet), &data_length);
closesocket(sock); closesocket(sock);
return 1;
}
response = adb_send_and_read(sock, adb_tcpdump_help, helpful_packet, sizeof(helpful_packet), &data_length);
closesocket(sock);
response[data_length] = '\0';
/* If tcpdump is found in the android device, add Android Wifi Tcpdump as an interface */ if (response) {
if (strstr(response,"tcpdump version")) { response[data_length] = '\0';
new_interface(extcap_conf, INTERFACE_ANDROID_WIFI_TCPDUMP, serial_number, "Android WiFi");
/* If tcpdump is found in the android device, add Android Wifi Tcpdump as an interface */
if (strstr(response,"tcpdump version")) {
new_interface(extcap_conf, INTERFACE_ANDROID_WIFI_TCPDUMP, serial_number, "Android WiFi");
}
} else {
verbose_print("WARNING: Error on socket: <%s>\n", helpful_packet);
}
} }
sock = adb_connect(adb_server_ip, adb_server_tcp_port); sock = adb_connect(adb_server_ip, adb_server_tcp_port);
if (sock == INVALID_SOCKET) if (sock == INVALID_SOCKET) continue;
return -1;
sprintf((char *) helpful_packet, adb_transport_serial_templace, 15 + serial_number_length, serial_number); sprintf((char *) helpful_packet, adb_transport_serial_templace, 15 + serial_number_length, serial_number);
result = adb_send(sock, helpful_packet); result = adb_send(sock, helpful_packet);
if (result) { if (result) {
errmsg_print("ERROR: Error while setting adb transport for <%s>", helpful_packet); verbose_print("WARNING: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock); closesocket(sock);
return 1; continue;
} }
response = adb_send_and_read(sock, adb_api_level, helpful_packet, sizeof(helpful_packet), &data_length); response = adb_send_and_read(sock, adb_api_level, helpful_packet, sizeof(helpful_packet), &data_length);
closesocket(sock); closesocket(sock);
if (!response) {
verbose_print("WARNING: Error on socket: <%s>\n", helpful_packet);
continue;
}
response[data_length] = '\0'; response[data_length] = '\0';
api_level = (int) g_ascii_strtoll(response, NULL, 10); api_level = (int) g_ascii_strtoll(response, NULL, 10);
errmsg_print("VERBOSE: Android API Level for %s is %i", serial_number, api_level); verbose_print("VERBOSE: Android API Level for %s is %i\n", serial_number, api_level);
if (api_level < 21) { if (api_level < 21) {
new_interface(extcap_conf, INTERFACE_ANDROID_LOGCAT_MAIN, serial_number, "Android Logcat Main"); new_interface(extcap_conf, INTERFACE_ANDROID_LOGCAT_MAIN, serial_number, "Android Logcat Main");
@ -651,18 +710,18 @@ static int register_interfaces(extcap_parameters * extcap_conf, const char *adb_
response = adb_send_and_read(sock, adb_hcidump_version, helpful_packet, sizeof(helpful_packet), &data_length); response = adb_send_and_read(sock, adb_hcidump_version, helpful_packet, sizeof(helpful_packet), &data_length);
closesocket(sock); closesocket(sock);
if (!response || data_length < 1) { if (!response || data_length < 1) {
errmsg_print("WARNING: Error while getting hcidump version by <%s> (%p len=%"G_GSSIZE_FORMAT")", verbose_print("WARNING: Error while getting hcidump version by <%s> (%p len=%"G_GSSIZE_FORMAT")\n",
adb_hcidump_version, (void*)response, data_length); adb_hcidump_version, (void*)response, data_length);
errmsg_print("VERBOSE: Android hcidump version for %s is unknown", serial_number); verbose_print("VERBOSE: Android hcidump version for %s is unknown\n", serial_number);
disable_interface = 1; disable_interface = 1;
} else { } else {
response[data_length] = '\0'; response[data_length] = '\0';
if (g_ascii_strtoull(response, NULL, 10) == 0) { if (g_ascii_strtoull(response, NULL, 10) == 0) {
errmsg_print("VERBOSE: Android hcidump version for %s is unknown", serial_number); verbose_print("VERBOSE: Android hcidump version for %s is unknown\n", serial_number);
disable_interface = 1; disable_interface = 1;
} else { } else {
errmsg_print("VERBOSE: Android hcidump version for %s is %s", serial_number, response); verbose_print("VERBOSE: Android hcidump version for %s is %s\n", serial_number, response);
} }
} }
@ -687,9 +746,9 @@ static int register_interfaces(extcap_parameters * extcap_conf, const char *adb_
response = adb_send_and_read(sock, adb_ps_droid_bluetooth, helpful_packet, sizeof(helpful_packet), &data_length); response = adb_send_and_read(sock, adb_ps_droid_bluetooth, helpful_packet, sizeof(helpful_packet), &data_length);
closesocket(sock); closesocket(sock);
if (!response || data_length < 1) { if (!response || data_length < 1) {
errmsg_print("WARNING: Error while getting Bluetooth application process id by <%s> " verbose_print("WARNING: Error while getting Bluetooth application process id by <%s> "
"(%p len=%"G_GSSIZE_FORMAT")", adb_hcidump_version, (void*)response, data_length); "(%p len=%"G_GSSIZE_FORMAT")\n", adb_hcidump_version, (void*)response, data_length);
errmsg_print( "VERBOSE: Android Bluetooth application PID for %s is unknown", serial_number); verbose_print( "VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
disable_interface = 1; disable_interface = 1;
} else { } else {
char *data_str; char *data_str;
@ -700,7 +759,7 @@ static int register_interfaces(extcap_parameters * extcap_conf, const char *adb_
data_str = strchr(response, '\n'); data_str = strchr(response, '\n');
if (data_str && sscanf(data_str, "%*s %s", pid) == 1) { if (data_str && sscanf(data_str, "%*s %s", pid) == 1) {
errmsg_print("VERBOSE: Android Bluetooth application PID for %s is %s", serial_number, pid); verbose_print("VERBOSE: Android Bluetooth application PID for %s is %s\n", serial_number, pid);
sock = adb_connect(adb_server_ip, adb_server_tcp_port); sock = adb_connect(adb_server_ip, adb_server_tcp_port);
if (sock == INVALID_SOCKET) if (sock == INVALID_SOCKET)
@ -716,19 +775,24 @@ static int register_interfaces(extcap_parameters * extcap_conf, const char *adb_
sprintf((char *) helpful_packet, adb_check_port_templace, strlen(adb_check_port_templace) - 6 + strlen(pid), pid); sprintf((char *) helpful_packet, adb_check_port_templace, strlen(adb_check_port_templace) - 6 + strlen(pid), pid);
response = adb_send_and_read(sock, helpful_packet, helpful_packet, sizeof(helpful_packet), &data_length); response = adb_send_and_read(sock, helpful_packet, helpful_packet, sizeof(helpful_packet), &data_length);
response[data_length] = '\0';
closesocket(sock); closesocket(sock);
data_str = strchr(response, '\n'); if (!response) {
if (data_str && sscanf(data_str, "%*s %s", pid) == 1 && strcmp(pid + 9, "10EA") == 0) {
errmsg_print("VERBOSE: Bluedroid External Parser Port for %s is %s", serial_number, pid + 9);
} else {
disable_interface = 1; disable_interface = 1;
errmsg_print("VERBOSE: Bluedroid External Parser Port for %s is unknown", serial_number); } else {
response[data_length] = '\0';
data_str = strchr(response, '\n');
if (data_str && sscanf(data_str, "%*s %s", pid) == 1 && strcmp(pid + 9, "10EA") == 0) {
verbose_print("VERBOSE: Bluedroid External Parser Port for %s is %s\n", serial_number, pid + 9);
} else {
disable_interface = 1;
verbose_print("VERBOSE: Bluedroid External Parser Port for %s is unknown\n", serial_number);
}
} }
} else { } else {
disable_interface = 1; disable_interface = 1;
errmsg_print("VERBOSE: Android Bluetooth application PID for %s is unknown", serial_number); verbose_print("VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
} }
} }
@ -756,9 +820,9 @@ static int register_interfaces(extcap_parameters * extcap_conf, const char *adb_
response = adb_send_and_read(sock, adb_ps_droid_bluetooth, helpful_packet, sizeof(helpful_packet), &data_length); response = adb_send_and_read(sock, adb_ps_droid_bluetooth, helpful_packet, sizeof(helpful_packet), &data_length);
closesocket(sock); closesocket(sock);
if (!response || data_length < 1) { if (!response || data_length < 1) {
errmsg_print("WARNING: Error while getting Bluetooth application process id by <%s> " verbose_print("WARNING: Error while getting Bluetooth application process id by <%s> "
"(%p len=%"G_GSSIZE_FORMAT")", adb_hcidump_version, (void*)response, data_length); "(%p len=%"G_GSSIZE_FORMAT")\n", adb_hcidump_version, (void*)response, data_length);
errmsg_print("VERBOSE: Android Bluetooth application PID for %s is unknown", serial_number); verbose_print("VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
disable_interface = 1; disable_interface = 1;
} else { } else {
char *data_str; char *data_str;
@ -769,7 +833,7 @@ static int register_interfaces(extcap_parameters * extcap_conf, const char *adb_
data_str = strchr(response, '\n'); data_str = strchr(response, '\n');
if (data_str && sscanf(data_str, "%*s %s", pid) == 1) { if (data_str && sscanf(data_str, "%*s %s", pid) == 1) {
errmsg_print("VERBOSE: Android Bluetooth application PID for %s is %s", serial_number, pid); verbose_print("VERBOSE: Android Bluetooth application PID for %s is %s\n", serial_number, pid);
sock = adb_connect(adb_server_ip, adb_server_tcp_port); sock = adb_connect(adb_server_ip, adb_server_tcp_port);
if (sock == INVALID_SOCKET) if (sock == INVALID_SOCKET)
@ -785,19 +849,24 @@ static int register_interfaces(extcap_parameters * extcap_conf, const char *adb_
sprintf((char *) helpful_packet, adb_check_port_templace, strlen(adb_check_port_templace) - 6 + strlen(pid), pid); sprintf((char *) helpful_packet, adb_check_port_templace, strlen(adb_check_port_templace) - 6 + strlen(pid), pid);
response = adb_send_and_read(sock, helpful_packet, helpful_packet, sizeof(helpful_packet), &data_length); response = adb_send_and_read(sock, helpful_packet, helpful_packet, sizeof(helpful_packet), &data_length);
response[data_length] = '\0';
closesocket(sock); closesocket(sock);
data_str = strchr(response, '\n'); if (!response) {
if (data_str && sscanf(data_str, "%*s %s", pid) == 1 && strcmp(pid + 9, "22A8") == 0) {
errmsg_print("VERBOSE: Btsnoop Net Port for %s is %s", serial_number, pid + 9);
} else {
disable_interface = 1; disable_interface = 1;
errmsg_print("VERBOSE: Btsnoop Net Port for %s is unknown", serial_number); } else {
response[data_length] = '\0';
data_str = strchr(response, '\n');
if (data_str && sscanf(data_str, "%*s %s", pid) == 1 && strcmp(pid + 9, "22A8") == 0) {
verbose_print("VERBOSE: Btsnoop Net Port for %s is %s\n", serial_number, pid + 9);
} else {
disable_interface = 1;
verbose_print("VERBOSE: Btsnoop Net Port for %s is unknown\n", serial_number);
}
} }
} else { } else {
disable_interface = 1; disable_interface = 1;
errmsg_print("VERBOSE: Android Bluetooth application PID for %s is unknown", serial_number); verbose_print("VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
} }
} }
@ -960,6 +1029,12 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
return 100; return 100;
} }
if (length <= 0) {
errmsg_print("ERROR: Broken socket connection.");
closesocket(sock);
return 101;
}
used_buffer_length += length; used_buffer_length += length;
i_position = (char *) memchr(data, '\n', used_buffer_length); i_position = (char *) memchr(data, '\n', used_buffer_length);
if (i_position && i_position < data + used_buffer_length) { if (i_position && i_position < data + used_buffer_length) {
@ -975,7 +1050,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
if (i_position) { if (i_position) {
i_position += 1; i_position += 1;
if (!strncmp(state_line_position, "Can't access device: Permission denied", 38)) { if (!strncmp(state_line_position, "Can't access device: Permission denied", 38)) {
errmsg_print("WARNING: No permission for command <%s>", adb_shell_hcidump); verbose_print("WARNING: No permission for command <%s>\n", adb_shell_hcidump);
used_buffer_length = 0; used_buffer_length = 0;
try_next += 1; try_next += 1;
break; break;
@ -1020,6 +1095,12 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
return 100; return 100;
} }
if (length <= 0) {
errmsg_print("ERROR: Broken socket connection.");
closesocket(sock);
return 101;
}
used_buffer_length += length; used_buffer_length += length;
i_position = (char *) memchr(data, '\n', used_buffer_length); i_position = (char *) memchr(data, '\n', used_buffer_length);
if (i_position && i_position < data + used_buffer_length) { if (i_position && i_position < data + used_buffer_length) {
@ -1050,6 +1131,12 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
return 100; return 100;
} }
if (length <= 0) {
errmsg_print("ERROR: Broken socket connection.");
closesocket(sock);
return 101;
}
while (endless_loop) { while (endless_loop) {
if (used_buffer_length + length >= 1) { if (used_buffer_length + length >= 1) {
hex_data = data + 29; hex_data = data + 29;
@ -1140,7 +1227,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
&date.tm_year, &date.tm_mon, &date.tm_mday, &date.tm_hour, &date.tm_year, &date.tm_mon, &date.tm_mday, &date.tm_hour,
&date.tm_min, &date.tm_sec, &ms, &direction_character)) { &date.tm_min, &date.tm_sec, &ms, &direction_character)) {
errmsg_print("time %04d-%02d-%02d %02d:%02d:%02d.%06d %c", verbose_print("time %04d-%02d-%02d %02d:%02d:%02d.%06d %c\n",
date.tm_year, date.tm_mon, date.tm_mday, date.tm_hour, date.tm_year, date.tm_mon, date.tm_mday, date.tm_hour,
date.tm_min, date.tm_sec, ms, direction_character); date.tm_min, date.tm_sec, ms, direction_character);
date.tm_mon -= 1; date.tm_mon -= 1;
@ -1295,7 +1382,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
return 4; return 4;
} }
verbose_print("VERBOSE: Client port %u", GUINT16_FROM_BE(client.sin_port)); verbose_print("VERBOSE: Client port %u\n", GUINT16_FROM_BE(client.sin_port));
} }
} else { } else {
int result; int result;
@ -1347,7 +1434,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
closesocket(sock); closesocket(sock);
if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == INVALID_SOCKET) { if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == INVALID_SOCKET) {
errmsg_print("ERROR1: %s", strerror(errno)); errmsg_print("ERROR: %s", strerror(errno));
return 1; return 1;
} }
@ -1529,6 +1616,13 @@ static int capture_android_bluetooth_btsnoop_net(char *interface, char *fifo,
/* Read "btsnoop" header - 16 bytes */ /* Read "btsnoop" header - 16 bytes */
while (used_buffer_length < 16) { while (used_buffer_length < 16) {
length = recv(sock, packet + used_buffer_length, (int)(PACKET_LENGTH - used_buffer_length), 0); length = recv(sock, packet + used_buffer_length, (int)(PACKET_LENGTH - used_buffer_length), 0);
if (length <= 0) {
errmsg_print("ERROR: Broken socket connection.");
closesocket(sock);
return 101;
}
used_buffer_length += length; used_buffer_length += length;
} }
if (used_buffer_length > 16) if (used_buffer_length > 16)
@ -1972,10 +2066,6 @@ static int capture_android_logcat(char *interface, char *fifo,
return 0; return 0;
} }
/*============================================================================*/
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
/* Android Wifi Tcpdump */ /* Android Wifi Tcpdump */
/* The Tcpdump sends data in pcap format. So for using the extcap_dumper we */ /* The Tcpdump sends data in pcap format. So for using the extcap_dumper we */
@ -2026,20 +2116,14 @@ static int capture_android_wifi_tcpdump(char *interface, char *fifo,
15 + strlen(serial_number), serial_number); 15 + strlen(serial_number), serial_number);
result = adb_send(sock, helpful_packet); result = adb_send(sock, helpful_packet);
if (result) { if (result) {
printf("ERROR: Error while setting adb transport"); errmsg_print("ERROR: Error while setting adb transport");
fflush(stdout);
errmsg_print("ERROR: Error while setting adb transport for <%s>",
helpful_packet);
closesocket(sock); closesocket(sock);
return 1; return 1;
} }
} }
result = adb_send(sock, adb_shell_tcpdump); result = adb_send(sock, adb_shell_tcpdump);
if (result) { if (result) {
printf("ERROR: Error while setting adb transport"); errmsg_print("ERROR: Error while setting adb transport");
fflush(stdout);
errmsg_print("ERROR: Error while starting capture by sending command: %s",
adb_shell_tcpdump);
closesocket(sock); closesocket(sock);
return 1; return 1;
} }
@ -2052,9 +2136,16 @@ static int capture_android_wifi_tcpdump(char *interface, char *fifo,
if (errno == EAGAIN || (EWOULDBLOCK != EAGAIN && errno == EWOULDBLOCK)) if (errno == EAGAIN || (EWOULDBLOCK != EAGAIN && errno == EWOULDBLOCK))
continue; continue;
else if (errno != 0) { else if (errno != 0) {
verbose_print("ERROR capture: %s", strerror(errno)); errmsg_print("ERROR capture: %s", strerror(errno));
return 100; return 100;
} }
if (length <= 0) {
errmsg_print("ERROR: Broken socket connection.");
closesocket(sock);
return 101;
}
used_buffer_length += length; used_buffer_length += length;
/* /*
@ -2167,7 +2258,14 @@ static int capture_android_wifi_tcpdump(char *interface, char *fifo,
errmsg_print("ERROR capture: %s", strerror(errno)); errmsg_print("ERROR capture: %s", strerror(errno));
return 100; return 100;
} }
if (length > 0 && (used_buffer_length += length)>1) {
if (length <= 0) {
errmsg_print("ERROR: Broken socket connection.");
closesocket(sock);
return 101;
}
if (used_buffer_length += length > 1) {
break; break;
} }
} }
@ -2212,10 +2310,7 @@ int main(int argc, char **argv) {
} }
extcap_conf = g_new0(extcap_parameters, 1); extcap_conf = g_new0(extcap_parameters, 1);
extcap_base_set_util_info(extcap_conf,ANDROIDDUMP_VERSION_MAJOR, ANDROIDDUMP_VERSION_MINOR, ANDROIDDUMP_VERSION_RELEASE, NULL); extcap_base_set_util_info(extcap_conf, ANDROIDDUMP_VERSION_MAJOR, ANDROIDDUMP_VERSION_MINOR, ANDROIDDUMP_VERSION_RELEASE, NULL);
/* For extcap, no other ports can be configured anyway */
register_interfaces(extcap_conf, default_adb_server_ip, &default_adb_server_tcp_port);
while ((result = getopt_long(argc, argv, "", longopts, &option_idx)) != -1) { while ((result = getopt_long(argc, argv, "", longopts, &option_idx)) != -1) {
switch (result) { switch (result) {
@ -2288,6 +2383,9 @@ int main(int argc, char **argv) {
} }
} }
/* For extcap, no other ports can be configured anyway */
register_interfaces(extcap_conf, default_adb_server_ip, &default_adb_server_tcp_port);
if (!adb_server_ip) if (!adb_server_ip)
adb_server_ip = default_adb_server_ip; adb_server_ip = default_adb_server_ip;