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

Move frame NULL checks into the unstuffing function

This commit is contained in:
Marcel Holtmann 2010-04-02 19:06:31 -07:00
parent 9d8e55d489
commit 4733ddaffa
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gatchat/gatppp.c
View File

@ -179,9 +179,6 @@ static void ppp_recv(GAtPPP *ppp, struct frame_buffer *frame)
guint protocol = ppp_proto(frame->bytes); guint protocol = ppp_proto(frame->bytes);
guint8 *packet = ppp_info(frame->bytes); guint8 *packet = ppp_info(frame->bytes);
if (!frame)
return;
switch (protocol) { switch (protocol) {
case PPP_IP_PROTO: case PPP_IP_PROTO:
ppp_net_process_packet(ppp->net, packet); ppp_net_process_packet(ppp->net, packet);
@ -203,8 +200,6 @@ static void ppp_recv(GAtPPP *ppp, struct frame_buffer *frame)
lcp_protocol_reject(ppp->lcp, frame->bytes, frame->len); lcp_protocol_reject(ppp->lcp, frame->bytes, frame->len);
break; break;
}; };
g_free(frame);
} }
/* XXX - Implement PFC and ACFC */ /* XXX - Implement PFC and ACFC */
@ -269,9 +264,11 @@ static void ppp_feed(GAtPPP *ppp, guint8 *data, gsize len)
/* store last flag character & decode */ /* store last flag character & decode */
ppp->buffer[ppp->index++] = data[pos]; ppp->buffer[ppp->index++] = data[pos];
frame = ppp_decode(ppp, ppp->buffer); frame = ppp_decode(ppp, ppp->buffer);
if (frame) {
/* process receive frame */ /* process receive frame */
ppp_recv(ppp, frame); ppp_recv(ppp, frame);
g_free(frame);
}
/* zero buffer */ /* zero buffer */
memset(ppp->buffer, 0, BUFFERSZ); memset(ppp->buffer, 0, BUFFERSZ);