mirror of git://git.sysmocom.de/ofono
Add gatutil.c to share common APIs with GAtServer
Add gatutil.c/h gat.h and move shared typedef and APIs into it. So that they can be shared by GAtServer and GAtChat.
This commit is contained in:
parent
e829727224
commit
7145edd3a4
|
@ -51,7 +51,9 @@ gatchat_sources = gatchat/gatchat.h gatchat/gatchat.c \
|
||||||
gatchat/ringbuffer.h gatchat/ringbuffer.c \
|
gatchat/ringbuffer.h gatchat/ringbuffer.c \
|
||||||
gatchat/gatmux.h gatchat/gatmux.c \
|
gatchat/gatmux.h gatchat/gatmux.c \
|
||||||
gatchat/gsm0710.h gatchat/gsm0710.c \
|
gatchat/gsm0710.h gatchat/gsm0710.c \
|
||||||
gatchat/gattty.h gatchat/gattty.c
|
gatchat/gattty.h gatchat/gattty.c \
|
||||||
|
gatchat/gatutil.h gatchat/gatutil.c \
|
||||||
|
gatchat/gat.h
|
||||||
|
|
||||||
udev_files = plugins/ofono.rules
|
udev_files = plugins/ofono.rules
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,36 @@
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* AT chat library with GLib integration
|
||||||
|
*
|
||||||
|
* Copyright (C) 2008-2010 Intel Corporation. All rights reserved.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __GAT_H
|
||||||
|
#define __GAT_H
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef void (*GAtDisconnectFunc)(gpointer user_data);
|
||||||
|
typedef void (*GAtDebugFunc)(const char *str, gpointer user_data);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* __GAT_H */
|
|
@ -40,7 +40,6 @@
|
||||||
static const char *none_prefix[] = { NULL };
|
static const char *none_prefix[] = { NULL };
|
||||||
|
|
||||||
static void g_at_chat_wakeup_writer(GAtChat *chat);
|
static void g_at_chat_wakeup_writer(GAtChat *chat);
|
||||||
static void debug_chat(GAtChat *chat, gboolean in, const char *str, gsize len);
|
|
||||||
|
|
||||||
struct at_command {
|
struct at_command {
|
||||||
char *cmd;
|
char *cmd;
|
||||||
|
@ -686,81 +685,6 @@ static void new_bytes(GAtChat *p)
|
||||||
g_at_chat_unref(p);
|
g_at_chat_unref(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void debug_chat(GAtChat *chat, gboolean in, const char *str, gsize len)
|
|
||||||
{
|
|
||||||
char type = in ? '<' : '>';
|
|
||||||
gsize escaped = 2; /* Enough for '<', ' ' */
|
|
||||||
char *escaped_str;
|
|
||||||
const char *esc = "<ESC>";
|
|
||||||
gsize esc_size = strlen(esc);
|
|
||||||
const char *ctrlz = "<CtrlZ>";
|
|
||||||
gsize ctrlz_size = strlen(ctrlz);
|
|
||||||
gsize i;
|
|
||||||
|
|
||||||
if (!chat->debugf || !len)
|
|
||||||
return;
|
|
||||||
|
|
||||||
for (i = 0; i < len; i++) {
|
|
||||||
char c = str[i];
|
|
||||||
|
|
||||||
if (isprint(c))
|
|
||||||
escaped += 1;
|
|
||||||
else if (c == '\r' || c == '\t' || c == '\n')
|
|
||||||
escaped += 2;
|
|
||||||
else if (c == 26)
|
|
||||||
escaped += ctrlz_size;
|
|
||||||
else if (c == 25)
|
|
||||||
escaped += esc_size;
|
|
||||||
else
|
|
||||||
escaped += 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
escaped_str = g_malloc(escaped + 1);
|
|
||||||
escaped_str[0] = type;
|
|
||||||
escaped_str[1] = ' ';
|
|
||||||
escaped_str[2] = '\0';
|
|
||||||
escaped_str[escaped] = '\0';
|
|
||||||
|
|
||||||
for (escaped = 2, i = 0; i < len; i++) {
|
|
||||||
char c = str[i];
|
|
||||||
|
|
||||||
switch (c) {
|
|
||||||
case '\r':
|
|
||||||
escaped_str[escaped++] = '\\';
|
|
||||||
escaped_str[escaped++] = 'r';
|
|
||||||
break;
|
|
||||||
case '\t':
|
|
||||||
escaped_str[escaped++] = '\\';
|
|
||||||
escaped_str[escaped++] = 't';
|
|
||||||
break;
|
|
||||||
case '\n':
|
|
||||||
escaped_str[escaped++] = '\\';
|
|
||||||
escaped_str[escaped++] = 'n';
|
|
||||||
break;
|
|
||||||
case 26:
|
|
||||||
strncpy(&escaped_str[escaped], ctrlz, ctrlz_size);
|
|
||||||
escaped += ctrlz_size;
|
|
||||||
break;
|
|
||||||
case 25:
|
|
||||||
strncpy(&escaped_str[escaped], esc, esc_size);
|
|
||||||
escaped += esc_size;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
if (isprint(c))
|
|
||||||
escaped_str[escaped++] = c;
|
|
||||||
else {
|
|
||||||
escaped_str[escaped++] = '\\';
|
|
||||||
escaped_str[escaped++] = '0' + ((c >> 6) & 07);
|
|
||||||
escaped_str[escaped++] = '0' + ((c >> 3) & 07);
|
|
||||||
escaped_str[escaped++] = '0' + (c & 07);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
chat->debugf(escaped_str, chat->debug_data);
|
|
||||||
g_free(escaped_str);
|
|
||||||
}
|
|
||||||
|
|
||||||
static gboolean received_data(GIOChannel *channel, GIOCondition cond,
|
static gboolean received_data(GIOChannel *channel, GIOCondition cond,
|
||||||
gpointer data)
|
gpointer data)
|
||||||
{
|
{
|
||||||
|
@ -785,7 +709,8 @@ static gboolean received_data(GIOChannel *channel, GIOCondition cond,
|
||||||
buf = ring_buffer_write_ptr(chat->buf);
|
buf = ring_buffer_write_ptr(chat->buf);
|
||||||
|
|
||||||
err = g_io_channel_read(channel, (char *) buf, toread, &rbytes);
|
err = g_io_channel_read(channel, (char *) buf, toread, &rbytes);
|
||||||
debug_chat(chat, TRUE, (char *)buf, rbytes);
|
g_at_util_debug_chat(chat->debugf, TRUE, (char *)buf, rbytes,
|
||||||
|
chat->debug_data);
|
||||||
|
|
||||||
total_read += rbytes;
|
total_read += rbytes;
|
||||||
|
|
||||||
|
@ -931,8 +856,9 @@ static gboolean can_write_data(GIOChannel *channel, GIOCondition cond,
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
debug_chat(chat, FALSE, cmd->cmd + chat->cmd_bytes_written,
|
g_at_util_debug_chat(chat->debugf, FALSE,
|
||||||
bytes_written);
|
cmd->cmd + chat->cmd_bytes_written,
|
||||||
|
bytes_written, chat->debug_data);
|
||||||
chat->cmd_bytes_written += bytes_written;
|
chat->cmd_bytes_written += bytes_written;
|
||||||
|
|
||||||
if (bytes_written < towrite)
|
if (bytes_written < towrite)
|
||||||
|
@ -960,7 +886,6 @@ static void g_at_chat_wakeup_writer(GAtChat *chat)
|
||||||
GAtChat *g_at_chat_new(GIOChannel *channel, GAtSyntax *syntax)
|
GAtChat *g_at_chat_new(GIOChannel *channel, GAtSyntax *syntax)
|
||||||
{
|
{
|
||||||
GAtChat *chat;
|
GAtChat *chat;
|
||||||
GIOFlags io_flags;
|
|
||||||
|
|
||||||
if (!channel)
|
if (!channel)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -991,20 +916,9 @@ GAtChat *g_at_chat_new(GIOChannel *channel, GAtSyntax *syntax)
|
||||||
chat->notify_list = g_hash_table_new_full(g_str_hash, g_str_equal,
|
chat->notify_list = g_hash_table_new_full(g_str_hash, g_str_equal,
|
||||||
g_free, (GDestroyNotify)at_notify_destroy);
|
g_free, (GDestroyNotify)at_notify_destroy);
|
||||||
|
|
||||||
if (g_io_channel_set_encoding(channel, NULL, NULL) !=
|
if (!g_at_util_setup_io(channel))
|
||||||
G_IO_STATUS_NORMAL)
|
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
io_flags = g_io_channel_get_flags(channel);
|
|
||||||
|
|
||||||
io_flags |= G_IO_FLAG_NONBLOCK;
|
|
||||||
|
|
||||||
if (g_io_channel_set_flags(channel, io_flags, NULL) !=
|
|
||||||
G_IO_STATUS_NORMAL)
|
|
||||||
goto error;
|
|
||||||
|
|
||||||
g_io_channel_set_close_on_unref(channel, TRUE);
|
|
||||||
|
|
||||||
chat->channel = channel;
|
chat->channel = channel;
|
||||||
chat->read_watch = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT,
|
chat->read_watch = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT,
|
||||||
G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
|
G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
|
||||||
|
|
|
@ -28,6 +28,7 @@ extern "C" {
|
||||||
|
|
||||||
#include "gatresult.h"
|
#include "gatresult.h"
|
||||||
#include "gatsyntax.h"
|
#include "gatsyntax.h"
|
||||||
|
#include "gatutil.h"
|
||||||
|
|
||||||
struct _GAtChat;
|
struct _GAtChat;
|
||||||
|
|
||||||
|
@ -36,8 +37,6 @@ typedef struct _GAtChat GAtChat;
|
||||||
typedef void (*GAtResultFunc)(gboolean success, GAtResult *result,
|
typedef void (*GAtResultFunc)(gboolean success, GAtResult *result,
|
||||||
gpointer user_data);
|
gpointer user_data);
|
||||||
typedef void (*GAtNotifyFunc)(GAtResult *result, gpointer user_data);
|
typedef void (*GAtNotifyFunc)(GAtResult *result, gpointer user_data);
|
||||||
typedef void (*GAtDisconnectFunc)(gpointer user_data);
|
|
||||||
typedef void (*GAtDebugFunc)(const char *str, gpointer user_data);
|
|
||||||
|
|
||||||
GAtChat *g_at_chat_new(GIOChannel *channel, GAtSyntax *syntax);
|
GAtChat *g_at_chat_new(GIOChannel *channel, GAtSyntax *syntax);
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,129 @@
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* AT chat library with GLib integration
|
||||||
|
*
|
||||||
|
* Copyright (C) 2008-2010 Intel Corporation. All rights reserved.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
|
||||||
|
#include <glib.h>
|
||||||
|
|
||||||
|
#include "gatutil.h"
|
||||||
|
|
||||||
|
void g_at_util_debug_chat(GAtDebugFunc debugf, gboolean in, const char *str,
|
||||||
|
gsize len, gpointer user_data)
|
||||||
|
{
|
||||||
|
char type = in ? '<' : '>';
|
||||||
|
gsize escaped = 2; /* Enough for '<', ' ' */
|
||||||
|
char *escaped_str;
|
||||||
|
const char *esc = "<ESC>";
|
||||||
|
gsize esc_size = strlen(esc);
|
||||||
|
const char *ctrlz = "<CtrlZ>";
|
||||||
|
gsize ctrlz_size = strlen(ctrlz);
|
||||||
|
gsize i;
|
||||||
|
|
||||||
|
if (!debugf || !len)
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (i = 0; i < len; i++) {
|
||||||
|
char c = str[i];
|
||||||
|
|
||||||
|
if (isprint(c))
|
||||||
|
escaped += 1;
|
||||||
|
else if (c == '\r' || c == '\t' || c == '\n')
|
||||||
|
escaped += 2;
|
||||||
|
else if (c == 26)
|
||||||
|
escaped += ctrlz_size;
|
||||||
|
else if (c == 25)
|
||||||
|
escaped += esc_size;
|
||||||
|
else
|
||||||
|
escaped += 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
escaped_str = g_malloc(escaped + 1);
|
||||||
|
escaped_str[0] = type;
|
||||||
|
escaped_str[1] = ' ';
|
||||||
|
escaped_str[2] = '\0';
|
||||||
|
escaped_str[escaped] = '\0';
|
||||||
|
|
||||||
|
for (escaped = 2, i = 0; i < len; i++) {
|
||||||
|
char c = str[i];
|
||||||
|
|
||||||
|
switch (c) {
|
||||||
|
case '\r':
|
||||||
|
escaped_str[escaped++] = '\\';
|
||||||
|
escaped_str[escaped++] = 'r';
|
||||||
|
break;
|
||||||
|
case '\t':
|
||||||
|
escaped_str[escaped++] = '\\';
|
||||||
|
escaped_str[escaped++] = 't';
|
||||||
|
break;
|
||||||
|
case '\n':
|
||||||
|
escaped_str[escaped++] = '\\';
|
||||||
|
escaped_str[escaped++] = 'n';
|
||||||
|
break;
|
||||||
|
case 26:
|
||||||
|
strncpy(&escaped_str[escaped], ctrlz, ctrlz_size);
|
||||||
|
escaped += ctrlz_size;
|
||||||
|
break;
|
||||||
|
case 25:
|
||||||
|
strncpy(&escaped_str[escaped], esc, esc_size);
|
||||||
|
escaped += esc_size;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
if (isprint(c))
|
||||||
|
escaped_str[escaped++] = c;
|
||||||
|
else {
|
||||||
|
escaped_str[escaped++] = '\\';
|
||||||
|
escaped_str[escaped++] = '0' + ((c >> 6) & 07);
|
||||||
|
escaped_str[escaped++] = '0' + ((c >> 3) & 07);
|
||||||
|
escaped_str[escaped++] = '0' + (c & 07);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
debugf(escaped_str, user_data);
|
||||||
|
g_free(escaped_str);
|
||||||
|
}
|
||||||
|
|
||||||
|
gboolean g_at_util_setup_io(GIOChannel *io)
|
||||||
|
{
|
||||||
|
GIOFlags io_flags;
|
||||||
|
|
||||||
|
if (g_io_channel_set_encoding(io, NULL, NULL) !=
|
||||||
|
G_IO_STATUS_NORMAL)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
io_flags = g_io_channel_get_flags(io);
|
||||||
|
|
||||||
|
io_flags |= G_IO_FLAG_NONBLOCK;
|
||||||
|
|
||||||
|
if (g_io_channel_set_flags(io, io_flags, NULL) !=
|
||||||
|
G_IO_STATUS_NORMAL)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
g_io_channel_set_close_on_unref(io, TRUE);
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,40 @@
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* AT chat library with GLib integration
|
||||||
|
*
|
||||||
|
* Copyright (C) 2008-2010 Intel Corporation. All rights reserved.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __GATUTIL_H
|
||||||
|
#define __GATUTIL_H
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "gat.h"
|
||||||
|
|
||||||
|
void g_at_util_debug_chat(GAtDebugFunc debugf, gboolean in, const char *str,
|
||||||
|
gsize len, gpointer user_data);
|
||||||
|
|
||||||
|
gboolean g_at_util_setup_io(GIOChannel *io);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* __GATUTIL_H */
|
Loading…
Reference in New Issue