5:43 a.m.
Hi Denis,
I know this is a different design than what we discussed for this,
but wanted to run this one by you for your comments. I was thinking
that maybe we didn't really need anything very complicated here, and
rather than using a GAtSyntax to detect a single string of interest,
we should just try to match on the string as we decode our packet.
I imagined we may get NO CARRIER embedded within a PPP stream and
not on it's own.
Kristen Carlson Accardi (2):
hdlc: detect NO CARRIER
ppp: check for NO CARRIER
gatchat/gathdlc.c | 37 ++++++++++++++++++++++++++++++++++---
gatchat/gathdlc.h | 4 ++++
gatchat/gatppp.c | 1 +
3 files changed, 39 insertions(+), 3 deletions(-)
5:43 a.m.
New subject: [PATCH 1/2] hdlc: detect NO CARRIER
modify hdlc receive function to check for NO CARRIER string. If
found, notify anyone that has indicated they are interested.
---
gatchat/gathdlc.c | 37 ++++++++++++++++++++++++++++++++++---
gatchat/gathdlc.h | 4 ++++
2 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/gatchat/gathdlc.c b/gatchat/gathdlc.c
index 6e71eb4..47ef736 100644
--- a/gatchat/gathdlc.c
+++ b/gatchat/gathdlc.c
@@ -57,6 +57,8 @@ struct _GAtHDLC {
guint decode_offset;
guint16 decode_fcs;
gboolean decode_escape;
+ gboolean match;
+ guint match_offset;
guint32 xmit_accm[8];
guint32 recv_accm;
GAtReceiveFunc receive_func;
@@ -64,8 +66,17 @@ struct _GAtHDLC {
GAtDebugFunc debugf;
gpointer debug_data;
int record_fd;
+ GAtHDLCNoCarrierFunc no_carrier_notify;
+ gpointer no_carrier_data;
};
+struct match_string {
+ guint len;
+ const char *s;
+};
+
+static struct match_string no_carrier = { 10, "NO CARRIER" };
+
static void hdlc_record(int fd, gboolean in, guint8 *data, guint16 length)
{
guint16 len = htons(length);
@@ -123,6 +134,13 @@ guint32 g_at_hdlc_get_recv_accm(GAtHDLC *hdlc)
return hdlc->recv_accm;
}
+void g_at_hdlc_set_no_carrier(GAtHDLC *hdlc, GAtHDLCNoCarrierFunc func,
+ gpointer user_data)
+{
+ hdlc->no_carrier_notify = func;
+ hdlc->no_carrier_data = user_data;
+}
+
static void new_bytes(struct ring_buffer *rbuf, gpointer user_data)
{
GAtHDLC *hdlc = user_data;
@@ -153,10 +171,23 @@ static void new_bytes(struct ring_buffer *rbuf, gpointer user_data)
hdlc->decode_fcs = HDLC_INITFCS;
hdlc->decode_offset = 0;
- } else if (*buf >= 0x20 ||
+ } else {
+ if (*buf == no_carrier.s[hdlc->match_offset++]) {
+ hdlc->match = TRUE;
+ if (hdlc->match_offset == no_carrier.len &&
+ hdlc->no_carrier_notify)
+ hdlc->no_carrier_notify(hdlc->no_carrier_data);
+ } else {
+ hdlc->match = FALSE;
+ hdlc->match_offset = 0;
+ }
+ if (*buf >= 0x20 ||
(hdlc->recv_accm & (1 << *buf)) == 0) {
- hdlc->decode_buffer[hdlc->decode_offset++] = *buf;
- hdlc->decode_fcs = HDLC_FCS(hdlc->decode_fcs, *buf);
+ hdlc->decode_buffer[hdlc->decode_offset++] =
+ *buf;
+ hdlc->decode_fcs = HDLC_FCS(hdlc->decode_fcs,
+ *buf);
+ }
}
buf++;
diff --git a/gatchat/gathdlc.h b/gatchat/gathdlc.h
index 132e1a9..7ab27ac 100644
--- a/gatchat/gathdlc.h
+++ b/gatchat/gathdlc.h
@@ -33,6 +33,8 @@ struct _GAtHDLC;
typedef struct _GAtHDLC GAtHDLC;
+typedef void (*GAtHDLCNoCarrierFunc)(gpointer user_data);
+
GAtHDLC *g_at_hdlc_new(GIOChannel *channel);
GAtHDLC *g_at_hdlc_new_from_io(GAtIO *io);
@@ -41,6 +43,8 @@ void g_at_hdlc_unref(GAtHDLC *hdlc);
void g_at_hdlc_set_debug(GAtHDLC *hdlc, GAtDebugFunc func, gpointer user_data);
+void g_at_hdlc_set_no_carrier(GAtHDLC *hdlc, GAtHDLCNoCarrierFunc func,
+ gpointer user_data);
void g_at_hdlc_set_xmit_accm(GAtHDLC *hdlc, guint32 accm);
guint32 g_at_hdlc_get_xmit_accm(GAtHDLC *hdlc);
--
1.6.6.1
5:43 a.m.
New subject: [PATCH 2/2] ppp: check for NO CARRIER
if hdlc detects NO CARRIER, treat it the same as an IO disconnect.
---
gatchat/gatppp.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/gatchat/gatppp.c b/gatchat/gatppp.c
index 82d1eca..bc5c9bf 100644
--- a/gatchat/gatppp.c
+++ b/gatchat/gatppp.c
@@ -472,6 +472,7 @@ static GAtPPP *ppp_init_common(GAtHDLC *hdlc)
g_at_hdlc_set_receive(ppp->hdlc, ppp_receive, ppp);
g_at_io_set_disconnect_function(g_at_hdlc_get_io(ppp->hdlc),
io_disconnect, ppp);
+ g_at_hdlc_set_no_carrier(ppp->hdlc, io_disconnect, ppp);
return ppp;
}
--
1.6.6.1
4507
days inactive
4507
days old
2 comments
1 participants
participants (1)
-
Kristen Carlson Accardi