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

ppp: implement MRU option 

If the peer requests a MRU option, set the mtu for the network
phase.  When we are in link establishment phase, we should
continue to behave as if no option has been set and the peer
should use the default MRU.

This option is required for the Huawei E160G modem.
This commit is contained in:
Kristen Carlson Accardi 2010-04-21 15:26:30 -07:00 committed by Marcel Holtmann
parent e1daf20651
commit 71775550fe
4 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gatchat/gatppp.c
View File

@ -40,6 +40,7 @@
#include "ppp.h"
#define DEFAULT_MRU 1500
#define DEFAULT_MTU 1500
#define BUFFERSZ (DEFAULT_MRU * 2)
@ -58,6 +59,7 @@ struct _GAtPPP {
guint8 buffer[BUFFERSZ];
int index;
gint mru;
gint mtu;
char username[256];
char password[256];
guint32 xmit_accm[8];
@ -407,6 +409,8 @@ void ppp_net_up_notify(GAtPPP *ppp, const char *ip,
{
ppp->net = ppp_net_new(ppp);
ppp_net_set_mtu(ppp->net, ppp->mtu);
if (ppp->connect_cb == NULL)
return;
@ -435,6 +439,17 @@ void ppp_set_xmit_accm(GAtPPP *ppp, guint32 accm)
ppp->xmit_accm[0] = accm;
}
/*
* The only time we use other than default MTU is when we are in
* the network phase.
*/
void ppp_set_mtu(GAtPPP *ppp, const guint8 *data)
{
guint16 mtu = get_host_short(data);
ppp->mtu = mtu;
}
/* Administrative Open */
void g_at_ppp_open(GAtPPP *ppp)
{
@ -576,6 +591,7 @@ GAtPPP *g_at_ppp_new(GIOChannel *modem)
/* set options to defaults */
ppp->mru = DEFAULT_MRU;
ppp->mtu = DEFAULT_MTU;
ppp->recv_accm = ~0U;
ppp->xmit_accm[0] = ~0U;
ppp->xmit_accm[3] = 0x60000000; /* 0x7d, 0x7e */

2
gatchat/ppp.h
View File

@ -103,6 +103,7 @@ struct ppp_net *ppp_net_new(GAtPPP *ppp);
const char *ppp_net_get_interface(struct ppp_net *net);
void ppp_net_process_packet(struct ppp_net *net, guint8 *packet);
void ppp_net_free(struct ppp_net *net);
void ppp_net_set_mtu(struct ppp_net *net, guint16 mtu);
/* PPP functions related to main GAtPPP object */
void ppp_debug(GAtPPP *ppp, const char *str);
@ -115,3 +116,4 @@ void ppp_net_up_notify(GAtPPP *ppp, const char *ip,
void ppp_net_down_notify(GAtPPP *ppp);
void ppp_set_recv_accm(GAtPPP *ppp, guint32 accm);
void ppp_set_xmit_accm(GAtPPP *ppp, guint32 accm);
void ppp_set_mtu(GAtPPP *ppp, const guint8 *data);

4
gatchat/ppp_lcp.c
View File

@ -197,6 +197,7 @@ static enum rcr_result lcp_rcr(struct pppcp_data *pppcp,
case ACCM:
case PFC:
case ACFC:
case MRU:
break;
case MAGIC_NUMBER:
@ -226,6 +227,9 @@ static enum rcr_result lcp_rcr(struct pppcp_data *pppcp,
case AUTH_PROTO:
ppp_set_auth(ppp, ppp_option_iter_get_data(&iter));
break;
case MRU:
ppp_set_mtu(ppp, ppp_option_iter_get_data(&iter));
break;
case MAGIC_NUMBER:
case PFC:
case ACFC:

13
gatchat/ppp_net.c
View File

@ -38,7 +38,6 @@
#include "gatppp.h"
#include "ppp.h"
/* XXX should be maximum IP Packet size */
#define MAX_PACKET 1500
struct ppp_net {
@ -46,8 +45,17 @@ struct ppp_net {
char *if_name;
GIOChannel *channel;
gint watch;
gint mtu;
};
void ppp_net_set_mtu(struct ppp_net *net, guint16 mtu)
{
if (net == NULL)
return;
net->mtu = mtu;
}
void ppp_net_process_packet(struct ppp_net *net, guint8 *packet)
{
GError *error = NULL;
@ -80,7 +88,7 @@ static gboolean ppp_net_callback(GIOChannel *channel, GIOCondition cond,
if (cond & G_IO_IN) {
/* leave space to add PPP protocol field */
status = g_io_channel_read_chars(channel, buf + 2, MAX_PACKET,
status = g_io_channel_read_chars(channel, buf + 2, net->mtu,
&bytes_read, &error);
if (bytes_read > 0) {
ppp->proto = htons(PPP_IP_PROTO);
@ -140,6 +148,7 @@ struct ppp_net *ppp_net_new(GAtPPP *ppp)
ppp_net_callback, net);
net->ppp = ppp;
net->mtu = MAX_PACKET;
return net;
error: