Skip to content

Commit 98ff89d

Browse files
skbehskbeh
committed
fix gtk warning and battery level not shown
1. Not reset gtk widgets when gtk main loop has stopped. 2. Wait until battery level info is received (currently always 1s), because level info is actually sent later so mostly `recv` returns before the client sends.
1 parent 995a3f8 commit 98ff89d

File tree

4 files changed

+71
-42
lines changed

4 files changed

+71
-42
lines changed

‎src/av.c‎

Lines changed: 47 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#include "decoder.h"
1313
#include <stdbool.h>
1414
#include <stdint.h>
15+
#include <string.h>
16+
#include <sys/socket.h>
1517

1618
extern int a_active;
1719
extern int v_active;
@@ -39,56 +41,81 @@ SOCKET GetConnection(void) {
3941
// Battry Check thread
4042
void *BatteryThreadProc(__attribute__((__unused__)) void *args) {
4143
SOCKET socket = INVALID_SOCKET;
42-
char buf[128] = {0};
43-
char battery_value[32] = {0};
44-
int i, j;
44+
char buf[96];
45+
char battery_value[5];
46+
struct timeval tv = {0};
47+
tv.tv_sec = 1;
4548

4649
dbgprint("Battery Thread Start\n");
4750

4851
while (v_running || a_running) {
49-
if (!v_active && !a_active) {
52+
if (!v_active && !a_active) {
5053
usleep(50000);
5154
continue;
5255
}
5356

57+
uint8_t battery_value_pos = 0;
58+
size_t percent_len = 0;
59+
5460
socket = GetConnection();
5561
if (socket == INVALID_SOCKET) {
5662
goto LOOP;
5763
}
5864

59-
if (Send(BATTERY_REQ, CSTR_LEN(BATTERY_REQ), socket) <= 0) {
60-
errprint("error sending battery status request: (%d) '%s'\n",
61-
errno, strerror(errno));
65+
if (setsockopt(socket, SOL_SOCKET, SO_RCVTIMEO, (const char *)&tv,
66+
sizeof(tv)) == -1) {
67+
goto LOOP;
68+
};
69+
70+
if (!Send(BATTERY_REQ, CSTR_LEN(BATTERY_REQ), socket)) {
71+
errprint("error sending battery status request: (%d) '%s'\n", errno,
72+
strerror(errno));
6273
goto LOOP;
6374
}
6475

6576
memset(buf, 0, sizeof(buf));
77+
memset(battery_value, 0, sizeof(battery_value));
6678
if (RecvAll(buf, sizeof(buf), socket) <= 0) {
6779
goto LOOP;
6880
}
6981

70-
for (i = 0; i < (sizeof(buf)-4); i++) {
71-
if (buf[i] == '\r' && buf[i+1] == '\n' && buf[i+2] == '\r' && buf[i+3] == '\n') {
72-
i += 4;
82+
for (uint8_t i = 0; i < (sizeof(buf) - 4); i += 4) {
83+
char *tmp = memchr(&buf[i], '\r', sizeof(buf));
84+
if (!tmp) {
85+
goto LOOP;
86+
}
87+
if (memcmp(tmp + 1, "\n\r\n", 3) == 0) {
88+
battery_value_pos = (tmp - buf) + 4;
7389
break;
7490
}
7591
}
92+
if (!battery_value_pos || battery_value_pos > (sizeof(buf) - (4 + 1)) ||
93+
buf[battery_value_pos] == '0') {
94+
goto LOOP;
95+
}
7696

77-
j = 0;
78-
while (i < sizeof(buf) && j < (sizeof(battery_value)-2) && buf[i] >= '0' && buf[i] <= '9')
79-
battery_value[j++] = buf[i++];
97+
for (uint8_t j = 0; j < 3; j++) {
98+
if (buf[battery_value_pos + j] >= '0' &&
99+
buf[battery_value_pos + j] <= '9') {
100+
battery_value[j] = buf[battery_value_pos + j];
101+
percent_len++;
102+
} else {
103+
break;
104+
}
105+
}
80106

81-
if (j == 0)
82-
battery_value[j++] = '-';
107+
if (percent_len == 0) {
108+
battery_value[0] = '-';
109+
percent_len = 1;
110+
}
83111

84-
battery_value[j++] = '%';
85-
battery_value[j++] = 0;
112+
battery_value[percent_len] = '%';
86113
dbgprint("battery_value: %s\n", battery_value);
87114
UpdateBatteryLabel(battery_value);
88115

89116
LOOP:
90117
disconnect(socket);
91-
for (j = 0; j < 30000 && (v_running || a_running); j++)
118+
for (uint16_t i = 0; i < 30000 && (v_running || a_running); i++)
92119
usleep(1000);
93120
}
94121

@@ -126,8 +153,7 @@ void *VideoThreadProc(void *args) {
126153
}
127154

128155
len = snprintf(buf, sizeof(buf), VIDEO_REQ, decoder_get_video_width(), decoder_get_video_height());
129-
if (Send(buf, len, videoSocket) <= 0){
130-
errprint("send error (%d) '%s'\n", errno, strerror(errno));
156+
if (!Send(buf, len, videoSocket)){
131157
MSG_ERROR("Error sending request, DroidCam might be busy with another client.");
132158
goto early_out;
133159
}
@@ -246,9 +272,8 @@ void *AudioThreadProc(void *arg) {
246272
return 0;
247273
}
248274

249-
if (Send(AUDIO_REQ, CSTR_LEN(AUDIO_REQ), socket) <= 0) {
275+
if (!Send(AUDIO_REQ, CSTR_LEN(AUDIO_REQ), socket)) {
250276
errprint("send error (audio) (%d) '%s'\n", errno, strerror(errno));
251-
MSG_ERROR("Error sending audio request");
252277
goto early_out;
253278
}
254279

‎src/connection.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,41 +86,41 @@ SOCKET Connect(const char* ip, int port, const char **errormsg) {
8686
return sock;
8787
}
8888

89-
int Send(const char * buffer, int bytes, SOCKET s) {
89+
bool Send(const char * buffer, int bytes, SOCKET s) {
9090
ssize_t w = 0;
9191
char *ptr = (char*) buffer;
9292
while (bytes > 0) {
9393
w = send(s, ptr, bytes, 0);
9494
if (w <= 0) {
95-
return -1;
95+
return false;
9696
}
9797
bytes -= w;
9898
ptr += w;
9999
}
100-
return 1;
100+
return true;
101101
}
102102

103-
int Recv(const char* buffer, int bytes, SOCKET s) {
103+
ssize_t Recv(const char* buffer, int bytes, SOCKET s) {
104104
return recv(s, (char*)buffer, bytes, 0);
105105
}
106106

107-
int RecvAll(const char* buffer, int bytes, SOCKET s) {
107+
ssize_t RecvAll(const char* buffer, int bytes, SOCKET s) {
108108
return recv(s, (char*)buffer, bytes, MSG_WAITALL);
109109
}
110110

111-
int RecvNonBlock(char * buffer, int bytes, SOCKET s) {
111+
ssize_t RecvNonBlock(char * buffer, int bytes, SOCKET s) {
112112
int res = recv(s, buffer, bytes, MSG_DONTWAIT);
113113
return (res < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) ? 0 : res;
114114
}
115115

116-
int RecvNonBlockUDP(char * buffer, int bytes, SOCKET s) {
116+
ssize_t RecvNonBlockUDP(char * buffer, int bytes, SOCKET s) {
117117
struct sockaddr_in from;
118118
socklen_t fromLen = sizeof(from);
119119
int res = recvfrom(s, buffer, bytes, MSG_DONTWAIT, (struct sockaddr *)&from, &fromLen);
120120
return (res < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) ? 0 : res;
121121
}
122122

123-
int SendUDPMessage(SOCKET s, const char *message, int length, char *ip, int port) {
123+
ssize_t SendUDPMessage(SOCKET s, const char *message, int length, char *ip, int port) {
124124
struct sockaddr_in sin;
125125
sin.sin_port = htons((uint16_t)port);
126126
sin.sin_family = AF_INET;

‎src/connection.h‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
#ifndef __CONN_H__
1010
#define __CONN_H__
1111

12+
#include <stdbool.h>
13+
#include <sys/types.h>
14+
1215
#define INVALID_SOCKET -1
1316
typedef int SOCKET;
1417
typedef long int SOCKET_PTR;
@@ -19,11 +22,11 @@ void disconnect(SOCKET s);
1922

2023
SOCKET accept_connection(int port);
2124
SOCKET CreateUdpSocket(void);
22-
int Send(const char * buffer, int bytes, SOCKET s);
23-
int Recv(const char * buffer, int bytes, SOCKET s);
24-
int RecvAll(const char * buffer, int bytes, SOCKET s);
25-
int RecvNonBlock(char * buffer, int bytes, SOCKET s);
26-
int RecvNonBlockUDP(char * buffer, int bytes, SOCKET s);
27-
int SendUDPMessage(SOCKET s, const char *message, int length, char *ip, int port);
25+
bool Send(const char * buffer, int bytes, SOCKET s);
26+
ssize_t Recv(const char * buffer, int bytes, SOCKET s);
27+
ssize_t RecvAll(const char * buffer, int bytes, SOCKET s);
28+
ssize_t RecvNonBlock(char * buffer, int bytes, SOCKET s);
29+
ssize_t RecvNonBlockUDP(char * buffer, int bytes, SOCKET s);
30+
ssize_t SendUDPMessage(SOCKET s, const char *message, int length, char *ip, int port);
2831

2932
#endif

‎src/droidcam.c‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void UpdateBatteryLabel(char *battery_value) {
106106
gtk_label_set_text(GTK_LABEL(batteryText), battery_value);
107107
}
108108

109-
static void Stop(void) {
109+
static void stop_av(void) {
110110
a_running = false;
111111
v_running = false;
112112
dbgprint("join\n");
@@ -126,9 +126,9 @@ static void Stop(void) {
126126
g_thread_join(hBatteryThread);
127127
hBatteryThread = NULL;
128128
}
129+
}
129130

130-
a_active = false;
131-
v_active = false;
131+
static void reset_ui(void) {
132132
gtk_widget_set_sensitive(GTK_WIDGET(elButton), FALSE);
133133
gtk_widget_set_sensitive(GTK_WIDGET(wbButton), FALSE);
134134
gtk_widget_set_sensitive(GTK_WIDGET(menuButton), FALSE);
@@ -260,7 +260,8 @@ static void the_callback(GtkWidget* widget, gpointer extra)
260260
switch (cb) {
261261
case CB_BUTTON:
262262
if (v_running || a_running) {
263-
Stop();
263+
reset_ui();
264+
stop_av();
264265
cb = (int)g_settings.connection;
265266
goto _up;
266267
}
@@ -669,7 +670,7 @@ int main(int argc, char *argv[])
669670
g_signal_connect(window, "delete-event", G_CALLBACK(delete_window_callback), window);
670671
gtk_widget_show_all(window);
671672

672-
Stop(); // reset the UI
673+
reset_ui();
673674
LoadSettings(&g_settings);
674675
if (argc >= 1) {
675676
parse_args(argc, argv);
@@ -716,7 +717,7 @@ int main(int argc, char *argv[])
716717

717718
// main loop
718719
gtk_main();
719-
Stop();
720+
stop_av();
720721
decoder_fini();
721722
connection_cleanup();
722723
SaveSettings(&g_settings);

0 commit comments

Comments
 (0)