aboutsummaryrefslogtreecommitdiffstats
path: root/extcap
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2015-12-05 10:16:46 +0100
committerPascal Quantin <pascal.quantin@gmail.com>2015-12-08 16:32:51 +0000
commit1a1893ad54a402bda3b77262ecaf68cfe9831368 (patch)
treed0f71264fb9ffa0409a0c9f8d071aeb78c5529fc /extcap
parent2f2c8788a93f84b239fc0c0aaf158656d298c6d1 (diff)
androiddump: fix crash on Windows when running in verbose mode
As explained in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6695#c2 g_frpintf unfortunately crashed on Windows. Let's go back to fprintf instead. It will create warnings with MSVC2015 but we do not use it officially yet and at least androiddump will be working correctly again. Change-Id: Idfdb608576e18af63650af80e01bcda36dd81ac4 Reviewed-on: https://code.wireshark.org/review/12435 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'extcap')
-rw-r--r--extcap/androiddump.c266
1 files changed, 133 insertions, 133 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index 6c1359b691..ec30e2dc88 100644
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -259,7 +259,7 @@ static struct extcap_dumper extcap_dumper_open(char *fifo, int encap) {
encap_ext = DLT_EN10MB;
else {
if (verbose)
- g_fprintf(stderr, "ERROR: Unknown encapsulation\n");
+ fprintf(stderr, "ERROR: Unknown encapsulation\n");
exit(1);
}
@@ -267,7 +267,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)
- g_fprintf(stderr, "ERROR: Cannot save dump file\n");
+ fprintf(stderr, "ERROR: Cannot save dump file\n");
exit(1);
}
extcap_dumper.encap = encap;
@@ -283,14 +283,14 @@ static struct extcap_dumper extcap_dumper_open(char *fifo, int encap) {
encap_ext = WTAP_ENCAP_ETHERNET;
else {
if (verbose)
- g_fprintf(stderr, "ERROR: Unknown encapsulation\n");
+ 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)
- g_fprintf(stderr, "ERROR: Cannot save dump file\n");
+ fprintf(stderr, "ERROR: Cannot save dump file\n");
exit(1);
}
extcap_dumper.encap = encap;
@@ -371,7 +371,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)
- g_fprintf(stderr, "ERROR: Cannot open system TCP socket: %s\n", strerror(errno));
+ fprintf(stderr, "ERROR: Cannot open system TCP socket: %s\n", strerror(errno));
return INVALID_SOCKET;
}
@@ -390,20 +390,20 @@ static socket_handle_t adb_connect(const char *server_ip, unsigned short *server
if (execlp("adb", "adb", "start-server", NULL)) {
#endif
if (verbose)
- g_fprintf(stderr, "WARNING: Cannot execute system command to start adb: %s\n", strerror(errno));
+ 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)
- g_fprintf(stderr, "ERROR: Cannot connect to ADB: <%s> Please check that adb daemon is running.\n", strerror(errno));
+ 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) {
- g_fprintf(stderr, "ERROR: Cannot connect to ADB: <%s> Please check that adb daemon is running.\n", strerror(errno));
+ fprintf(stderr, "ERROR: Cannot connect to ADB: <%s> Please check that adb daemon is running.\n", strerror(errno));
}
closesocket(sock);
return INVALID_SOCKET;
@@ -415,18 +415,18 @@ static socket_handle_t adb_connect(const char *server_ip, unsigned short *server
length = sizeof(client);
if (getsockname(sock, (struct sockaddr *) &client, &length)) {
- g_fprintf(stderr, "ERROR getsockname: %s\n", strerror(errno));
+ fprintf(stderr, "ERROR getsockname: %s\n", strerror(errno));
closesocket(sock);
return INVALID_SOCKET;
}
if (length != sizeof(client)) {
- g_fprintf(stderr, "ERROR: incorrect length\n");
+ fprintf(stderr, "ERROR: incorrect length\n");
closesocket(sock);
return INVALID_SOCKET;
}
- g_fprintf(stderr, "VERBOSE: Client port %u\n", GUINT16_FROM_BE(client.sin_port));
+ fprintf(stderr, "VERBOSE: Client port %u\n", GUINT16_FROM_BE(client.sin_port));
}
return sock;
@@ -444,7 +444,7 @@ static char *adb_send_and_receive(socket_handle_t sock, const char *adb_service,
result = send(sock, adb_service, (int)strlen(adb_service), 0);
if (result != (gssize) strlen(adb_service)) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while sending <%s> to ADB\n", adb_service);
+ fprintf(stderr, "ERROR: Error while sending <%s> to ADB\n", adb_service);
if (data_length)
*data_length = 0;
return 0;
@@ -470,7 +470,7 @@ static char *adb_send_and_receive(socket_handle_t sock, const char *adb_service,
if (memcmp(status, "OKAY", 4)) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while receiving by ADB for <%s>\n", adb_service);
+ fprintf(stderr, "ERROR: Error while receiving by ADB for <%s>\n", adb_service);
if (data_length)
*data_length = 0;
return 0;
@@ -489,7 +489,7 @@ static char *adb_send_and_read(socket_handle_t sock, const char *adb_service, ch
result = send(sock, adb_service, (int)strlen(adb_service), 0);
if (result != (gssize) strlen(adb_service)) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while sending <%s> to ADB\n", adb_service);
+ fprintf(stderr, "ERROR: Error while sending <%s> to ADB\n", adb_service);
if (data_length)
*data_length = 0;
return 0;
@@ -513,7 +513,7 @@ static char *adb_send_and_read(socket_handle_t sock, const char *adb_service, ch
if (memcmp(status, "OKAY", 4)) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while receiving by ADB for <%s>\n", adb_service);
+ fprintf(stderr, "ERROR: Error while receiving by ADB for <%s>\n", adb_service);
if (data_length)
*data_length = 0;
return 0;
@@ -531,7 +531,7 @@ static int adb_send(socket_handle_t sock, const char *adb_service) {
result = send(sock, adb_service, (int)strlen(adb_service), 0);
if (result != (gssize) strlen(adb_service)) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while sending <%s> to ADB\n", adb_service);
+ fprintf(stderr, "ERROR: Error while sending <%s> to ADB\n", adb_service);
return 1;
}
@@ -542,7 +542,7 @@ static int adb_send(socket_handle_t sock, const char *adb_service) {
if (memcmp(buffer, "OKAY", 4)) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while receiving by ADB for <%s>\n", adb_service);
+ fprintf(stderr, "ERROR: Error while receiving by ADB for <%s>\n", adb_service);
return 2;
}
@@ -599,7 +599,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
pos = strchr(pos, '\n') + 1;
if (result >= (int) sizeof(serial_number)) {
if (verbose)
- g_fprintf(stderr, "WARNING: Serial number too long, ignore device\n");
+ fprintf(stderr, "WARNING: Serial number too long, ignore device\n");
continue;
}
memcpy(serial_number, prev_pos, result);
@@ -613,7 +613,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -645,7 +645,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -655,7 +655,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
response[data_length] = '\0';
api_level = (int) g_ascii_strtoll(response, NULL, 10);
if (verbose)
- g_fprintf(stderr, "VERBOSE: Android API Level for %s is %i\n", serial_number, api_level);
+ 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);
@@ -780,7 +780,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -789,8 +789,8 @@ static int add_android_interfaces(struct interface_t **interface_list,
closesocket(sock);
if (!response || data_length < 1) {
if (verbose) {
- 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);
+ 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);
}
disable_interface = 1;
} else {
@@ -798,11 +798,11 @@ static int add_android_interfaces(struct interface_t **interface_list,
if (g_ascii_strtoull(response, NULL, 10) == 0) {
if (verbose)
- g_fprintf(stderr, "VERBOSE: Android hcidump version for %s is unknown\n", serial_number);
+ fprintf(stderr, "VERBOSE: Android hcidump version for %s is unknown\n", serial_number);
disable_interface = 1;
} else {
if (verbose)
- g_fprintf(stderr, "VERBOSE: Android hcidump version for %s is %s\n", serial_number, response);
+ fprintf(stderr, "VERBOSE: Android hcidump version for %s is %s\n", serial_number, response);
}
}
@@ -829,7 +829,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -838,8 +838,8 @@ static int add_android_interfaces(struct interface_t **interface_list,
closesocket(sock);
if (!response || data_length < 1) {
if (verbose) {
- 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);
+ 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);
}
disable_interface = 1;
} else {
@@ -851,7 +851,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)
- g_fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is %s\n", serial_number, pid);
+ 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);
@@ -859,7 +859,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -872,16 +872,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)
- g_fprintf(stderr, "VERBOSE: Bluedroid External Parser Port for %s is %s\n", serial_number, pid + 9);
+ fprintf(stderr, "VERBOSE: Bluedroid External Parser Port for %s is %s\n", serial_number, pid + 9);
} else {
disable_interface = 1;
if (verbose)
- g_fprintf(stderr, "VERBOSE: Bluedroid External Parser Port for %s is unknown\n", serial_number);
+ fprintf(stderr, "VERBOSE: Bluedroid External Parser Port for %s is unknown\n", serial_number);
}
} else {
disable_interface = 1;
if (verbose)
- g_fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
+ fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
}
}
@@ -908,7 +908,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -920,8 +920,8 @@ static int add_android_interfaces(struct interface_t **interface_list,
closesocket(sock);
if (!response || data_length < 1) {
if (verbose) {
- 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);
+ 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);
}
disable_interface = 1;
} else {
@@ -933,7 +933,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)
- g_fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is %s\n", serial_number, pid);
+ 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);
@@ -941,7 +941,7 @@ static int add_android_interfaces(struct interface_t **interface_list,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -954,16 +954,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)
- g_fprintf(stderr, "VERBOSE: Btsnoop Net Port for %s is %s\n", serial_number, pid + 9);
+ fprintf(stderr, "VERBOSE: Btsnoop Net Port for %s is %s\n", serial_number, pid + 9);
} else {
disable_interface = 1;
if (verbose)
- g_fprintf(stderr, "VERBOSE: Btsnoop Net Port for %s is unknown\n", serial_number);
+ fprintf(stderr, "VERBOSE: Btsnoop Net Port for %s is unknown\n", serial_number);
}
} else {
disable_interface = 1;
if (verbose)
- g_fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
+ fprintf(stderr, "VERBOSE: Android Bluetooth application PID for %s is unknown\n", serial_number);
}
}
@@ -994,7 +994,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)
- g_printf("interface {display=%s}{value=%s}\n",
+ printf("interface {display=%s}{value=%s}\n",
i_interface->display_name,
i_interface->interface_name);
@@ -1004,14 +1004,14 @@ static int list_interfaces(const char *server_ip, unsigned short *server_tcp_por
static int list_dlts(char *interface) {
if (!interface) {
- g_fprintf(stderr, "ERROR: No interface specified.\n");
+ 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)) {
- g_printf("dlt {number=99}{name=BluetoothH4}{display=Bluetooth HCI UART transport layer plus pseudo-header}\n");
+ 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) ||
@@ -1022,26 +1022,26 @@ 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)) {
- g_printf("dlt {number=252}{name=Upper PDU}{display=Upper PDU}\n");
+ printf("dlt {number=252}{name=Upper PDU}{display=Upper PDU}\n");
return 0;
} else if (is_specified_interface(interface, INTERFACE_ANDROID_WIFI_TCPDUMP)) {
- g_printf("dlt {number=1}{name=Ethernet}{display=Ethernet}\n");
+ printf("dlt {number=1}{name=Ethernet}{display=Ethernet}\n");
return 0;
}
- g_fprintf(stderr, "ERROR: Invalid interface: <%s>\n", interface);
+ fprintf(stderr, "ERROR: Invalid interface: <%s>\n", interface);
return 1;
}
static int list_config(char *interface) {
if (!interface) {
- g_fprintf(stderr, "ERROR: No interface specified.\n");
+ fprintf(stderr, "ERROR: No interface specified.\n");
return 1;
}
if (is_specified_interface(interface, INTERFACE_ANDROID_BLUETOOTH_EXTERNAL_PARSER)) {
- g_printf("arg {number=0}{call=--adb-server-ip}{display=ADB Server IP Address}{type=string}{default=127.0.0.1}\n"
+ 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"
@@ -1052,7 +1052,7 @@ static int list_config(char *interface) {
} else if (is_specified_interface(interface, INTERFACE_ANDROID_BLUETOOTH_HCIDUMP) ||
is_specified_interface(interface, INTERFACE_ANDROID_BLUETOOTH_BTSNOOP_NET) ||
is_specified_interface(interface, INTERFACE_ANDROID_WIFI_TCPDUMP)) {
- g_printf("arg {number=0}{call=--adb-server-ip}{display=ADB Server IP Address}{type=string}{default=127.0.0.1}\n"
+ 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;
@@ -1060,7 +1060,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)) {
- g_printf("arg {number=0}{call=--adb-server-ip}{display=ADB Server IP Address}{type=string}{default=127.0.0.1}\n"
+ 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");
@@ -1070,13 +1070,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)) {
- g_printf("arg {number=0}{call=--adb-server-ip}{display=ADB Server IP Address}{type=string}{default=127.0.0.1}\n"
+ 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;
}
- g_fprintf(stderr, "ERROR: Invalid interface: <%s>\n", interface);
+ fprintf(stderr, "ERROR: Invalid interface: <%s>\n", interface);
return 1;
}
@@ -1084,16 +1084,16 @@ static int list_config(char *interface) {
static void help(void) {
unsigned int i_opt;
- g_printf("Help\n");
- g_printf(" Usage:\n"
+ printf("Help\n");
+ 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");
- g_printf("\n Parameters:\n");
+ printf("\n Parameters:\n");
for (i_opt = 0; i_opt < (sizeof(longopts) / sizeof(longopts[0])) - 1; i_opt += 1) {
- g_printf(" --%s%s\n", longopts[i_opt].name,
+ printf(" --%s%s\n", longopts[i_opt].name,
(longopts[i_opt].has_arg == required_argument) ? "=<arg>" :
((longopts[i_opt].has_arg == optional_argument) ? "[=arg]" : ""));
}
@@ -1150,7 +1150,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
result = adb_send(sock, adb_transport);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
closesocket(sock);
return 1;
}
@@ -1159,7 +1159,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -1168,7 +1168,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
result = adb_send(sock, adb_shell_hcidump);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while starting capture by sending command: %s\n", adb_shell_hcidump);
+ fprintf(stderr, "ERROR: Error while starting capture by sending command: %s\n", adb_shell_hcidump);
closesocket(sock);
return 1;
}
@@ -1181,7 +1181,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
else if (errno != 0) {
if (verbose)
- g_printf("ERROR capture: %s\n", strerror(errno));
+ printf("ERROR capture: %s\n", strerror(errno));
closesocket(sock);
return 100;
}
@@ -1193,7 +1193,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
if (!strncmp(data, "/system/bin/sh: hcidump: not found", 34)) {
if (verbose)
- g_fprintf(stderr, "ERROR: Command not found for <%s>\n", adb_shell_hcidump);
+ fprintf(stderr, "ERROR: Command not found for <%s>\n", adb_shell_hcidump);
closesocket(sock);
return 2;
}
@@ -1203,7 +1203,7 @@ 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)
- g_fprintf(stderr, "WARNING: No permission for command <%s>\n", adb_shell_hcidump);
+ fprintf(stderr, "WARNING: No permission for command <%s>\n", adb_shell_hcidump);
used_buffer_length = 0;
try_next += 1;
break;
@@ -1224,7 +1224,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
result = adb_send(sock, helpful_packet);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet);
closesocket(sock);
return 1;
}
@@ -1232,7 +1232,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
result = adb_send(sock, adb_shell_su_hcidump);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while starting capture by sending command: <%s>\n", adb_shell_su_hcidump);
+ fprintf(stderr, "ERROR: Error while starting capture by sending command: <%s>\n", adb_shell_su_hcidump);
closesocket(sock);
return 1;
}
@@ -1246,7 +1246,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
else if (errno != 0) {
if (verbose)
- g_printf("ERROR capture: %s\n", strerror(errno));
+ printf("ERROR capture: %s\n", strerror(errno));
closesocket(sock);
return 100;
}
@@ -1256,7 +1256,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)
- g_fprintf(stderr, "ERROR: Command 'su' not found for <%s>\n", adb_shell_su_hcidump);
+ fprintf(stderr, "ERROR: Command 'su' not found for <%s>\n", adb_shell_su_hcidump);
closesocket(sock);
return 2;
}
@@ -1278,7 +1278,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
else if (errno != 0) {
if (verbose)
- g_printf("ERROR capture: %s\n", strerror(errno));
+ printf("ERROR capture: %s\n", strerror(errno));
closesocket(sock);
return 100;
}
@@ -1297,7 +1297,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
if (hex < 0 || hex >= 256 || hex_data == new_hex_data) {
if (verbose)
- g_printf("ERROR: data format error: %s\n", strerror(errno));
+ printf("ERROR: data format error: %s\n", strerror(errno));
closesocket(sock);
return 101;
}
@@ -1306,7 +1306,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
if (hex < 0 || hex >= 256 || hex_data == new_hex_data) {
if (verbose)
- g_printf("ERROR: data format error: %s\n", strerror(errno));
+ printf("ERROR: data format error: %s\n", strerror(errno));
closesocket(sock);
return 101;
}
@@ -1320,7 +1320,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
if (hex < 0 || hex >= 256 || hex_data == new_hex_data) {
if (verbose)
- g_printf("ERROR: data format error: %s\n", strerror(errno));
+ printf("ERROR: data format error: %s\n", strerror(errno));
closesocket(sock);
return 101;
}
@@ -1334,7 +1334,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
if (hex < 0 || hex >= 256 || hex_data == new_hex_data) {
if (verbose)
- g_printf("ERROR: data format error: %s\n", strerror(errno));
+ printf("ERROR: data format error: %s\n", strerror(errno));
closesocket(sock);
return 101;
}
@@ -1343,7 +1343,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
hex = g_ascii_strtoll(hex_data, &new_hex_data, 16);
if (hex < 0 || hex >= 256 || hex_data == new_hex_data) {
if (verbose)
- g_printf("ERROR: data format error: %s\n", strerror(errno));
+ printf("ERROR: data format error: %s\n", strerror(errno));
closesocket(sock);
return 101;
}
@@ -1359,7 +1359,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
} else {
if (verbose)
- g_fprintf(stderr, "ERROR: bad raw stream\n");
+ fprintf(stderr, "ERROR: bad raw stream\n");
closesocket(sock);
return 1;
}
@@ -1380,7 +1380,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
&date.tm_min, &date.tm_sec, &ms, &direction_character)) {
if (verbose) {
- g_fprintf(stderr, "time %04d-%02d-%02d %02d:%02d:%02d.%06d %c\n",
+ 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);
}
@@ -1493,12 +1493,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)
- g_printf("ERROR: Cannot open system TCP socket: %s\n", strerror(errno));
+ printf("ERROR: Cannot open system TCP socket: %s\n", strerror(errno));
return 1;
}
if (verbose) {
- g_printf("Using config: Server TCP Port=%u, Local IP=%s, Local TCP Port=%u\n",
+ 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);
}
@@ -1507,7 +1507,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)
- g_printf("DO: adb forward tcp:%u (local) tcp:%u (remote) result=%i\n",
+ printf("DO: adb forward tcp:%u (local) tcp:%u (remote) result=%i\n",
*bt_local_tcp_port, *bt_server_tcp_port, result);
}
@@ -1518,7 +1518,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
if (connect(sock, (struct sockaddr *) &server, sizeof(server)) == SOCKET_ERROR) {
if (verbose)
- g_printf("ERROR: <%s> Please check that adb daemon is running.\n\n", strerror(errno));
+ printf("ERROR: <%s> Please check that adb daemon is running.\n\n", strerror(errno));
closesocket(sock);
return 2;
}
@@ -1528,18 +1528,18 @@ static int capture_android_bluetooth_external_parser(char *interface,
length = sizeof(client);
if (getsockname(sock, (struct sockaddr *) &client, (socklen_t *) &length)) {
- g_printf("ERROR getsockname: %s\n", strerror(errno));
+ printf("ERROR getsockname: %s\n", strerror(errno));
closesocket(sock);
return 3;
}
if (length != sizeof(client)) {
- g_printf("ERROR: incorrect length\n");
+ printf("ERROR: incorrect length\n");
closesocket(sock);
return 4;
}
- g_printf("VERBOSE: Client port %u\n", GUINT16_FROM_BE(client.sin_port));
+ printf("VERBOSE: Client port %u\n", GUINT16_FROM_BE(client.sin_port));
}
} else {
int result;
@@ -1552,7 +1552,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
result = adb_send(sock, adb_transport);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport\n");
+ fprintf(stderr, "ERROR: Error while setting adb transport\n");
closesocket(sock);
return 1;
}
@@ -1561,7 +1561,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
result = adb_send(sock, buffer);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport\n");
+ fprintf(stderr, "ERROR: Error while setting adb transport\n");
closesocket(sock);
return 1;
}
@@ -1571,7 +1571,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
result = adb_send(sock, buffer);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while forwarding adb port\n");
+ fprintf(stderr, "ERROR: Error while forwarding adb port\n");
closesocket(sock);
return 1;
}
@@ -1583,7 +1583,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
else if (errno != 0) {
if (verbose)
- g_printf("ERROR capture: %s\n", strerror(errno));
+ printf("ERROR capture: %s\n", strerror(errno));
closesocket(sock);
return 100;
}
@@ -1592,12 +1592,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)
- g_printf("WARNING: Broken socket connection. Try reconnect.\n");
+ printf("WARNING: Broken socket connection. Try reconnect.\n");
closesocket(sock);
if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == INVALID_SOCKET) {
if (verbose)
- g_printf("ERROR1: %s\n", strerror(errno));
+ printf("ERROR1: %s\n", strerror(errno));
return 1;
}
@@ -1607,13 +1607,13 @@ static int capture_android_bluetooth_external_parser(char *interface,
if (connect(sock, (struct sockaddr *) &server, sizeof(server)) == SOCKET_ERROR) {
if (verbose)
- g_printf("ERROR reconnect: <%s> Please check that adb daemon is running.\n", strerror(errno));
+ printf("ERROR reconnect: <%s> Please check that adb daemon is running.\n", strerror(errno));
closesocket(sock);
return 2;
}
} else {
if (verbose)
- g_printf("ERROR: Broken socket connection.\n");
+ printf("ERROR: Broken socket connection.\n");
closesocket(sock);
return 1;
}
@@ -1623,7 +1623,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
used_buffer_length += length;
- if (verbose) g_printf("Received: length=%"G_GSSIZE_FORMAT"\n", length);
+ if (verbose) 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 &&
@@ -1675,16 +1675,16 @@ static int capture_android_bluetooth_external_parser(char *interface,
break;
default:
if (verbose)
- g_printf("ERROR: Invalid stream\n");
+ printf("ERROR: Invalid stream\n");
closesocket(sock);
return 1;
}
if (verbose) {
static unsigned int id = 1;
- 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]);
+ 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)
- g_printf("\t Packet: %02x %02x %02x\n", (unsigned int) payload[0], (unsigned int) payload[1], (unsigned int)payload[2]);
+ printf("\t Packet: %02x %02x %02x\n", (unsigned int) payload[0], (unsigned int) payload[1], (unsigned int)payload[2]);
id +=1;
}
@@ -1699,7 +1699,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)
- g_printf("ERROR: Internal error: Negative used buffer length.\n");
+ printf("ERROR: Internal error: Negative used buffer length.\n");
closesocket(sock);
return 1;
}
@@ -1759,7 +1759,7 @@ static int capture_android_bluetooth_btsnoop_net(char *interface, char *fifo,
result = adb_send(sock, adb_transport);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
return 1;
}
} else {
@@ -1767,7 +1767,7 @@ static int capture_android_bluetooth_btsnoop_net(char *interface, char *fifo,
result = adb_send(sock, packet);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", packet);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", packet);
closesocket(sock);
return 1;
}
@@ -1776,7 +1776,7 @@ static int capture_android_bluetooth_btsnoop_net(char *interface, char *fifo,
result = adb_send(sock, adb_tcp_btsnoop_net);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while sending command <%s>\n", adb_tcp_btsnoop_net);
+ fprintf(stderr, "ERROR: Error while sending command <%s>\n", adb_tcp_btsnoop_net);
closesocket(sock);
return 1;
}
@@ -1798,14 +1798,14 @@ static int capture_android_bluetooth_btsnoop_net(char *interface, char *fifo,
if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
else if (errno != 0) {
if (verbose)
- g_printf("ERROR capture: %s\n", strerror(errno));
+ printf("ERROR capture: %s\n", strerror(errno));
closesocket(sock);
return 100;
}
if (length <= 0) {
if (verbose)
- g_printf("ERROR: Broken socket connection.\n");
+ printf("ERROR: Broken socket connection.\n");
closesocket(sock);
return 101;
}
@@ -1831,7 +1831,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)
- g_printf("ERROR: Internal error: Negative used buffer length.\n");
+ printf("ERROR: Internal error: Negative used buffer length.\n");
closesocket(sock);
return 1;
}
@@ -1903,7 +1903,7 @@ static int capture_android_logcat_text(char *interface, char *fifo,
result = adb_send(sock, adb_transport);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
closesocket(sock);
return 1;
}
@@ -1912,7 +1912,7 @@ static int capture_android_logcat_text(char *interface, char *fifo,
result = adb_send(sock, packet);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", packet);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", packet);
closesocket(sock);
return 1;
}
@@ -1929,7 +1929,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 {
- g_printf("ERROR: Unknown interface: <%s>\n", interface);
+ printf("ERROR: Unknown interface: <%s>\n", interface);
closesocket(sock);
return -1;
}
@@ -1939,7 +1939,7 @@ static int capture_android_logcat_text(char *interface, char *fifo,
result = adb_send(sock, packet);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while sending command <%s>\n", packet);
+ fprintf(stderr, "ERROR: Error while sending command <%s>\n", packet);
closesocket(sock);
return 1;
}
@@ -1966,14 +1966,14 @@ static int capture_android_logcat_text(char *interface, char *fifo,
if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
else if (errno != 0) {
if (verbose)
- g_printf("ERROR capture: %s\n", strerror(errno));
+ printf("ERROR capture: %s\n", strerror(errno));
closesocket(sock);
return 100;
}
if (length <= 0) {
if (verbose)
- g_printf("ERROR: Broken socket connection. Try reconnect.\n");
+ printf("ERROR: Broken socket connection. Try reconnect.\n");
closesocket(sock);
return 1;
}
@@ -2073,7 +2073,7 @@ static int capture_android_logcat(char *interface, char *fifo,
result = adb_send(sock, adb_transport);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport\n");
+ fprintf(stderr, "ERROR: Error while setting adb transport\n");
closesocket(sock);
return 1;
}
@@ -2082,7 +2082,7 @@ static int capture_android_logcat(char *interface, char *fifo,
result = adb_send(sock, packet);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport\n");
+ fprintf(stderr, "ERROR: Error while setting adb transport\n");
closesocket(sock);
return 1;
}
@@ -2097,7 +2097,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 {
- g_printf("ERROR: Unknown interface: <%s>\n", interface);
+ printf("ERROR: Unknown interface: <%s>\n", interface);
closesocket(sock);
return -1;
}
@@ -2105,7 +2105,7 @@ static int capture_android_logcat(char *interface, char *fifo,
result = adb_send(sock, adb_command);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while sending command <%s>\n", adb_command);
+ fprintf(stderr, "ERROR: Error while sending command <%s>\n", adb_command);
closesocket(sock);
return 1;
}
@@ -2142,7 +2142,7 @@ static int capture_android_logcat(char *interface, char *fifo,
if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
else if (errno != 0) {
if (verbose)
- g_printf("ERROR capture: %s\n", strerror(errno));
+ printf("ERROR capture: %s\n", strerror(errno));
closesocket(sock);
return 100;
}
@@ -2150,7 +2150,7 @@ static int capture_android_logcat(char *interface, char *fifo,
if (length <= 0) {
while (endless_loop) {
if (verbose)
- g_printf("WARNING: Broken socket connection. Try reconnect.\n");
+ printf("WARNING: Broken socket connection. Try reconnect.\n");
used_buffer_length = 0;
closesocket(sock);
@@ -2162,7 +2162,7 @@ static int capture_android_logcat(char *interface, char *fifo,
result = adb_send(sock, adb_transport);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", adb_transport);
closesocket(sock);
return 1;
}
@@ -2171,7 +2171,7 @@ static int capture_android_logcat(char *interface, char *fifo,
result = adb_send(sock, helper_packet);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helper_packet);
+ fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helper_packet);
closesocket(sock);
return 1;
}
@@ -2186,7 +2186,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 {
- g_printf("ERROR: Unknown interface: <%s>\n", interface);
+ printf("ERROR: Unknown interface: <%s>\n", interface);
closesocket(sock);
return 1;
}
@@ -2194,7 +2194,7 @@ static int capture_android_logcat(char *interface, char *fifo,
result = adb_send(sock, adb_command);
if (result) {
if (verbose)
- g_fprintf(stderr, "ERROR: Error while sending command <%s>\n", adb_command);
+ fprintf(stderr, "ERROR: Error while sending command <%s>\n", adb_command);
continue;
}
@@ -2319,10 +2319,10 @@ static int capture_android_wifi_tcpdump(char *interface, char *fifo,
result = adb_send(sock, adb_transport);
if (result) {
if (verbose)
- g_printf("ERROR: Error while setting adb transport");
+ printf("ERROR: Error while setting adb transport");
fflush(stdout);
- g_fprintf(stderr,
+ fprintf(stderr,
"ERROR: Error while setting adb transport for <%s>\n",
adb_transport);
closesocket(sock);
@@ -2333,10 +2333,10 @@ static int capture_android_wifi_tcpdump(char *interface, char *fifo,
15 + strlen(serial_number), serial_number);
result = adb_send(sock, helpful_packet);
if (result) {
- g_printf("ERROR: Error while setting adb transport");
+ printf("ERROR: Error while setting adb transport");
fflush(stdout);
if (verbose)
- g_fprintf(stderr,
+ fprintf(stderr,
"ERROR: Error while setting adb transport for <%s>\n",
helpful_packet);
closesocket(sock);
@@ -2345,10 +2345,10 @@ static int capture_android_wifi_tcpdump(char *interface, char *fifo,
}
result = adb_send(sock, adb_shell_tcpdump);
if (result) {
- g_printf("ERROR: Error while setting adb transport");
+ printf("ERROR: Error while setting adb transport");
fflush(stdout);
if (verbose)
- g_fprintf(stderr,
+ fprintf(stderr,
"ERROR: Error while starting capture by sending command: %s\n",
adb_shell_tcpdump);
closesocket(sock);
@@ -2364,7 +2364,7 @@ static int capture_android_wifi_tcpdump(char *interface, char *fifo,
continue;
else if (errno != 0) {
if (verbose)
- g_printf("ERROR capture: %s\n", strerror(errno));
+ printf("ERROR capture: %s\n", strerror(errno));
return 100;
}
used_buffer_length += length;
@@ -2477,7 +2477,7 @@ static int capture_android_wifi_tcpdump(char *interface, char *fifo,
}
else if (errno != 0) {
if (verbose)
- g_printf("ERROR capture: %s\n", strerror(errno));
+ printf("ERROR capture: %s\n", strerror(errno));
return 100;
}
if (length > 0 && (used_buffer_length += length)>1) {
@@ -2530,7 +2530,7 @@ int main(int argc, char **argv) {
switch (result) {
case OPT_VERSION:
- g_printf("%u.%u.%u\n", ANDROIDDUMP_VERSION_MAJOR, ANDROIDDUMP_VERSION_MINOR, ANDROIDDUMP_VERSION_RELEASE);
+ printf("%u.%u.%u\n", ANDROIDDUMP_VERSION_MAJOR, ANDROIDDUMP_VERSION_MINOR, ANDROIDDUMP_VERSION_RELEASE);
return 0;
case OPT_VERBOSE:
if (optarg)
@@ -2541,12 +2541,12 @@ int main(int argc, char **argv) {
if (verbose) {
int j = 0;
- g_fprintf(stderr, "VERBOSE: Command line: ");
+ fprintf(stderr, "VERBOSE: Command line: ");
while(j < argc) {
- g_fprintf(stderr, "%s ", argv[j]);
+ fprintf(stderr, "%s ", argv[j]);
j += 1;
}
- g_fprintf(stderr, "\n");
+ fprintf(stderr, "\n");
}
break;
case OPT_LIST_INTERFACES:
@@ -2610,7 +2610,7 @@ int main(int argc, char **argv) {
*bt_local_tcp_port = (unsigned short) g_ascii_strtoull(optarg, NULL, 10);
break;
default:
- g_printf("Invalid argument <%s>. Try --help.\n", argv[optind - 1]);
+ printf("Invalid argument <%s>. Try --help.\n", argv[optind - 1]);
return -1;
}
}
@@ -2640,7 +2640,7 @@ int main(int argc, char **argv) {
result = WSAStartup(MAKEWORD(1,1), &wsaData);
if (result != 0) {
if (verbose)
- g_printf("ERROR: WSAStartup failed with error: %d\n", result);
+ printf("ERROR: WSAStartup failed with error: %d\n", result);
return 1;
}
#endif /* _WIN32 */
@@ -2649,7 +2649,7 @@ int main(int argc, char **argv) {
return list_interfaces(adb_server_ip, adb_server_tcp_port);
if (fifo == NULL) {
- g_printf("ERROR: No FIFO or file specified\n");
+ printf("ERROR: No FIFO or file specified\n");
return 1;
}