diff options
| author | Kristen Carlson Accardi <kristen@linux.intel.com> | 2010-03-25 10:59:34 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-03-25 12:38:57 -0700 |
| commit | af63a2b8eeec100012e2e9b7c67ab1f6218a7195 (patch) | |
| tree | 61fef4f6d8f8478eeb86c661cb4c7ffef5255729 /gatchat/ppp_net.c | |
| parent | 59a2bcd380a6378ffebf1516a840ecbb4c72e823 (diff) | |
| download | ofono-af63a2b8eeec100012e2e9b7c67ab1f6218a7195.tar.bz2 | |
ppp: change debug output to include control protocol prefix
Diffstat (limited to 'gatchat/ppp_net.c')
| -rw-r--r-- | gatchat/ppp_net.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gatchat/ppp_net.c b/gatchat/ppp_net.c index a873c007..d8df896e 100644 --- a/gatchat/ppp_net.c +++ b/gatchat/ppp_net.c @@ -249,6 +249,8 @@ static void ipcp_finished(struct pppcp_data *data) g_print("ipcp finished\n"); } +static const char ipcp_prefix[] = "ipcp"; + struct pppcp_action ipcp_action = { .this_layer_up = ipcp_up, .this_layer_down = ipcp_down, @@ -258,6 +260,11 @@ struct pppcp_action ipcp_action = { .option_process = ipcp_option_process, }; +static struct pppcp_protocol_data ipcp_protocol_data = { + .proto = IPCP_PROTO, + .prefix = ipcp_prefix, +}; + struct ppp_packet_handler ipcp_packet_handler = { .proto = IPCP_PROTO, .handler = pppcp_process_packet, @@ -326,14 +333,15 @@ static struct pppcp_data * ipcp_new(GAtPPP *ppp) if (!data) return NULL; - pppcp = pppcp_new(ppp, IPCP_PROTO, data); + ipcp_protocol_data.ppp = ppp; + ipcp_protocol_data.priv = data; + pppcp = pppcp_new(&ipcp_protocol_data); if (!pppcp) { g_printerr("Failed to allocate PPPCP struct\n"); g_free(data); return NULL; } pppcp_set_valid_codes(pppcp, IPCP_SUPPORTED_CODES); - pppcp->priv = data; /* set the actions */ pppcp->action = &ipcp_action; |