Skip to content

Commit 5f54bef

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 f7944b7 commit 5f54bef

File tree

4 files changed

+83
-55
lines changed

4 files changed

+83
-55
lines changed

‎src/av.c‎

Lines changed: 59 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "decoder.h"
1313
#include <stdatomic.h>
1414
#include <stdint.h>
15+
#include <sys/socket.h>
1516

1617
extern atomic_bool a_running;
1718
extern atomic_bool v_running;
@@ -37,53 +38,74 @@ SOCKET GetConnection(void) {
3738
// Battry Check thread
3839
void *BatteryThreadProc(__attribute__((__unused__)) void *args) {
3940
SOCKET socket = INVALID_SOCKET;
40-
char buf[128];
41-
char battery_value[32];
42-
int i, j;
41+
char buf[96];
42+
char battery_value[5] = {0};
43+
struct timeval tv = {0};
44+
tv.tv_sec = 1;
4345

44-
memset(battery_value, 0, sizeof(battery_value));
4546
dbgprint("Battery Thread Start\n");
4647

4748
usleep(500000);
4849
while (v_running || a_running) {
49-
socket = GetConnection();
50-
if (socket == INVALID_SOCKET) {
51-
goto LOOP;
50+
uint8_t battery_value_pos = 0;
51+
size_t percent_len = 0;
52+
53+
socket = GetConnection();
54+
if (socket == INVALID_SOCKET) {
55+
goto LOOP;
56+
}
57+
58+
if (setsockopt(socket, SOL_SOCKET, SO_RCVTIMEO, (const char *)&tv,
59+
sizeof(tv)) == -1) {
60+
goto LOOP;
61+
};
62+
63+
if (!Send(BATTERY_REQ, CSTR_LEN(BATTERY_REQ), socket)) {
64+
errprint("error sending battery status request\n");
65+
goto LOOP;
66+
}
67+
68+
memset(buf, 0, sizeof(buf));
69+
if (RecvAll(buf, sizeof(buf), socket) <= 0) {
70+
goto LOOP;
71+
}
72+
73+
for (uint8_t i = 0; i < (sizeof(buf) - 4); i += 4) {
74+
char *tmp = memchr(&buf[i], '\r', sizeof(buf));
75+
if (!tmp) {
76+
goto LOOP;
5277
}
53-
54-
if (Send(BATTERY_REQ, CSTR_LEN(BATTERY_REQ), socket) <= 0) {
55-
errprint("error sending battery status request\n");
56-
goto LOOP;
57-
}
58-
59-
memset(buf, 0, sizeof(buf));
60-
if (Recv(buf, sizeof(buf), socket) <= 0) {
61-
goto LOOP;
78+
if (memcmp(tmp + 1, "\n\r\n", 3) == 0) {
79+
battery_value_pos = (tmp - buf) + 4;
80+
break;
6281
}
63-
64-
for (i = 0; i < (sizeof(buf)-4); i++) {
65-
if (buf[i] == '\r' && buf[i+1] == '\n' && buf[i+2] == '\r' && buf[i+3] == '\n') {
66-
i += 4;
67-
break;
68-
}
82+
}
83+
if (!battery_value_pos || battery_value_pos > (sizeof(buf) - (4 + 1)) ||
84+
buf[battery_value_pos] == '0') {
85+
goto LOOP;
86+
}
87+
88+
for (uint8_t j = 0; j < 3; j++) {
89+
if (buf[battery_value_pos + j] >= '0' &&
90+
buf[battery_value_pos + j] <= '9') {
91+
battery_value[j] = buf[battery_value_pos + j];
92+
percent_len++;
93+
} else {
94+
break;
6995
}
96+
}
7097

71-
j = 0;
72-
while (i < sizeof(buf) && j < (sizeof(battery_value)-2) && buf[i] >= '0' && buf[i] <= '9')
73-
battery_value[j++] = buf[i++];
74-
75-
if (j == 0)
76-
battery_value[j++] = '-';
98+
if (percent_len == 0)
99+
battery_value[0] = '-';
77100

78-
battery_value[j++] = '%';
79-
battery_value[sizeof(battery_value) - 1] = 0;
80-
dbgprint("battery_value: %s\n", battery_value);
81-
UpdateBatteryLabel(battery_value);
101+
battery_value[percent_len] = '%';
102+
dbgprint("battery_value: %s\n", battery_value);
103+
UpdateBatteryLabel(battery_value);
82104

83105
LOOP:
84-
disconnect(socket);
85-
for (j = 0; j < 30000 && (v_running || a_running); j++)
86-
usleep(1000);
106+
disconnect(socket);
107+
for (uint16_t i = 0; i < 30000 && (v_running || a_running); i++)
108+
usleep(1000);
87109
}
88110

89111
dbgprint("Battery Thread End\n");
@@ -120,7 +142,7 @@ void *VideoThreadProc(void *args) {
120142
}
121143

122144
len = snprintf(buf, sizeof(buf), VIDEO_REQ, decoder_get_video_width(), decoder_get_video_height());
123-
if (Send(buf, len, videoSocket) <= 0){
145+
if (!Send(buf, len, videoSocket)){
124146
MSG_ERROR("Error sending request, DroidCam might be busy with another client.");
125147
goto early_out;
126148
}
@@ -229,7 +251,7 @@ void *AudioThreadProc(void *arg) {
229251
return 0;
230252
}
231253

232-
if (Send(AUDIO_REQ, CSTR_LEN(AUDIO_REQ), socket) <= 0) {
254+
if (!Send(AUDIO_REQ, CSTR_LEN(AUDIO_REQ), socket)) {
233255
MSG_ERROR("Error sending audio request");
234256
goto early_out;
235257
}

‎src/connection.c‎

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

88-
int Send(const char * buffer, int bytes, SOCKET s) {
88+
bool Send(const char * buffer, int bytes, SOCKET s) {
8989
ssize_t w = 0;
9090
char *ptr = (char*) buffer;
9191
while (bytes > 0) {
9292
w = send(s, ptr, bytes, 0);
9393
if (w <= 0) {
94-
return -1;
94+
return false;
9595
}
9696
bytes -= w;
9797
ptr += w;
9898
}
99-
return 1;
99+
return true;
100100
}
101101

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

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

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

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

122-
int SendUDPMessage(SOCKET s, const char *message, int length, char *ip, int port) {
122+
ssize_t SendUDPMessage(SOCKET s, const char *message, int length, char *ip, int port) {
123123
struct sockaddr_in sin;
124124
sin.sin_port = htons((uint16_t)port);
125125
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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ void UpdateBatteryLabel(char *battery_value) {
105105
gtk_label_set_text(GTK_LABEL(batteryText), battery_value);
106106
}
107107

108-
static void Stop(void) {
108+
static void stop_av(void) {
109109
a_running = false;
110110
v_running = false;
111111
dbgprint("join\n");
@@ -125,7 +125,9 @@ static void Stop(void) {
125125
g_thread_join(hBatteryThread);
126126
hBatteryThread = NULL;
127127
}
128+
}
128129

130+
static void reset_ui(void) {
129131
gtk_widget_set_sensitive(GTK_WIDGET(elButton), FALSE);
130132
gtk_widget_set_sensitive(GTK_WIDGET(wbButton), FALSE);
131133
gtk_widget_set_sensitive(GTK_WIDGET(menuButton), FALSE);
@@ -255,7 +257,8 @@ static void the_callback(GtkWidget* widget, gpointer extra)
255257
switch (cb) {
256258
case CB_BUTTON:
257259
if (v_running || a_running) {
258-
Stop();
260+
reset_ui();
261+
stop_av();
259262
cb = (int)g_settings.connection;
260263
goto _up;
261264
}
@@ -664,7 +667,7 @@ int main(int argc, char *argv[])
664667
g_signal_connect(window, "delete-event", G_CALLBACK(delete_window_callback), window);
665668
gtk_widget_show_all(window);
666669

667-
Stop(); // reset the UI
670+
reset_ui();
668671
LoadSettings(&g_settings);
669672
if (argc >= 1) {
670673
parse_args(argc, argv);
@@ -711,7 +714,7 @@ int main(int argc, char *argv[])
711714

712715
// main loop
713716
gtk_main();
714-
Stop();
717+
stop_av();
715718
decoder_fini();
716719
connection_cleanup();
717720
SaveSettings(&g_settings);

0 commit comments

Comments
 (0)