aboutsummaryrefslogtreecommitdiffstats
path: root/extcap
diff options
context:
space:
mode:
authorMichal Labedzki <michal.labedzki@tieto.com>2015-08-05 17:30:47 +0200
committerAnders Broman <a.broman58@gmail.com>2015-08-07 08:50:55 +0000
commit4557c17f7aad5e26fb840ea90e51de9dabf94e68 (patch)
treeffe95c69c08f72e566955f092c96a2f8da05582a /extcap
parentdc33bba8a1990ac90c2513d5870050bedb34af56 (diff)
androiddump: Try to make MVS14.0 happy
I guess using glib's gssize instead of ssize_t should be enough for: extcap/androiddump.c(736): error C2220: warning treated as error - no 'object' f ile generated extcap/androiddump.c(736): warning C4477: 'fprintf' : format string '%I64i' requ ires an argument of type '__int64', but variadic argument 3 has type 'ssize_t' extcap/androiddump.c(736): note: to simplify migration, consider the temporary use of /Wv:18 flag with the version of the compiler with which you used to build without warnings extcap/androiddump.c(736): note: consider using '%i' in the format string extcap/androiddump.c(736): note: consider using '%I32i' in the format string Change-Id: I1030694aed61d413be1aad54531f99db45e99c9d Reviewed-on: https://code.wireshark.org/review/9876 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'extcap')
-rw-r--r--extcap/androiddump.c374
1 files changed, 188 insertions, 186 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index 0d885b85d9..6861b6d499 100644
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -24,6 +24,7 @@
#include "config.h"
#include <glib.h>
+#include <glib/gprintf.h>
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
@@ -248,7 +249,7 @@ static struct extcap_dumper extcap_dumper_open(char *fifo, int encap) {
encap_ext = DLT_WIRESHARK_UPPER_PDU;
else {
if (verbose)
- fprintf(stderr, "ERROR: Unknown encapsulation\n");
+ g_fprintf(stderr, "ERROR: Unknown encapsulation\n");
exit(1);
}
@@ -256,7 +257,7 @@ static struct extcap_dumper extcap_dumper_open(char *fifo, int encap) {
extcap_dumper.dumper.pcap = pcap_dump_open(pcap, fifo);
if (!extcap_dumper.dumper.pcap) {
if (verbose)
- fprintf(stderr, "ERROR: Cannot save dump file\n");
+ g_fprintf(stderr, "ERROR: Cannot save dump file\n");
exit(1);
}
extcap_dumper.encap = encap;
@@ -270,14 +271,14 @@ static struct extcap_dumper extcap_dumper_open(char *fifo, int encap) {
encap_ext = WTAP_ENCAP_WIRESHARK_UPPER_PDU;
else {
if (verbose)
- fprintf(stderr, "ERROR: Unknown encapsulation\n");
+ g_fprintf(stderr, "ERROR: Unknown encapsulation\n");
exit(1);
}
extcap_dumper.dumper.wtap = wtap_dump_open(fifo, WTAP_FILE_TYPE_SUBTYPE_PCAP_NSEC, encap_ext, PACKET_LENGTH, FALSE, &err);
if (!extcap_dumper.dumper.wtap) {
if (verbose)
- fprintf(stderr, "ERROR: Cannot save dump file\n");
+ g_fprintf(stderr, "ERROR: Cannot save dump file\n");
exit(1);
}
extcap_dumper.encap = encap;
@@ -288,7 +289,7 @@ static struct extcap_dumper extcap_dumper_open(char *fifo, int encap) {
}
static void extcap_dumper_dump(struct extcap_dumper extcap_dumper, char *buffer,
- ssize_t captured_length, ssize_t reported_length,
+ gssize captured_length, gssize reported_length,
time_t seconds, long nanoseconds) {
#ifdef ANDROIDDUMP_USE_LIBPCAP
struct pcap_pkthdr pcap_header;
@@ -352,7 +353,7 @@ static socket_handle_t adb_connect(const char *server_ip, unsigned short *server
if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == INVALID_SOCKET) {
if (verbose)
- fprintf(stderr, "ERROR: Cannot open system TCP socket: %s\n", strerror(errno));
+ g_fprintf(stderr, "ERROR: Cannot open system TCP socket: %s\n", strerror(errno));
return INVALID_SOCKET;
}
@@ -371,20 +372,20 @@ static socket_handle_t adb_connect(const char *server_ip, unsigned short *server
if (execlp("adb", "adb", "start-server", NULL)) {
#endif
if (verbose)
- fprintf(stderr, "WARNING: Cannot execute system command to start adb: %s\n", strerror(errno));
+ g_fprintf(stderr, "WARNING: Cannot execute system command to start adb: %s\n", strerror(errno));
closesocket(sock);
return INVALID_SOCKET;
};
if (connect(sock, (struct sockaddr *) &server, sizeof(server)) == SOCKET_ERROR) {
if (verbose)
- fprintf(stderr, "ERROR: Cannot connect to ADB: <%s> Please check that adb daemon is running.\n", strerror(errno));
+ g_fprintf(stderr, "ERROR: Cannot connect to ADB: <%s> Please check that adb daemon is running.\n", strerror(errno));
closesocket(sock);
return INVALID_SOCKET;
}
#else
if (verbose) {
- fprintf(stderr, "ERROR: Cannot connect to ADB: <%s> Please check that adb daemon is running.\n", strerror(errno));
+ g_fprintf(stderr, "ERROR: Cannot connect to ADB: <%s> Please check that adb daemon is running.\n", strerror(errno));
}
closesocket(sock);
return INVALID_SOCKET;
@@ -396,18 +397,18 @@ static socket_handle_t adb_connect(const char *server_ip, unsigned short *server
length = sizeof(client);
if (getsockname(sock, (struct sockaddr *) &client, &length)) {
- fprintf(stderr, "ERROR getsockname: %s\n", strerror(errno));
+ g_fprintf(stderr, "ERROR getsockname: %s\n", strerror(errno));
closesocket(sock);
return INVALID_SOCKET;
}
if (length != sizeof(client)) {
- fprintf(stderr, "ERROR: incorrect length\n");
+ g_fprintf(stderr, "ERROR: incorrect length\n");
closesocket(sock);
return INVALID_SOCKET;
}
- fprintf(stderr, "VERBOSE: Client port %u\n", GUINT16_FROM_BE(client.sin_port));
+ g_fprintf(stderr, "VERBOSE: Client port %u\n", GUINT16_FROM_BE(client.sin_port));
}
return sock;
@@ -415,16 +416,17 @@ static socket_handle_t adb_connect(const char *server_ip, unsigned short *server
static char *adb_send_and_receive(socket_handle_t sock, const char *adb_service,
- char *buffer, int buffer_length, ssize_t *data_length) {
- ssize_t used_buffer_length;
- ssize_t length;
- ssize_t result;
+ char *buffer, int buffer_length, gssize *data_length) {
+ gssize used_buffer_length;
+ gssize length;
+ gssize result;
char status[4];
+ char tmp_buffer;
result = send(sock, adb_service, (int)strlen(adb_service), 0);
- if (result != (ssize_t) strlen(adb_service)) {
+ if (result != (gssize) strlen(adb_service)) {
if (verbose)
- fprintf(stderr, "ERROR: Error while sending <%s> to ADB\n", adb_service);
+ g_fprintf(stderr, "ERROR: Error while sending <%s> to ADB\n", adb_service);
if (data_length)
*data_length = 0;
return 0;
@@ -432,17 +434,17 @@ static char *adb_send_and_receive(socket_handle_t sock, const char *adb_service,
used_buffer_length = 0;
while (used_buffer_length < 8) {
- used_buffer_length += recv(sock, buffer + used_buffer_length, buffer_length - used_buffer_length, 0);
+ used_buffer_length += recv(sock, buffer + used_buffer_length, (int)(buffer_length - used_buffer_length), 0);
}
memcpy(status, buffer, 4);
- result = buffer[8];
+ tmp_buffer = buffer[8];
buffer[8] = '\0';
- length = (ssize_t) strtol(buffer + 4, NULL, 16);
- buffer[8] = result;
+ length = (gssize) g_ascii_strtoll(buffer + 4, NULL, 16);
+ buffer[8] = tmp_buffer;
while (used_buffer_length < length + 8) {
- used_buffer_length += recv(sock, buffer + used_buffer_length, buffer_length - used_buffer_length, 0);
+ used_buffer_length += recv(sock, buffer + used_buffer_length, (int)(buffer_length - used_buffer_length), 0);
}
if (data_length)
@@ -450,7 +452,7 @@ static char *adb_send_and_receive(socket_handle_t sock, const char *adb_service,
if (memcmp(status, "OKAY", 4)) {
if (verbose)
- fprintf(stderr, "ERROR: Error while receiving by ADB for <%s>\n", adb_service);
+ g_fprintf(stderr, "ERROR: Error while receiving by ADB for <%s>\n", adb_service);
if (data_length)
*data_length = 0;
return 0;
@@ -461,15 +463,15 @@ static char *adb_send_and_receive(socket_handle_t sock, const char *adb_service,
static char *adb_send_and_read(socket_handle_t sock, const char *adb_service, char *buffer,
- int buffer_length, ssize_t *data_length) {
- ssize_t used_buffer_length;
- ssize_t result;
+ int buffer_length, gssize *data_length) {
+ gssize used_buffer_length;
+ gssize result;
char status[4];
result = send(sock, adb_service, (int)strlen(adb_service), 0);
- if (result != (ssize_t) strlen(adb_service)) {
+ if (result != (gssize) strlen(adb_service)) {
if (verbose)
- fprintf(stderr, "ERROR: Error while sending <%s> to ADB\n", adb_service);
+ g_fprintf(stderr, "ERROR: Error while sending <%s> to ADB\n", adb_service);
if (data_length)
*data_length = 0;
return 0;
@@ -477,13 +479,13 @@ static char *adb_send_and_read(socket_handle_t sock, const char *adb_service, ch
used_buffer_length = 0;
while (used_buffer_length < 4) {
- used_buffer_length += recv(sock, buffer + used_buffer_length, buffer_length - used_buffer_length, 0);
+ used_buffer_length += recv(sock, buffer + used_buffer_length, (int)(buffer_length - used_buffer_length), 0);
}
memcpy(status, buffer, 4);
while (result > 0) {
- result= recv(sock, buffer + used_buffer_length, 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;
}
@@ -493,7 +495,7 @@ static char *adb_send_and_read(socket_handle_t sock, const char *adb_service, ch
if (memcmp(status, "OKAY", 4)) {
if (verbose)
- fprintf(stderr, "ERROR: Error while receiving by ADB for <%s>\n", adb_service);
+ g_fprintf(stderr, "ERROR: Error while receiving by ADB for <%s>\n", adb_service);
if (data_length)
*data_length = 0;
return 0;
@@ -505,24 +507,24 @@ static char *adb_send_and_read(socket_handle_t sock, const char *adb_service, ch
static int adb_send(socket_handle_t sock, const char *adb_service) {
char buffer[4];
- ssize_t used_buffer_length;
- ssize_t result;
+ gssize used_buffer_length;
+ gssize result;
result = send(sock, adb_service, (int)strlen(adb_service), 0);
- if (result != (ssize_t) strlen(adb_service)) {
+ if (result != (gssize) strlen(adb_service)) {
if (verbose)
- fprintf(stderr, "ERROR: Error while sending <%s> to ADB\n", adb_service);
+ g_fprintf(stderr, "ERROR: Error while sending <%s> to ADB\n", adb_service);
return 1;
}
used_buffer_length = 0;
while (used_buffer_length < 4) {
- used_buffer_length += recv(sock, buffer + used_buffer_length, sizeof(buffer) - used_buffer_length, 0);
+ used_buffer_length += recv(sock, buffer + used_buffer_length, (int)(sizeof(buffer) - used_buffer_length), 0);
}
if (memcmp(buffer, "OKAY", 4)) {
if (verbose)
- fprintf(stderr, "ERROR: Error while receiving by ADB for <%s>\n", adb_service);
+ g_fprintf(stderr, "ERROR: Error while receiving by ADB for <%s>\n", adb_service);
return 2;
}
@@ -537,8 +539,8 @@ static int add_android_interfaces(struct interface_t **interface_list,
static char helpful_packet[PACKET_LENGTH];
char *response;
char *device_list;
- ssize_t data_length;
- ssize_t device_length;
+ gssize data_length;
+ gssize device_length;
socket_handle_t sock;
const char *adb_transport_serial_templace = "%04x""host:transport:%s";
const char *adb_check_port_templace = "%04x""shell:cat /proc/%s/net/tcp";
@@ -577,7 +579,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
pos = strchr(pos, '\n') + 1;
if (result >= (int) sizeof(serial_number)) {
if (verbose)
- fprintf(stderr, "WARNING: Serial number too long, ignore device\n");
+ g_fprintf(stderr, "WARNING: Serial number too long, ignore device\n");
continue;
}
memcpy(serial_number, prev_pos, result);
@@ -589,7 +591,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -597,9 +599,9 @@ static int add_android_interfaces(struct interface_t **interface_list,
response = adb_send_and_read(sock, adb_api_level, helpful_packet, sizeof(helpful_packet), &data_length);
closesocket(sock);
response[data_length] = '\0';
- api_level = (int) strtol(response, NULL, 10);
+ api_level = (int) g_ascii_strtoll(response, NULL, 10);
if (verbose)
- fprintf(stderr, "VERBOSE: Android API Level for %s is %i\n", serial_number, api_level);
+ g_fprintf(stderr, "VERBOSE: Android API Level for %s is %i\n", serial_number, api_level);
if (api_level < 21) {
interface_name = (char *) malloc(strlen(INTERFACE_ANDROID_LOGCAT_MAIN) + 1 + strlen(serial_number) + 1);
@@ -724,7 +726,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -733,20 +735,20 @@ static int add_android_interfaces(struct interface_t **interface_list,
closesocket(sock);
if (!response || data_length < 1) {
if (verbose) {
- fprintf(stderr, "WARNING: Error while getting hcidump version by <%s> (%p len=%"G_GSSIZE_FORMAT")\n", adb_hcidump_version, response, data_length);
- fprintf(stderr, "VERBOSE: Android hcidump version for %s is unknown\n", serial_number);
+ g_fprintf(stderr, "WARNING: Error while getting hcidump version by <%s> (%p len=%"G_GSSIZE_FORMAT")\n", adb_hcidump_version, response, data_length);
+ g_fprintf(stderr, "VERBOSE: Android hcidump version for %s is unknown\n", serial_number);
}
disable_interface = 1;
} else {
response[data_length] = '\0';
- if (strtoul(response, NULL, 10) == 0) {
+ if (g_ascii_strtoull(response, NULL, 10) == 0) {
if (verbose)
- fprintf(stderr, "VERBOSE: Android hcidump version for %s is unknown\n", serial_number);
+ g_fprintf(stderr, "VERBOSE: Android hcidump version for %s is unknown\n", serial_number);
disable_interface = 1;
} else {
if (verbose)
- fprintf(stderr, "VERBOSE: Android hcidump version for %s is %s\n", serial_number, response);
+ g_fprintf(stderr, "VERBOSE: Android hcidump version for %s is %s\n", serial_number, response);
}
}
@@ -773,7 +775,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -783,8 +785,8 @@ static int add_android_interfaces(struct interface_t **interface_list,
closesocket(sock);
if (!response || data_length < 1) {
if (verbose) {
- fprintf(stderr, "WARNING: Error while getting Bluetooth application process id by <%s> (%p len=%"G_GSSIZE_FORMAT")\n", adb_hcidump_version, response, data_length);
- fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
+ g_fprintf(stderr, "WARNING: Error while getting Bluetooth application process id by <%s> (%p len=%"G_GSSIZE_FORMAT")\n", adb_hcidump_version, response, data_length);
+ g_fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
}
disable_interface = 1;
} else {
@@ -796,7 +798,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
data_str = strchr(response, '\n');
if (data_str && sscanf(data_str, "%*s %s", pid) == 1) {
if (verbose)
- fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is %s\n", serial_number, pid);
+ g_fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is %s\n", serial_number, pid);
sock = adb_connect(adb_server_ip, adb_server_tcp_port);
@@ -804,7 +806,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -817,16 +819,16 @@ static int add_android_interfaces(struct interface_t **interface_list,
data_str = strchr(response, '\n');
if (data_str && sscanf(data_str, "%*s %s", pid) == 1 && strcmp(pid + 9, "10EA") == 0) {
if (verbose)
- fprintf(stderr, "VERBOSE: Bluedroid External Parser Port for %s is %s\n", serial_number, pid + 9);
+ g_fprintf(stderr, "VERBOSE: Bluedroid External Parser Port for %s is %s\n", serial_number, pid + 9);
} else {
disable_interface = 1;
if (verbose)
- fprintf(stderr, "VERBOSE: Bluedroid External Parser Port for %s is unknown\n", serial_number);
+ g_fprintf(stderr, "VERBOSE: Bluedroid External Parser Port for %s is unknown\n", serial_number);
}
} else {
disable_interface = 1;
if (verbose)
- fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
+ g_fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
}
}
@@ -853,7 +855,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -863,8 +865,8 @@ static int add_android_interfaces(struct interface_t **interface_list,
closesocket(sock);
if (!response || data_length < 1) {
if (verbose) {
- fprintf(stderr, "WARNING: Error while getting Bluetooth application process id by <%s> (%p len=%"G_GSSIZE_FORMAT")\n", adb_hcidump_version, response, data_length);
- fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
+ g_fprintf(stderr, "WARNING: Error while getting Bluetooth application process id by <%s> (%p len=%"G_GSSIZE_FORMAT")\n", adb_hcidump_version, response, data_length);
+ g_fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
}
disable_interface = 1;
} else {
@@ -876,7 +878,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
data_str = strchr(response, '\n');
if (data_str && sscanf(data_str, "%*s %s", pid) == 1) {
if (verbose)
- fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is %s\n", serial_number, pid);
+ g_fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is %s\n", serial_number, pid);
sock = adb_connect(adb_server_ip, adb_server_tcp_port);
@@ -884,7 +886,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -897,16 +899,16 @@ static int add_android_interfaces(struct interface_t **interface_list,
data_str = strchr(response, '\n');
if (data_str && sscanf(data_str, "%*s %s", pid) == 1 && strcmp(pid + 9, "22A8") == 0) {
if (verbose)
- fprintf(stderr, "VERBOSE: Btsnoop Net Port for %s is %s\n", serial_number, pid + 9);
+ g_fprintf(stderr, "VERBOSE: Btsnoop Net Port for %s is %s\n", serial_number, pid + 9);
} else {
disable_interface = 1;
if (verbose)
- fprintf(stderr, "VERBOSE: Btsnoop Net Port for %s is unknown\n", serial_number);
+ g_fprintf(stderr, "VERBOSE: Btsnoop Net Port for %s is unknown\n", serial_number);
}
} else {
disable_interface = 1;
if (verbose)
- fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
+ g_fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
}
}
@@ -937,7 +939,7 @@ static int list_interfaces(const char *server_ip, unsigned short *server_tcp_por
result = add_android_interfaces(&interface_list, server_ip, server_tcp_port);
for (i_interface = interface_list; i_interface; i_interface = i_interface->next)
- printf("interface {display=%s}{value=%s}\n",
+ g_printf("interface {display=%s}{value=%s}\n",
i_interface->display_name,
i_interface->interface_name);
@@ -947,14 +949,14 @@ static int list_interfaces(const char *server_ip, unsigned short *server_tcp_por
static int list_dlts(char *interface) {
if (!interface) {
- fprintf(stderr, "ERROR: No interface specified.\n");
+ g_fprintf(stderr, "ERROR: No interface specified.\n");
return 1;
}
if (is_specified_interface(interface, INTERFACE_ANDROID_BLUETOOTH_HCIDUMP) ||
is_specified_interface(interface, INTERFACE_ANDROID_BLUETOOTH_EXTERNAL_PARSER) ||
is_specified_interface(interface, INTERFACE_ANDROID_BLUETOOTH_BTSNOOP_NET)) {
- printf("dlt {number=99}{name=BluetoothH4}{display=Bluetooth HCI UART transport layer plus pseudo-header}\n");
+ g_printf("dlt {number=99}{name=BluetoothH4}{display=Bluetooth HCI UART transport layer plus pseudo-header}\n");
return 0;
} else if (is_specified_interface(interface, INTERFACE_ANDROID_LOGCAT_MAIN) ||
is_specified_interface(interface, INTERFACE_ANDROID_LOGCAT_SYSTEM) ||
@@ -965,23 +967,23 @@ static int list_dlts(char *interface) {
is_specified_interface(interface, INTERFACE_ANDROID_LOGCAT_TEXT_RADIO) ||
is_specified_interface(interface, INTERFACE_ANDROID_LOGCAT_TEXT_EVENTS) ||
is_specified_interface(interface, INTERFACE_ANDROID_LOGCAT_TEXT_CRASH)) {
- printf("dlt {number=252}{name=Upper PDU}{display=Upper PDU}\n");
+ g_printf("dlt {number=252}{name=Upper PDU}{display=Upper PDU}\n");
return 0;
}
- fprintf(stderr, "ERROR: Invalid interface: <%s>\n", interface);
+ g_fprintf(stderr, "ERROR: Invalid interface: <%s>\n", interface);
return 1;
}
static int list_config(char *interface) {
if (!interface) {
- fprintf(stderr, "ERROR: No interface specified.\n");
+ g_fprintf(stderr, "ERROR: No interface specified.\n");
return 1;
}
if (is_specified_interface(interface, INTERFACE_ANDROID_BLUETOOTH_EXTERNAL_PARSER)) {
- printf("arg {number=0}{call=--adb-server-ip}{display=ADB Server IP Address}{type=string}{default=127.0.0.1}\n"
+ g_printf("arg {number=0}{call=--adb-server-ip}{display=ADB Server IP Address}{type=string}{default=127.0.0.1}\n"
"arg {number=1}{call=--adb-server-tcp-port}{display=ADB Server TCP Port}{type=integer}{range=0,65535}{default=5037}\n"
"arg {number=2}{call=--bt-server-tcp-port}{display=Bluetooth Server TCP Port}{type=integer}{range=0,65535}{default=4330}\n"
"arg {number=3}{call=--bt-forward-socket}{display=Forward Bluetooth Socket}{type=boolean}{default=false}\n"
@@ -991,7 +993,7 @@ static int list_config(char *interface) {
return 0;
} else if (is_specified_interface(interface, INTERFACE_ANDROID_BLUETOOTH_HCIDUMP) ||
is_specified_interface(interface, INTERFACE_ANDROID_BLUETOOTH_BTSNOOP_NET)) {
- printf("arg {number=0}{call=--adb-server-ip}{display=ADB Server IP Address}{type=string}{default=127.0.0.1}\n"
+ g_printf("arg {number=0}{call=--adb-server-ip}{display=ADB Server IP Address}{type=string}{default=127.0.0.1}\n"
"arg {number=1}{call=--adb-server-tcp-port}{display=ADB Server TCP Port}{type=integer}{range=0,65535}{default=5037}\n"
"arg {number=2}{call=--verbose}{display=Verbose/Debug output on console}{type=boolean}{default=false}\n");
return 0;
@@ -999,7 +1001,7 @@ static int list_config(char *interface) {
is_specified_interface(interface, INTERFACE_ANDROID_LOGCAT_SYSTEM) ||
is_specified_interface(interface, INTERFACE_ANDROID_LOGCAT_RADIO) ||
is_specified_interface(interface, INTERFACE_ANDROID_LOGCAT_EVENTS)) {
- printf("arg {number=0}{call=--adb-server-ip}{display=ADB Server IP Address}{type=string}{default=127.0.0.1}\n"
+ g_printf("arg {number=0}{call=--adb-server-ip}{display=ADB Server IP Address}{type=string}{default=127.0.0.1}\n"
"arg {number=1}{call=--adb-server-tcp-port}{display=ADB Server TCP Port}{type=integer}{range=0,65535}{default=5037}\n"
"arg {number=2}{call=--logcat-text}{display=Use text logcat}{type=boolean}{default=false}\n"
"arg {number=3}{call=--verbose}{display=Verbose/Debug output on console}{type=boolean}{default=false}\n");
@@ -1009,13 +1011,13 @@ static int list_config(char *interface) {
is_specified_interface(interface, INTERFACE_ANDROID_LOGCAT_TEXT_RADIO) ||
is_specified_interface(interface, INTERFACE_ANDROID_LOGCAT_TEXT_EVENTS) ||
is_specified_interface(interface, INTERFACE_ANDROID_LOGCAT_TEXT_CRASH)) {
- printf("arg {number=0}{call=--adb-server-ip}{display=ADB Server IP Address}{type=string}{default=127.0.0.1}\n"
+ g_printf("arg {number=0}{call=--adb-server-ip}{display=ADB Server IP Address}{type=string}{default=127.0.0.1}\n"
"arg {number=1}{call=--adb-server-tcp-port}{display=ADB Server TCP Port}{type=integer}{range=0,65535}{default=5037}\n"
"arg {number=2}{call=--verbose}{display=Verbose/Debug output on console}{type=boolean}{default=false}\n");
return 0;
}
- fprintf(stderr, "ERROR: Invalid interface: <%s>\n", interface);
+ g_fprintf(stderr, "ERROR: Invalid interface: <%s>\n", interface);
return 1;
}
@@ -1023,16 +1025,16 @@ static int list_config(char *interface) {
static void help(void) {
unsigned int i_opt;
- printf("Help\n");
- printf(" Usage:\n"
+ g_printf("Help\n");
+ g_printf(" Usage:\n"
" androiddump --extcap-interfaces [--adb-server-ip=<arg>] [--adb-server-tcp-port=<arg>]\n"
" androiddump --extcap-interface=INTERFACE --extcap-dlts\n"
" androiddump --extcap-interface=INTERFACE --extcap-config\n"
" androiddump --extcap-interface=INTERFACE --fifo=PATH_FILENAME --capture \n");
- printf("\n Parameters:\n");
+ g_printf("\n Parameters:\n");
for (i_opt = 0; i_opt < (sizeof(longopts) / sizeof(longopts[0])) - 1; i_opt += 1) {
- printf(" --%s%s\n", longopts[i_opt].name,
+ g_printf(" --%s%s\n", longopts[i_opt].name,
(longopts[i_opt].has_arg == required_argument) ? "=<arg>" :
((longopts[i_opt].has_arg == optional_argument) ? "[=arg]" : ""));
}
@@ -1050,8 +1052,8 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
static char data[PACKET_LENGTH];
static char packet[PACKET_LENGTH];
static char helpful_packet[PACKET_LENGTH];
- ssize_t length;
- ssize_t used_buffer_length = 0;
+ gssize length;
+ gssize used_buffer_length = 0;
socket_handle_t sock;
const char *adb_transport = "0012""host:transport-any";
const char *adb_transport_serial_templace = "%04x""host:transport:%s";
@@ -1061,12 +1063,12 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
char *serial_number = NULL;
time_t ts = 0;
unsigned int captured_length;
- long hex;
+ gint64 hex;
char *hex_data;
char *new_hex_data;
own_pcap_bluetooth_h4_header *h4_header;
- long raw_length = 0;
- long frame_length;
+ gint64 raw_length = 0;
+ gint64 frame_length;
int ms = 0;
struct tm date;
char direction_character;
@@ -1089,7 +1091,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
result = adb_send(sock, adb_transport);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
+ g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
closesocket(sock);
return 1;
}
@@ -1098,7 +1100,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -1107,7 +1109,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
result = adb_send(sock, adb_shell_hcidump);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while starting capture by sending command: %s\n", adb_shell_hcidump);
+ g_fprintf(stderr, "ERROR: Error while starting capture by sending command: %s\n", adb_shell_hcidump);
closesocket(sock);
return 1;
}
@@ -1116,11 +1118,11 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
char *i_position;
errno = 0;
- length = recv(sock, data + used_buffer_length, PACKET_LENGTH - used_buffer_length, 0);
+ length = recv(sock, data + used_buffer_length, (int)(PACKET_LENGTH - used_buffer_length), 0);
if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
else if (errno != 0) {
if (verbose)
- printf("ERROR capture: %s\n", strerror(errno));
+ g_printf("ERROR capture: %s\n", strerror(errno));
closesocket(sock);
return 100;
}
@@ -1132,7 +1134,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
if (!strncmp(data, "/system/bin/sh: hcidump: not found", 34)) {
if (verbose)
- fprintf(stderr, "ERROR: Command not found for <%s>\n", adb_shell_hcidump);
+ g_fprintf(stderr, "ERROR: Command not found for <%s>\n", adb_shell_hcidump);
closesocket(sock);
return 2;
}
@@ -1142,13 +1144,13 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
i_position += 1;
if (!strncmp(state_line_position, "Can't access device: Permission denied", 38)) {
if (verbose)
- fprintf(stderr, "WARNING: No permission for command <%s>\n", adb_shell_hcidump);
+ g_fprintf(stderr, "WARNING: No permission for command <%s>\n", adb_shell_hcidump);
used_buffer_length = 0;
try_next += 1;
break;
}
memmove(data, i_position, used_buffer_length - (i_position - data));
- used_buffer_length = used_buffer_length - (ssize_t)(i_position - data);
+ used_buffer_length = used_buffer_length - (gssize)(i_position - data);
break;
}
}
@@ -1163,7 +1165,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -1171,7 +1173,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
result = adb_send(sock, adb_shell_su_hcidump);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while starting capture by sending command: <%s>\n", adb_shell_su_hcidump);
+ g_fprintf(stderr, "ERROR: Error while starting capture by sending command: <%s>\n", adb_shell_su_hcidump);
closesocket(sock);
return 1;
}
@@ -1181,11 +1183,11 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
char *i_position;
errno = 0;
- length = recv(sock, data + used_buffer_length, PACKET_LENGTH - used_buffer_length, 0);
+ length = recv(sock, data + used_buffer_length, (int)(PACKET_LENGTH - used_buffer_length), 0);
if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
else if (errno != 0) {
if (verbose)
- printf("ERROR capture: %s\n", strerror(errno));
+ g_printf("ERROR capture: %s\n", strerror(errno));
closesocket(sock);
return 100;
}
@@ -1195,7 +1197,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
if (i_position && i_position < data + used_buffer_length) {
if (!strncmp(data, "/system/bin/sh: su: not found", 29)) {
if (verbose)
- fprintf(stderr, "ERROR: Command 'su' not found for <%s>\n", adb_shell_su_hcidump);
+ g_fprintf(stderr, "ERROR: Command 'su' not found for <%s>\n", adb_shell_su_hcidump);
closesocket(sock);
return 2;
}
@@ -1204,7 +1206,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
if (i_position) {
i_position += 1;
memmove(data, i_position, used_buffer_length - (i_position - data));
- used_buffer_length = used_buffer_length - (ssize_t)(i_position - data);
+ used_buffer_length = used_buffer_length - (gssize)(i_position - data);
break;
}
}
@@ -1213,11 +1215,11 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
while (endless_loop) {
errno = 0;
- length = recv(sock, data + used_buffer_length, PACKET_LENGTH - used_buffer_length, 0);
+ length = recv(sock, data + used_buffer_length, (int)(PACKET_LENGTH - used_buffer_length), 0);
if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
else if (errno != 0) {
if (verbose)
- printf("ERROR capture: %s\n", strerror(errno));
+ g_printf("ERROR capture: %s\n", strerror(errno));
closesocket(sock);
return 100;
}
@@ -1225,7 +1227,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
while (endless_loop) {
if (used_buffer_length + length >= 1) {
hex_data = data + 29;
- hex = strtol(hex_data, &new_hex_data, 16);
+ hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
if ((hex == 0x01 && used_buffer_length + length >= 4) ||
(hex == 0x02 && used_buffer_length + length >= 5) ||
@@ -1233,72 +1235,72 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
if (hex == 0x01) {
hex_data = new_hex_data;
- hex = strtol(hex_data, &new_hex_data, 16);
+ hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
if (hex < 0 || hex >= 256 || hex_data == new_hex_data) {
if (verbose)
- printf("ERROR: data format error: %s\n", strerror(errno));
+ g_printf("ERROR: data format error: %s\n", strerror(errno));
closesocket(sock);
return 101;
}
hex_data = new_hex_data;
- hex = strtol(hex_data, &new_hex_data, 16);
+ hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
if (hex < 0 || hex >= 256 || hex_data == new_hex_data) {
if (verbose)
- printf("ERROR: data format error: %s\n", strerror(errno));
+ g_printf("ERROR: data format error: %s\n", strerror(errno));
closesocket(sock);
return 101;
}
hex_data = new_hex_data;
- hex = strtol(hex_data, &new_hex_data, 16);
+ hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
raw_length = hex + 4;
} else if (hex == 0x04) {
hex_data = new_hex_data;
- hex = strtol(hex_data, &new_hex_data, 16);
+ hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
if (hex < 0 || hex >= 256 || hex_data == new_hex_data) {
if (verbose)
- printf("ERROR: data format error: %s\n", strerror(errno));
+ g_printf("ERROR: data format error: %s\n", strerror(errno));
closesocket(sock);
return 101;
}
hex_data = new_hex_data;
- hex = strtol(hex_data, &new_hex_data, 16);
+ hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
raw_length = hex + 3;
} else if (hex == 0x02) {
hex_data = new_hex_data;
- hex = strtol(hex_data, &new_hex_data, 16);
+ hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
if (hex < 0 || hex >= 256 || hex_data == new_hex_data) {
if (verbose)
- printf("ERROR: data format error: %s\n", strerror(errno));
+ g_printf("ERROR: data format error: %s\n", strerror(errno));
closesocket(sock);
return 101;
}
hex_data = new_hex_data;
- hex = strtol(hex_data, &new_hex_data, 16);
+ hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
if (hex < 0 || hex >= 256 || hex_data == new_hex_data) {
if (verbose)
- printf("ERROR: data format error: %s\n", strerror(errno));
+ g_printf("ERROR: data format error: %s\n", strerror(errno));
closesocket(sock);
return 101;
}
hex_data = new_hex_data;
- hex = strtol(hex_data, &new_hex_data, 16);
+ hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
raw_length = hex + 5;
hex_data = new_hex_data;
- hex = strtol(hex_data, &new_hex_data, 16);
+ hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
raw_length += hex << 8;
}
} else {
if (verbose)
- fprintf(stderr, "ERROR: bad raw stream\n");
+ g_fprintf(stderr, "ERROR: bad raw stream\n");
closesocket(sock);
return 1;
}
@@ -1319,7 +1321,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
&date.tm_min, &date.tm_sec, &ms, &direction_character)) {
if (verbose) {
- fprintf(stderr, "time %04d-%02d-%02d %02d:%02d:%02d.%06d %c\n",
+ g_fprintf(stderr, "time %04d-%02d-%02d %02d:%02d:%02d.%06d %c\n",
date.tm_year, date.tm_mon, date.tm_mday, date.tm_hour,
date.tm_min, date.tm_sec, ms, direction_character);
}
@@ -1334,7 +1336,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
while ((long)(new_hex_data - data + sizeof(own_pcap_bluetooth_h4_header)) < frame_length) {
hex_data = new_hex_data;
- hex = strtol(hex_data, &new_hex_data, 16);
+ hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
packet[sizeof(own_pcap_bluetooth_h4_header) + captured_length] = (char) hex;
captured_length += 1;
@@ -1349,8 +1351,8 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
ms * 1000);
if (used_buffer_length + length >= frame_length) {
- memmove(data, data + frame_length, used_buffer_length + length - frame_length);
- used_buffer_length = used_buffer_length + length - frame_length;
+ memmove(data, data + frame_length, (size_t)(used_buffer_length + length - frame_length));
+ used_buffer_length = (gssize)(used_buffer_length + length - frame_length);
length = 0;
continue;
}
@@ -1411,8 +1413,8 @@ static int capture_android_bluetooth_external_parser(char *interface,
const char *adb_transport = "0012""host:transport-any";
const char *adb_transport_serial_templace = "%04x""host:transport:%s";
const char *adb_tcp_bluedroid_external_parser_template = "%04x""tcp:%05u";
- ssize_t length;
- ssize_t used_buffer_length = 0;
+ gssize length;
+ gssize used_buffer_length = 0;
uint64_t ts;
socket_handle_t sock;
struct sockaddr_in server;
@@ -1432,12 +1434,12 @@ static int capture_android_bluetooth_external_parser(char *interface,
if (bt_forward_socket) {
if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == INVALID_SOCKET) {
if (verbose)
- printf("ERROR: Cannot open system TCP socket: %s\n", strerror(errno));
+ g_printf("ERROR: Cannot open system TCP socket: %s\n", strerror(errno));
return 1;
}
if (verbose) {
- printf("Using config: Server TCP Port=%u, Local IP=%s, Local TCP Port=%u\n",
+ g_printf("Using config: Server TCP Port=%u, Local IP=%s, Local TCP Port=%u\n",
*bt_server_tcp_port, bt_local_ip, *bt_local_tcp_port);
}
@@ -1446,7 +1448,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
result = adb_forward(serial_number, adb_server_ip, adb_server_tcp_port, *bt_local_tcp_port, *bt_server_tcp_port);
if (verbose)
- printf("DO: adb forward tcp:%u (local) tcp:%u (remote) result=%i\n",
+ g_printf("DO: adb forward tcp:%u (local) tcp:%u (remote) result=%i\n",
*bt_local_tcp_port, *bt_server_tcp_port, result);
}
@@ -1457,7 +1459,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
if (connect(sock, (struct sockaddr *) &server, sizeof(server)) == SOCKET_ERROR) {
if (verbose)
- printf("ERROR: <%s> Please check that adb daemon is running.\n\n", strerror(errno));
+ g_printf("ERROR: <%s> Please check that adb daemon is running.\n\n", strerror(errno));
closesocket(sock);
return 2;
}
@@ -1467,18 +1469,18 @@ static int capture_android_bluetooth_external_parser(char *interface,
length = sizeof(client);
if (getsockname(sock, (struct sockaddr *) &client, (socklen_t *) &length)) {
- printf("ERROR getsockname: %s\n", strerror(errno));
+ g_printf("ERROR getsockname: %s\n", strerror(errno));
closesocket(sock);
return 3;
}
if (length != sizeof(client)) {
- printf("ERROR: incorrect length\n");
+ g_printf("ERROR: incorrect length\n");
closesocket(sock);
return 4;
}
- printf("VERBOSE: Client port %u\n", GUINT16_FROM_BE(client.sin_port));
+ g_printf("VERBOSE: Client port %u\n", GUINT16_FROM_BE(client.sin_port));
}
} else {
int result;
@@ -1491,7 +1493,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
result = adb_send(sock, adb_transport);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport\n");
+ g_fprintf(stderr, "ERROR: Error while setting adb transport\n");
closesocket(sock);
return 1;
}
@@ -1500,7 +1502,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
result = adb_send(sock, buffer);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport\n");
+ g_fprintf(stderr, "ERROR: Error while setting adb transport\n");
closesocket(sock);
return 1;
}
@@ -1510,7 +1512,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
result = adb_send(sock, buffer);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while forwarding adb port\n");
+ g_fprintf(stderr, "ERROR: Error while forwarding adb port\n");
closesocket(sock);
return 1;
}
@@ -1518,11 +1520,11 @@ static int capture_android_bluetooth_external_parser(char *interface,
while (endless_loop) {
errno = 0;
- length = recv(sock, buffer + used_buffer_length, PACKET_LENGTH - used_buffer_length, 0);
+ length = recv(sock, buffer + used_buffer_length, (int)(PACKET_LENGTH - used_buffer_length), 0);
if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
else if (errno != 0) {
if (verbose)
- printf("ERROR capture: %s\n", strerror(errno));
+ g_printf("ERROR capture: %s\n", strerror(errno));
closesocket(sock);
return 100;
}
@@ -1531,12 +1533,12 @@ static int capture_android_bluetooth_external_parser(char *interface,
if (bt_forward_socket) {
/* NOTE: Workaround... It seems that Bluedroid is slower and we can connect to socket that are not really ready... */
if (verbose)
- printf("WARNING: Broken socket connection. Try reconnect.\n");
+ g_printf("WARNING: Broken socket connection. Try reconnect.\n");
closesocket(sock);
if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == INVALID_SOCKET) {
if (verbose)
- printf("ERROR1: %s\n", strerror(errno));
+ g_printf("ERROR1: %s\n", strerror(errno));
return 1;
}
@@ -1546,13 +1548,13 @@ static int capture_android_bluetooth_external_parser(char *interface,
if (connect(sock, (struct sockaddr *) &server, sizeof(server)) == SOCKET_ERROR) {
if (verbose)
- printf("ERROR reconnect: <%s> Please check that adb daemon is running.\n", strerror(errno));
+ g_printf("ERROR reconnect: <%s> Please check that adb daemon is running.\n", strerror(errno));
closesocket(sock);
return 2;
}
} else {
if (verbose)
- printf("ERROR: Broken socket connection.\n");
+ g_printf("ERROR: Broken socket connection.\n");
closesocket(sock);
return 1;
}
@@ -1562,7 +1564,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
used_buffer_length += length;
- if (verbose) printf("Received: length=%"G_GSSIZE_FORMAT"\n", length);
+ if (verbose) g_printf("Received: length=%"G_GSSIZE_FORMAT"\n", length);
while (((payload[BLUEDROID_H4_PACKET_TYPE] == BLUEDROID_H4_PACKET_TYPE_HCI_CMD || payload[BLUEDROID_H4_PACKET_TYPE] == BLUEDROID_H4_PACKET_TYPE_SCO) &&
used_buffer_length >= BLUEDROID_TIMESTAMP_SIZE + BLUEDROID_H4_SIZE + 2 + 1 &&
@@ -1614,16 +1616,16 @@ static int capture_android_bluetooth_external_parser(char *interface,
break;
default:
if (verbose)
- printf("ERROR: Invalid stream\n");
+ g_printf("ERROR: Invalid stream\n");
closesocket(sock);
return 1;
}
if (verbose) {
static unsigned int id = 1;
- printf("\t Packet %u: used_buffer_length=%"G_GSSIZE_FORMAT" length=%"G_GSSIZE_FORMAT" captured_length=%i type=0x%02x\n", id, used_buffer_length, length, captured_length, payload[BLUEDROID_H4_PACKET_TYPE]);
+ g_printf("\t Packet %u: used_buffer_length=%"G_GSSIZE_FORMAT" length=%"G_GSSIZE_FORMAT" captured_length=%i type=0x%02x\n", id, used_buffer_length, length, captured_length, payload[BLUEDROID_H4_PACKET_TYPE]);
if (payload[BLUEDROID_H4_PACKET_TYPE] == BLUEDROID_H4_PACKET_TYPE_HCI_EVT)
- printf("\t Packet: %02x %02x %02x\n", (unsigned int) payload[0], (unsigned int) payload[1], (unsigned int)payload[2]);
+ g_printf("\t Packet: %02x %02x %02x\n", (unsigned int) payload[0], (unsigned int) payload[1], (unsigned int)payload[2]);
id +=1;
}
@@ -1638,7 +1640,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
used_buffer_length -= length - sizeof(own_pcap_bluetooth_h4_header) + BLUEDROID_TIMESTAMP_SIZE;
if (used_buffer_length < 0) {
if (verbose)
- printf("ERROR: Internal error: Negative used buffer length.\n");
+ g_printf("ERROR: Internal error: Negative used buffer length.\n");
closesocket(sock);
return 1;
}
@@ -1658,8 +1660,8 @@ static int capture_android_bluetooth_btsnoop_net(char *interface, char *fifo,
const char *adb_server_ip, unsigned short *adb_server_tcp_port) {
struct extcap_dumper extcap_dumper;
static char packet[PACKET_LENGTH];
- ssize_t length;
- ssize_t used_buffer_length = 0;
+ gssize length;
+ gssize used_buffer_length = 0;
socket_handle_t sock;
const char *adb_transport = "0012""host:transport-any";
const char *adb_transport_serial_templace = "%04x""host:transport:%s";
@@ -1698,7 +1700,7 @@ static int capture_android_bluetooth_btsnoop_net(char *interface, char *fifo,
result = adb_send(sock, adb_transport);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
+ g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
return 1;
}
} else {
@@ -1706,7 +1708,7 @@ static int capture_android_bluetooth_btsnoop_net(char *interface, char *fifo,
result = adb_send(sock, packet);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", packet);
+ g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", packet);
closesocket(sock);
return 1;
}
@@ -1715,14 +1717,14 @@ static int capture_android_bluetooth_btsnoop_net(char *interface, char *fifo,
result = adb_send(sock, adb_tcp_btsnoop_net);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while sending command <%s>\n", adb_tcp_btsnoop_net);
+ g_fprintf(stderr, "ERROR: Error while sending command <%s>\n", adb_tcp_btsnoop_net);
closesocket(sock);
return 1;
}
/* Read "btsnoop" header - 16 bytes */
while (used_buffer_length < 16) {
- length = recv(sock, packet + used_buffer_length, PACKET_LENGTH - used_buffer_length, 0);
+ length = recv(sock, packet + used_buffer_length, (int)(PACKET_LENGTH - used_buffer_length), 0);
used_buffer_length += length;
}
if (used_buffer_length > 16)
@@ -1733,18 +1735,18 @@ static int capture_android_bluetooth_btsnoop_net(char *interface, char *fifo,
while (endless_loop) {
errno = 0;
length = recv(sock, packet + used_buffer_length + sizeof(own_pcap_bluetooth_h4_header),
- PACKET_LENGTH - sizeof(own_pcap_bluetooth_h4_header) - used_buffer_length, 0);
+ (int)(PACKET_LENGTH - sizeof(own_pcap_bluetooth_h4_header) - used_buffer_length), 0);
if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
else if (errno != 0) {
if (verbose)
- printf("ERROR capture: %s\n", strerror(errno));
+ g_printf("ERROR capture: %s\n", strerror(errno));
closesocket(sock);
return 100;
}
if (length <= 0) {
if (verbose)
- printf("ERROR: Broken socket connection.\n");
+ g_printf("ERROR: Broken socket connection.\n");
closesocket(sock);
return 101;
}
@@ -1770,7 +1772,7 @@ static int capture_android_bluetooth_btsnoop_net(char *interface, char *fifo,
used_buffer_length -= 24 + GINT32_FROM_BE(*captured_length);
if (used_buffer_length < 0) {
if (verbose)
- printf("ERROR: Internal error: Negative used buffer length.\n");
+ g_printf("ERROR: Internal error: Negative used buffer length.\n");
closesocket(sock);
return 1;
}
@@ -1792,7 +1794,7 @@ static int capture_android_logcat_text(char *interface, char *fifo,
const char *adb_server_ip, unsigned short *adb_server_tcp_port) {
struct extcap_dumper extcap_dumper;
static char packet[PACKET_LENGTH];
- ssize_t length;
+ gssize length;
size_t used_buffer_length = 0;
socket_handle_t sock;
const char *protocol_name;
@@ -1842,7 +1844,7 @@ static int capture_android_logcat_text(char *interface, char *fifo,
result = adb_send(sock, adb_transport);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
+ g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
closesocket(sock);
return 1;
}
@@ -1851,7 +1853,7 @@ static int capture_android_logcat_text(char *interface, char *fifo,
result = adb_send(sock, packet);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", packet);
+ g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", packet);
closesocket(sock);
return 1;
}
@@ -1868,7 +1870,7 @@ static int capture_android_logcat_text(char *interface, char *fifo,
else if (is_specified_interface(interface, INTERFACE_ANDROID_LOGCAT_TEXT_CRASH))
logcat_buffer = " -b crash";
else {
- printf("ERROR: Unknown interface: <%s>\n", interface);
+ g_printf("ERROR: Unknown interface: <%s>\n", interface);
closesocket(sock);
return -1;
}
@@ -1878,7 +1880,7 @@ static int capture_android_logcat_text(char *interface, char *fifo,
result = adb_send(sock, packet);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while sending command <%s>\n", packet);
+ g_fprintf(stderr, "ERROR: Error while sending command <%s>\n", packet);
closesocket(sock);
return 1;
}
@@ -1905,14 +1907,14 @@ static int capture_android_logcat_text(char *interface, char *fifo,
if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
else if (errno != 0) {
if (verbose)
- printf("ERROR capture: %s\n", strerror(errno));
+ g_printf("ERROR capture: %s\n", strerror(errno));
closesocket(sock);
return 100;
}
if (length <= 0) {
if (verbose)
- printf("ERROR: Broken socket connection. Try reconnect.\n");
+ g_printf("ERROR: Broken socket connection. Try reconnect.\n");
closesocket(sock);
return 1;
}
@@ -1926,7 +1928,7 @@ static int capture_android_logcat_text(char *interface, char *fifo,
time_t secs = 0;
int nsecs = 0;
- length = (ssize_t)(pos - packet) + 1;
+ length = (gssize)(pos - packet) + 1;
if (6 == sscanf(packet + exported_pdu_headers_size, "%d-%d %d:%d:%d.%d", &date.tm_mon, &date.tm_mday, &date.tm_hour,
&date.tm_min, &date.tm_sec, &ms)) {
@@ -1960,7 +1962,7 @@ static int capture_android_logcat(char *interface, char *fifo,
struct extcap_dumper extcap_dumper;
static char packet[PACKET_LENGTH];
static char helper_packet[PACKET_LENGTH];
- ssize_t length;
+ gssize length;
size_t used_buffer_length = 0;
socket_handle_t sock;
const char *protocol_name;
@@ -2012,7 +2014,7 @@ static int capture_android_logcat(char *interface, char *fifo,
result = adb_send(sock, adb_transport);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport\n");
+ g_fprintf(stderr, "ERROR: Error while setting adb transport\n");
closesocket(sock);
return 1;
}
@@ -2021,7 +2023,7 @@ static int capture_android_logcat(char *interface, char *fifo,
result = adb_send(sock, packet);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport\n");
+ g_fprintf(stderr, "ERROR: Error while setting adb transport\n");
closesocket(sock);
return 1;
}
@@ -2036,7 +2038,7 @@ static int capture_android_logcat(char *interface, char *fifo,
else if (is_specified_interface(interface, INTERFACE_ANDROID_LOGCAT_EVENTS))
adb_command = adb_log_events;
else {
- printf("ERROR: Unknown interface: <%s>\n", interface);
+ g_printf("ERROR: Unknown interface: <%s>\n", interface);
closesocket(sock);
return -1;
}
@@ -2044,7 +2046,7 @@ static int capture_android_logcat(char *interface, char *fifo,
result = adb_send(sock, adb_command);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while sending command <%s>\n", adb_command);
+ g_fprintf(stderr, "ERROR: Error while sending command <%s>\n", adb_command);
closesocket(sock);
return 1;
}
@@ -2081,7 +2083,7 @@ static int capture_android_logcat(char *interface, char *fifo,
if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
else if (errno != 0) {
if (verbose)
- printf("ERROR capture: %s\n", strerror(errno));
+ g_printf("ERROR capture: %s\n", strerror(errno));
closesocket(sock);
return 100;
}
@@ -2089,7 +2091,7 @@ static int capture_android_logcat(char *interface, char *fifo,
if (length <= 0) {
while (endless_loop) {
if (verbose)
- printf("WARNING: Broken socket connection. Try reconnect.\n");
+ g_printf("WARNING: Broken socket connection. Try reconnect.\n");
used_buffer_length = 0;
closesocket(sock);
@@ -2101,7 +2103,7 @@ static int capture_android_logcat(char *interface, char *fifo,
result = adb_send(sock, adb_transport);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
+ g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
closesocket(sock);
return 1;
}
@@ -2110,7 +2112,7 @@ static int capture_android_logcat(char *interface, char *fifo,
result = adb_send(sock, helper_packet);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helper_packet);
+ g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helper_packet);
closesocket(sock);
return 1;
}
@@ -2125,7 +2127,7 @@ static int capture_android_logcat(char *interface, char *fifo,
else if (is_specified_interface(interface, INTERFACE_ANDROID_LOGCAT_EVENTS))
adb_command = adb_log_events;
else {
- printf("ERROR: Unknown interface: <%s>\n", interface);
+ g_printf("ERROR: Unknown interface: <%s>\n", interface);
closesocket(sock);
return 1;
}
@@ -2133,7 +2135,7 @@ static int capture_android_logcat(char *interface, char *fifo,
result = adb_send(sock, adb_command);
if (result) {
if (verbose)
- fprintf(stderr, "ERROR: Error while sending command <%s>\n", adb_command);
+ g_fprintf(stderr, "ERROR: Error while sending command <%s>\n", adb_command);
continue;
}
@@ -2148,7 +2150,7 @@ static int capture_android_logcat(char *interface, char *fifo,
else
header_size = *try_header_size;
- length = (*payload_length) + header_size + (ssize_t)exported_pdu_headers_size;
+ length = (*payload_length) + header_size + (gssize)exported_pdu_headers_size;
while (used_buffer_length >= exported_pdu_headers_size + header_size && (size_t)length <= used_buffer_length) {
extcap_dumper_dump(extcap_dumper, packet,
@@ -2161,7 +2163,7 @@ static int capture_android_logcat(char *interface, char *fifo,
used_buffer_length += exported_pdu_headers_size;
- length = (*payload_length) + header_size + (ssize_t)exported_pdu_headers_size;
+ length = (*payload_length) + header_size + (gssize)exported_pdu_headers_size;
if (*try_header_size == 0 || *try_header_size != 24)
header_size = 20;
@@ -2262,7 +2264,7 @@ int main(int argc, char **argv) {
switch (result) {
case OPT_VERSION:
- printf("%u.%u.%u\n", ANDROIDDUMP_VERSION_MAJOR, ANDROIDDUMP_VERSION_MINOR, ANDROIDDUMP_VERSION_RELEASE);
+ g_printf("%u.%u.%u\n", ANDROIDDUMP_VERSION_MAJOR, ANDROIDDUMP_VERSION_MINOR, ANDROIDDUMP_VERSION_RELEASE);
return 0;
case OPT_VERBOSE:
if (optarg)
@@ -2273,12 +2275,12 @@ int main(int argc, char **argv) {
if (verbose) {
int j = 0;
- fprintf(stderr, "VERBOSE: Command line: ");
+ g_fprintf(stderr, "VERBOSE: Command line: ");
while(j < argc) {
- fprintf(stderr, "%s ", argv[j]);
+ g_fprintf(stderr, "%s ", argv[j]);
j += 1;
}
- fprintf(stderr, "\n");
+ g_fprintf(stderr, "\n");
}
break;
case OPT_LIST_INTERFACES:
@@ -2311,7 +2313,7 @@ int main(int argc, char **argv) {
g_printerr("ERROR: Impossible exception. Parameter required argument, but there is no it right now.");
return -1;
}
- *adb_server_tcp_port = (unsigned short) strtoul(optarg, NULL, 10);
+ *adb_server_tcp_port = (unsigned short) g_ascii_strtoull(optarg, NULL, 10);
break;
case OPT_CONFIG_LOGCAT_TEXT:
logcat_text = (g_ascii_strncasecmp(optarg, "TRUE", 4) == 0);
@@ -2322,7 +2324,7 @@ int main(int argc, char **argv) {
g_printerr("ERROR: Impossible exception. Parameter required argument, but there is no it right now.");
return -1;
}
- *bt_server_tcp_port = (unsigned short) strtoul(optarg, NULL, 10);
+ *bt_server_tcp_port = (unsigned short) g_ascii_strtoull(optarg, NULL, 10);
break;
case OPT_CONFIG_BT_FORWARD_SOCKET:
bt_forward_socket = (g_ascii_strncasecmp(optarg, "TRUE", 4) == 0);
@@ -2336,10 +2338,10 @@ int main(int argc, char **argv) {
g_printerr("ERROR: Impossible exception. Parameter required argument, but there is no it right now.");
return -1;
}
- *bt_local_tcp_port = (unsigned short) strtoul(optarg, NULL, 10);
+ *bt_local_tcp_port = (unsigned short) g_ascii_strtoull(optarg, NULL, 10);
break;
default:
- printf("Invalid argument <%s>. Try --help.\n", argv[optind - 1]);
+ g_printf("Invalid argument <%s>. Try --help.\n", argv[optind - 1]);
return -1;
}
}
@@ -2369,7 +2371,7 @@ int main(int argc, char **argv) {
result = WSAStartup(MAKEWORD(1,1), &wsaData);
if (result != 0) {
if (verbose)
- printf("ERROR: WSAStartup failed with error: %d\n", result);
+ g_printf("ERROR: WSAStartup failed with error: %d\n", result);
return 1;
}
#endif /* _WIN32 */
@@ -2378,7 +2380,7 @@ int main(int argc, char **argv) {
return list_interfaces(adb_server_ip, adb_server_tcp_port);
if (fifo == NULL) {
- printf("ERROR: No FIFO or file specified\n");
+ g_printf("ERROR: No FIFO or file specified\n");
return 1;
}