korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-02 00:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

serial: forward remaining data when the HUP is received from the source

Browse Source
This commit is contained in:
Claudio Takahasi 2007-08-23 14:54:16 +00:00
parent 09eb33c298
commit b7b6b704e9
1 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
serial/manager.c
View File

@ -1080,7 +1080,29 @@ static int create_proxy_record(sdp_buf_t *buf, const char *uuid128, uint8_t chan
sdp_list_free(record.pattern, free); sdp_list_free(record.pattern, free);
return ret; return ret;
}
static GIOError channel_write(GIOChannel *chan, char *buf, size_t size)
{
GIOError err = G_IO_ERROR_NONE;
gsize wbytes, written;
wbytes = written = 0;
while (wbytes < size) {
err = g_io_channel_write(chan,
buf + wbytes,
size - wbytes,
&written);
if (err != G_IO_ERROR_NONE)
return err;
wbytes += written;
}
g_io_channel_flush(chan, NULL);
return err;
} }
static gboolean forward_data(GIOChannel *chan, GIOCondition cond, gpointer data) static gboolean forward_data(GIOChannel *chan, GIOCondition cond, gpointer data)
@ -1088,32 +1110,34 @@ static gboolean forward_data(GIOChannel *chan, GIOCondition cond, gpointer data)
char buf[BUF_SIZE]; char buf[BUF_SIZE];
GIOChannel *dest = data; GIOChannel *dest = data;
GIOError err; GIOError err;
gsize rbytes, wbytes, written; size_t rbytes;
if (cond & G_IO_NVAL) if (cond & G_IO_NVAL)
return FALSE; return FALSE;
if (cond & (G_IO_HUP | G_IO_ERR)) { if (cond & (G_IO_HUP | G_IO_ERR)) {
/* Try forward remaining data */
do {
rbytes = 0;
err = g_io_channel_read(chan, buf, sizeof(buf), &rbytes);
if (err != G_IO_ERROR_NONE || rbytes == 0)
break;
err = channel_write(dest, buf, rbytes);
} while (err == G_IO_ERROR_NONE);
g_io_channel_close(dest); g_io_channel_close(dest);
return FALSE; return FALSE;
} }
memset(buf, 0, sizeof(buf)); rbytes = 0;
rbytes = wbytes = written = 0; err = g_io_channel_read(chan, buf, sizeof(buf), &rbytes);
err = g_io_channel_read(chan, buf, sizeof(buf) - 1, &rbytes);
if (err != G_IO_ERROR_NONE) if (err != G_IO_ERROR_NONE)
return TRUE; return FALSE;
while (wbytes < rbytes) { err = channel_write(dest, buf, rbytes);
err = g_io_channel_write(dest, if (err != G_IO_ERROR_NONE)
buf + wbytes, return FALSE;
rbytes - wbytes,
&written);
if (err != G_IO_ERROR_NONE)
break;
wbytes += written;
}
return TRUE; return TRUE;
} }
@ -1222,14 +1246,15 @@ static inline int unix_socket_connect(const char *address)
sk = socket(AF_UNIX, SOCK_STREAM, 0); sk = socket(AF_UNIX, SOCK_STREAM, 0);
if (sk < 0) { if (sk < 0) {
err = errno; err = errno;
error("Can't create socket %s: %s(%d)", error("Unix socket(%s) create failed: %s(%d)",
address, strerror(err), err); address, strerror(err), err);
return -err; return -err;
} }
if (connect(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) { if (connect(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
err = errno; err = errno;
error("Unable to connect %s(%d)", strerror(err), err); error("Unix socket(%s) connect failed: %s(%d)",
address, strerror(err), err);
close(sk); close(sk);
errno = err; errno = err;
return -err; return -err;