sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

ppp: implement net close

This commit is contained in:
Kristen Carlson Accardi 2010-04-02 16:45:24 -07:00 committed by Denis Kenzior
parent ebc6e3b9dc
commit 3c3077f847
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gatchat/ppp.h
View File

@ -105,6 +105,7 @@ struct ppp_net_data {
GAtPPP *ppp;
char *if_name;
GIOChannel *channel;
gint watch;
};
struct _GAtPPP {

11
gatchat/ppp_net.c
View File

@ -64,8 +64,6 @@ void ppp_net_process_packet(struct ppp_net_data *data, guint8 *packet)
/*
* packets received by the tun interface need to be written to
* the modem. So, just read a packet, write out to the modem
*
* TBD - how do we know we have a full packet? Do we care?
*/
static gboolean ppp_net_callback(GIOChannel *channel, GIOCondition cond,
gpointer userdata)
@ -77,6 +75,9 @@ static gboolean ppp_net_callback(GIOChannel *channel, GIOCondition cond,
struct ppp_header *ppp = (struct ppp_header *) buf;
struct ppp_net_data *data = (struct ppp_net_data *) userdata;
if (cond & (G_IO_NVAL | G_IO_ERR | G_IO_HUP))
return FALSE;
if (cond & G_IO_IN) {
/* leave space to add PPP protocol field */
status = g_io_channel_read_chars(channel, buf + 2, MAX_PACKET,
@ -93,7 +94,8 @@ static gboolean ppp_net_callback(GIOChannel *channel, GIOCondition cond,
void ppp_net_close(struct ppp_net_data *data)
{
/* Not Implemented Yet */
g_source_remove(data->watch);
g_io_channel_unref(data->channel);
}
void ppp_net_open(struct ppp_net_data *data)
@ -101,7 +103,6 @@ void ppp_net_open(struct ppp_net_data *data)
int fd;
struct ifreq ifr;
GIOChannel *channel;
int signal_source;
int err;
if (data == NULL)
@ -138,7 +139,7 @@ void ppp_net_open(struct ppp_net_data *data)
}
data->channel = channel;
g_io_channel_set_buffered(channel, FALSE);
signal_source = g_io_add_watch(channel,
data->watch = g_io_add_watch(channel,
G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
ppp_net_callback, (gpointer) data);
}