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

fix memory leaks after ppp_transmit 

Free packets in ppp_cp after calling ppp_transmit()
This commit is contained in:
Kristen Carlson Accardi 2010-03-24 10:13:24 -07:00 committed by Marcel Holtmann
parent 954e114507
commit 7dbd19e441
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gatchat/ppp_cp.c
View File

@ -48,7 +48,7 @@ static const char *pppcp_state_strings[] =
#endif
#define pppcp_to_ppp_packet(p) \
(p-PPP_HEADROOM)
(((guint8 *) p) - PPP_HEADROOM)
struct pppcp_event {
enum pppcp_event_type type;
@ -62,6 +62,11 @@ struct pppcp_event {
#define MAX_FAILURE 5
#define CP_HEADER_SZ 4
static void pppcp_packet_free(struct pppcp_packet *packet)
{
g_free(pppcp_to_ppp_packet(packet));
}
static struct pppcp_packet *pppcp_packet_new(struct pppcp_data *data,
guint type, guint bufferlen)
{
@ -291,9 +296,11 @@ static void pppcp_send_configure_request(struct pppcp_data *data)
new_identity(data, data->config_identifier);
packet->identifier = data->config_identifier;
ppp_transmit(data->ppp, pppcp_to_ppp_packet((guint8 *) packet),
ppp_transmit(data->ppp, pppcp_to_ppp_packet(packet),
ntohs(packet->length));
pppcp_packet_free(packet);
/* XXX don't retransmit right now */
#if 0
data->restart_counter--;
@ -327,8 +334,9 @@ static void pppcp_send_configure_ack(struct pppcp_data *data,
/* match identifier of the request */
packet->identifier = pppcp_header->identifier;
ppp_transmit(data->ppp, pppcp_to_ppp_packet((guint8 *) packet),
ppp_transmit(data->ppp, pppcp_to_ppp_packet(packet),
ntohs(packet->length));
pppcp_packet_free(packet);
}
/*
@ -357,9 +365,10 @@ static void pppcp_send_configure_nak(struct pppcp_data *data,
&odata);
packet->identifier = pppcp_header->identifier;
ppp_transmit(data->ppp, pppcp_to_ppp_packet((guint8 *) packet),
ppp_transmit(data->ppp, pppcp_to_ppp_packet(packet),
ntohs(packet->length));
pppcp_packet_free(packet);
}
/* if we have any unacceptable options, send a config-nak */
if (g_list_length(data->unacceptable_options)) {
@ -377,8 +386,10 @@ static void pppcp_send_configure_nak(struct pppcp_data *data,
&odata);
packet->identifier = pppcp_header->identifier;
ppp_transmit(data->ppp, pppcp_to_ppp_packet((guint8 *) packet),
ppp_transmit(data->ppp, pppcp_to_ppp_packet(packet),
ntohs(packet->length));
pppcp_packet_free(packet);
}
}
@ -405,8 +416,10 @@ static void pppcp_send_terminate_request(struct pppcp_data *data)
data->terminate_identifier =
new_identity(data, data->terminate_identifier);
packet->identifier = data->terminate_identifier;
ppp_transmit(data->ppp, pppcp_to_ppp_packet((guint8 *) packet),
ppp_transmit(data->ppp, pppcp_to_ppp_packet(packet),
ntohs(packet->length));
pppcp_packet_free(packet);
data->restart_counter--;
pppcp_start_timer(data);
}
@ -425,8 +438,10 @@ static void pppcp_send_terminate_ack(struct pppcp_data *data,
/* match identifier of the request */
packet->identifier = pppcp_header->identifier;
ppp_transmit(data->ppp, pppcp_to_ppp_packet((guint8 *) packet),
ppp_transmit(data->ppp, pppcp_to_ppp_packet(packet),
ntohs(pppcp_header->length));
pppcp_packet_free(packet);
}
/*
@ -454,8 +469,10 @@ static void pppcp_send_code_reject(struct pppcp_data *data,
memcpy(packet->data, rejected_packet,
ntohs(packet->length - CP_HEADER_SZ));
ppp_transmit(data->ppp, pppcp_to_ppp_packet((guint8 *) packet),
ppp_transmit(data->ppp, pppcp_to_ppp_packet(packet),
ntohs(packet->length));
pppcp_packet_free(packet);
}
/*
@ -478,9 +495,10 @@ static void pppcp_send_echo_reply(struct pppcp_data *data,
packet->identifier = header->identifier;
/* magic number? */
ppp_transmit(data->ppp, pppcp_to_ppp_packet((guint8 *) packet),
ppp_transmit(data->ppp, pppcp_to_ppp_packet(packet),
ntohs(packet->length));
pppcp_packet_free(packet);
}
static void pppcp_transition_state(enum pppcp_state new_state,