devs/stabber
2
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified read loops

Browse Source
This commit is contained in:
James Booth
2015-05-12 01:06:28 +01:00
parent 0fb5ced9ef
commit e2af2e4592
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/server.c
View File

@@ -23,13 +23,12 @@ listen_for(XMPPClient *client, const char * const stanza)
GString *stream = g_string_new(""); GString *stream = g_string_new("");
errno = 0; errno = 0;
gboolean received = FALSE; while ((read_size = recv(client->sock, buf, 1, 0)) > 0) {
while ((!received) && ((read_size = recv(client->sock, buf, 1, 0)) > 0)) {
g_string_append_len(stream, buf, read_size); g_string_append_len(stream, buf, read_size);
if (g_strcmp0(stream->str, stanza) == 0) {
received = TRUE;
}
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
if (g_strcmp0(stream->str, stanza) == 0) {
break;
}
} }
// error // error
@@ -78,15 +77,14 @@ debug_client(XMPPClient *client)
GString *stream = g_string_new(""); GString *stream = g_string_new("");
errno = 0; errno = 0;
gboolean received = FALSE; while ((read_size = recv(client->sock, buf, 1, 0)) > 0) {
while ((!received) && ((read_size = recv(client->sock, buf, 1, 0)) > 0)) {
printf("%c", buf[0]); printf("%c", buf[0]);
fflush(stdout); fflush(stdout);
g_string_append_len(stream, buf, read_size); g_string_append_len(stream, buf, read_size);
if (g_str_has_suffix(stream->str, END_STREAM)) {
received = TRUE;
}
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
if (g_str_has_suffix(stream->str, END_STREAM)) {
break;
}
} }
// error // error