dnsproxy: Remove pending requests before destroying the channel

[framework/connectivity/connman.git] / src / 6to4.c

diff --git a/src/6to4.c b/src/6to4.c
index 0dfcbf7..2d54f6d 100644 (file)
--- a/src/6to4.c
+++ b/src/6to4.c
@@ -449,12 +449,13 @@ error:
        return -1;
 }
 
-static void receive_rs_reply(struct nd_router_advert *reply, void *user_data)
+static void receive_rs_reply(struct nd_router_advert *reply,
+                       unsigned int length, void *user_data)
 {
        char *address = user_data;
        struct in_addr ip4addr;
 
-       DBG("reply %p address %s", reply, address);
+       DBG("reply %p len %d address %s", reply, length, address);
 
        /* We try to create tunnel if autoconfiguration did not work i.e.,
         * we did not receive any reply to router solicitation message.
@@ -513,7 +514,7 @@ int __connman_6to4_probe(struct connman_service *service)
                                        (a == 172 && (b >= 16 && b <= 31)))
                return -1;
 
-       index = connman_ipconfig_get_index(ip4config);
+       index = __connman_ipconfig_get_index(ip4config);
        ip_address = g_strdup(address);
        tunnel_pending = 1;