system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-07 00:31:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

2008-03-10 Dan Williams <dcbw@redhat.com>

Browse source 
* src/nm-serial-device.c
		- (get_reply_got_data): clean up indentation, shrink serial buffer
		- (wait_for_reply_got_data): try to handle slower serial devices where
			the reply is broken up into multiple reads by concatenating replies
			together until either an error is received or the search string is
			found



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3412 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-03-10 19:36:12 +00:00
parent 483b5f8ebd
commit 3f29628a42
2 changed files with 73 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-03-10 Dan Williams <dcbw@redhat.com>
* src/nm-serial-device.c
- (get_reply_got_data): clean up indentation, shrink serial buffer
- (wait_for_reply_got_data): try to handle slower serial devices where
the reply is broken up into multiple reads by concatenating replies
together until either an error is received or the search string is
found
2008-03-10 Dan Williams <dcbw@redhat.com>
* src/nm-device.c

116
src/nm-serial-device.c
View file

@ -19,7 +19,9 @@
#include "nm-setting-ppp.h"
#include "nm-utils.h"
/* #define NM_DEBUG_SERIAL 1 */
#define NM_DEBUG_SERIAL 1
#define SERIAL_BUF_SIZE 2048
G_DEFINE_TYPE (NMSerialDevice, nm_serial_device, NM_TYPE_DEVICE)
@ -407,51 +409,53 @@ get_reply_got_data (GIOChannel *source,
{
GetReplyInfo *info = (GetReplyInfo *) data;
gsize bytes_read;
char buf[4096];
char buf[SERIAL_BUF_SIZE + 1];
GIOStatus status;
gboolean done = FALSE;
int i;
if (condition & G_IO_IN) {
do {
GError *err = NULL;
if (!(condition & G_IO_IN))
goto done;
status = g_io_channel_read_chars (source, buf, 4096, &bytes_read, &err);
do {
GError *err = NULL;
if (status == G_IO_STATUS_ERROR) {
g_warning ("%s", err->message);
g_error_free (err);
err = NULL;
}
status = g_io_channel_read_chars (source, buf, SERIAL_BUF_SIZE, &bytes_read, &err);
if (bytes_read > 0) {
char *p;
if (status == G_IO_STATUS_ERROR) {
g_warning ("%s", err->message);
g_error_free (err);
err = NULL;
}
serial_debug ("Got:", buf, bytes_read);
if (bytes_read > 0) {
char *p;
p = &buf[0];
for (i = 0; i < bytes_read && !done; i++, p++) {
int j;
gboolean is_terminator = FALSE;
serial_debug ("Got:", buf, bytes_read);
for (j = 0; j < strlen (info->terminators); j++) {
if (*p == info->terminators[j]) {
is_terminator = TRUE;
break;
}
p = &buf[0];
for (i = 0; i < bytes_read && !done; i++, p++) {
int j;
gboolean is_terminator = FALSE;
for (j = 0; j < strlen (info->terminators); j++) {
if (*p == info->terminators[j]) {
is_terminator = TRUE;
break;
}
if (is_terminator) {
/* Ignore terminators in the beginning of the output */
if (info->result->len > 0)
done = TRUE;
} else
g_string_append_c (info->result, *p);
}
}
} while (!done || bytes_read == 4096 || status == G_IO_STATUS_AGAIN);
}
if (is_terminator) {
/* Ignore terminators in the beginning of the output */
if (info->result->len > 0)
done = TRUE;
} else
g_string_append_c (info->result, *p);
}
}
} while (!done || bytes_read == SERIAL_BUF_SIZE || status == G_IO_STATUS_AGAIN);
done:
if (condition & G_IO_HUP || condition & G_IO_ERR) {
g_string_free (info->result, TRUE);
info->result = NULL;
@ -543,38 +547,46 @@ wait_for_reply_got_data (GIOChannel *source,
gpointer data)
{
WaitForReplyInfo *info = (WaitForReplyInfo *) data;
GString *response = NULL;
gchar buf[SERIAL_BUF_SIZE + 1];
gsize bytes_read;
char buf[4096];
GIOStatus status;
gboolean done = FALSE;
int idx = -1;
int i;
if (condition & G_IO_IN) {
do {
GError *err = NULL;
if (!(condition & G_IO_IN))
goto done;
status = g_io_channel_read_chars (source, buf, 4096, &bytes_read, &err);
response = g_string_new (NULL);
do {
GError *err = NULL;
if (status == G_IO_STATUS_ERROR) {
g_warning ("%s", err->message);
g_error_free (err);
err = NULL;
}
status = g_io_channel_read_chars (source, buf, SERIAL_BUF_SIZE, &bytes_read, &err);
if (status == G_IO_STATUS_ERROR) {
g_warning ("%s", err->message);
g_error_free (err);
err = NULL;
}
if (bytes_read > 0) {
serial_debug ("Got:", buf, bytes_read);
if (bytes_read > 0) {
buf[bytes_read] = 0;
g_string_append (response, buf);
for (i = 0; info->str_needles[i]; i++) {
if (strcasestr (buf, info->str_needles[i])) {
idx = i;
done = TRUE;
}
serial_debug ("Got:", response->str, response->len);
for (i = 0; info->str_needles[i]; i++) {
if (strcasestr (response->str, info->str_needles[i])) {
idx = i;
done = TRUE;
}
}
} while (bytes_read == 4096 || status == G_IO_STATUS_AGAIN);
}
}
} while (bytes_read == SERIAL_BUF_SIZE || status == G_IO_STATUS_AGAIN);
g_string_free (response, TRUE);
done:
if (condition & G_IO_HUP || condition & G_IO_ERR)
done = TRUE;