diff options
| author | Dan Williams <dcbw@redhat.com> | 2017-10-31 12:07:19 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2017-10-31 12:07:19 -0500 |
| commit | cb17b3de4de4b99080863cf983d1e3fb7bcdd0e8 (patch) | |
| tree | ba4e9b2eded072b1f83f33e7fbba5e559553d8b1 | |
| parent | 361b2bb510e242af9b0d5d6392f168ba06d40d61 (diff) | |
| download | ModemManager-dcbw/port-serial-hdlc.tar.gz | |
adfadfdcbw/port-serial-hdlc
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/ppp/mm-lcp.c | 10 | ||||
| -rw-r--r-- | src/ppp/mm-lcp.h | 4 | ||||
| -rw-r--r-- | src/ppp/mm-ppp.c | 6 |
4 files changed, 14 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f202a03c2..764a5fd24 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -245,6 +245,8 @@ libppp_la_CPPFLAGS = \ libppp_la_SOURCES = \ ppp/mm-ppp.h \ ppp/mm-ppp.c \ + ppp/mm-lcp.h \ + ppp/mm-lcp.c \ $(NULL) libppp_la_LIBADD = \ diff --git a/src/ppp/mm-lcp.c b/src/ppp/mm-lcp.c index 7110cfdb0..065300239 100644 --- a/src/ppp/mm-lcp.c +++ b/src/ppp/mm-lcp.c @@ -18,9 +18,11 @@ #include <string.h> #include <unistd.h> -typedef struct { +#include "mm-lcp.h" + +struct _MMLcp { guint i; -} MMLcp; +}; /*****************************************************************************/ @@ -32,11 +34,11 @@ mm_lcp_new (void) gboolean mm_lcp_process (MMLcp *lcp, - const gchar *data, + const guint8 *data, gsize len, GError **error) { - + return TRUE; } void diff --git a/src/ppp/mm-lcp.h b/src/ppp/mm-lcp.h index 0d424587d..e611e2ae7 100644 --- a/src/ppp/mm-lcp.h +++ b/src/ppp/mm-lcp.h @@ -18,12 +18,12 @@ #include <glib.h> -typedef struct MMLcp MMLcp; +typedef struct _MMLcp MMLcp; MMLcp *mm_lcp_new (void); gboolean mm_lcp_process (MMLcp *lcp, - const gchar *data, + const guint8 *data, gsize len, GError **error); diff --git a/src/ppp/mm-ppp.c b/src/ppp/mm-ppp.c index af84bd1af..7ea4cefce 100644 --- a/src/ppp/mm-ppp.c +++ b/src/ppp/mm-ppp.c @@ -19,6 +19,7 @@ #include <unistd.h> #include "mm-ppp.h" +#include "mm-lcp.h" #include "mm-log.h" G_DEFINE_TYPE (MMPpp, mm_ppp, G_TYPE_OBJECT) @@ -82,7 +83,7 @@ get_host_u16 (const guint8 *bytes) /*****************************************************************************/ -https://www.rfc-editor.org/rfc/rfc1548.txt +//https://www.rfc-editor.org/rfc/rfc1548.txt MMPpp * mm_ppp_new (MMPppAuth auth, @@ -209,7 +210,8 @@ mm_ppp_process (MMPpp *self, case PPP_PROTO_LCP: if (!self->priv->lcp) self->priv->lcp = mm_lcp_new (); - mm_lcp_process (self->priv->lcp, buf, len); + if (!mm_lcp_process (self->priv->lcp, buf, len, error)) + return FALSE; break; case PPP_PROTO_PAP: break; |