scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 06:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous fixes

Browse Source
This commit is contained in:
Martin Pulec
2013-08-16 11:41:10 +02:00
parent 4b5d30e6a6
commit ef7e9a0ee4
7 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/control_socket.cpp
View File

@@ -108,7 +108,7 @@ struct control_state {
#define CONTROL_EXIT -1
#define CONTROL_CLOSE_HANDLE -2
static bool parse_msg(char *buffer, char buffer_len, /* out */ char *message, int *new_buffer_len);
static bool parse_msg(char *buffer, int buffer_len, /* out */ char *message, int *new_buffer_len);
static int process_msg(struct control_state *s, fd_t client_fd, char *message);
static ssize_t write_all(fd_t fd, const void *buf, size_t count);
static void * control_thread(void *args);
@@ -120,7 +120,7 @@ static ssize_t write_all(fd_t fd, const void *buf, size_t count)
size_t rest = count;
ssize_t w = 0;
while (rest > 0 && (w = send(fd, p, rest, 0)) >= 0) {
while (rest > 0 && (w = send(fd, p, rest, MSG_NOSIGNAL)) >= 0) {
p += w;
rest -= w;
}
@@ -402,7 +402,7 @@ static void send_response(fd_t fd, struct response *resp)
resp->deleter(resp);
}
static bool parse_msg(char *buffer, char buffer_len, /* out */ char *message, int *new_buffer_len)
static bool parse_msg(char *buffer, int buffer_len, /* out */ char *message, int *new_buffer_len)
{
bool ret = false;
int i = 0;