#endif
#define pppcp_to_ppp_packet(p) \
- (p-PPP_HEADROOM)
+ (((guint8 *) p) - PPP_HEADROOM)
struct pppcp_event {
enum pppcp_event_type type;
#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)
{
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--;
/* 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);
}
/*
&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)) {
&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);
}
}
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);
}
/* 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);
}
/*
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);
}
/*
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,