mirror of git://git.sysmocom.de/ofono
ppp: remove references to magic number
We will not support loopback detection.
This commit is contained in:
parent
0aaf98a354
commit
9c3631f24e
|
@ -583,7 +583,7 @@ static void pppcp_send_echo_reply(struct pppcp_data *data,
|
||||||
*/
|
*/
|
||||||
packet->identifier = header->identifier;
|
packet->identifier = header->identifier;
|
||||||
|
|
||||||
/* magic number? */
|
/* magic number will always be zero */
|
||||||
ppp_transmit(data->ppp, pppcp_to_ppp_packet(packet),
|
ppp_transmit(data->ppp, pppcp_to_ppp_packet(packet),
|
||||||
ntohs(packet->length));
|
ntohs(packet->length));
|
||||||
|
|
||||||
|
@ -860,6 +860,12 @@ static guint8 pppcp_process_protocol_reject(struct pppcp_data *data,
|
||||||
return RXJ_MINUS;
|
return RXJ_MINUS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* For Echo-Request, Echo-Reply, and Discard-Request, we will not
|
||||||
|
* bother checking the magic number of the packet, because we will
|
||||||
|
* never send an echo or discard request. We can't reliably detect
|
||||||
|
* loop back anyway, since we don't negotiate a magic number.
|
||||||
|
*/
|
||||||
static guint8 pppcp_process_echo_request(struct pppcp_data *data,
|
static guint8 pppcp_process_echo_request(struct pppcp_data *data,
|
||||||
struct pppcp_packet *packet)
|
struct pppcp_packet *packet)
|
||||||
{
|
{
|
||||||
|
|
|
@ -64,7 +64,6 @@ enum lcp_options {
|
||||||
#define REQ_OPTION_ACCM 0x1
|
#define REQ_OPTION_ACCM 0x1
|
||||||
|
|
||||||
struct lcp_data {
|
struct lcp_data {
|
||||||
guint32 magic_number;
|
|
||||||
guint8 options[MAX_CONFIG_OPTION_SIZE];
|
guint8 options[MAX_CONFIG_OPTION_SIZE];
|
||||||
guint16 options_len;
|
guint16 options_len;
|
||||||
guint8 req_options;
|
guint8 req_options;
|
||||||
|
@ -160,7 +159,6 @@ static enum rcr_result lcp_rcr(struct pppcp_data *pppcp,
|
||||||
const struct pppcp_packet *packet,
|
const struct pppcp_packet *packet,
|
||||||
guint8 **new_options, guint16 *new_len)
|
guint8 **new_options, guint16 *new_len)
|
||||||
{
|
{
|
||||||
struct lcp_data *lcp = pppcp_get_data(pppcp);
|
|
||||||
GAtPPP *ppp = pppcp_get_ppp(pppcp);
|
GAtPPP *ppp = pppcp_get_ppp(pppcp);
|
||||||
struct ppp_option_iter iter;
|
struct ppp_option_iter iter;
|
||||||
|
|
||||||
|
@ -183,7 +181,6 @@ static enum rcr_result lcp_rcr(struct pppcp_data *pppcp,
|
||||||
if (magic == 0)
|
if (magic == 0)
|
||||||
return RCR_REJECT;
|
return RCR_REJECT;
|
||||||
|
|
||||||
/* TODO: Handle loopback */
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
@ -204,8 +201,7 @@ static enum rcr_result lcp_rcr(struct pppcp_data *pppcp,
|
||||||
ppp_set_auth(ppp, ppp_option_iter_get_data(&iter));
|
ppp_set_auth(ppp, ppp_option_iter_get_data(&iter));
|
||||||
break;
|
break;
|
||||||
case MAGIC_NUMBER:
|
case MAGIC_NUMBER:
|
||||||
lcp->magic_number =
|
/* don't care */
|
||||||
get_host_long(ppp_option_iter_get_data(&iter));
|
|
||||||
break;
|
break;
|
||||||
case PFC:
|
case PFC:
|
||||||
ppp_set_pfc(ppp, TRUE);
|
ppp_set_pfc(ppp, TRUE);
|
||||||
|
|
Loading…
Reference in New Issue