handover: Add fallback code for p2p services

This code would allow non-strict implementations of p2p (e.g. Android 4
uses SNEP for handover, so first we try to connect to the Handover service,
and, if it fails, fallback to SNEP service) services.

diff --git a/plugins/handover.c b/plugins/handover.c
index a53a958..c8ba895 100644 (file)
--- a/plugins/handover.c
+++ b/plugins/handover.c
@@ -468,6 +468,7 @@ static int handover_push(int client_fd,
 struct near_p2p_driver handover_driver = {
        .name = "Handover",
        .service_name = NEAR_DEVICE_SN_HANDOVER,
+       .fallback_service_name = NEAR_DEVICE_SN_SNEP,
        .read = handover_read,
        .push = handover_push,
        .close = handover_close,

diff --git a/plugins/npp.c b/plugins/npp.c
index 9f40291..33136ba 100644 (file)
--- a/plugins/npp.c
+++ b/plugins/npp.c
@@ -144,6 +144,7 @@ static near_bool_t npp_read(int client_fd,
 struct near_p2p_driver npp_driver = {
        .name = "NPP",
        .service_name = NEAR_DEVICE_SN_NPP,
+       .fallback_service_name = NULL,
        .read = npp_read,
 };
 

diff --git a/plugins/p2p.c b/plugins/p2p.c
index 7c73bab..b4943e5 100644 (file)
--- a/plugins/p2p.c
+++ b/plugins/p2p.c
@@ -332,12 +332,18 @@ static int p2p_push(uint32_t adapter_idx, uint32_t target_idx,
 
                if (strcmp(driver->service_name, service_name) != 0)
                        continue;
-
+               /*
+                * Because of Android's implementation, we have use SNEP for
+                * Handover. So, on Handover session, we try to connect to
+                * the handover service and fallback to SNEP on connect fail.
+                */
                fd = p2p_connect(adapter_idx, target_idx, ndef, cb, driver);
                if (fd < 0)
-                       return fd;
-
-               return driver->push(fd, adapter_idx, target_idx, ndef, cb);
+                       return  p2p_push(adapter_idx, target_idx, ndef,
+                               (char *) driver->fallback_service_name, cb);
+               else
+                       return driver->push(fd, adapter_idx, target_idx,
+                                       ndef, cb);
        }
 
        return -1;

diff --git a/plugins/p2p.h b/plugins/p2p.h
index 5b74fb6..033ecd2 100644 (file)
--- a/plugins/p2p.h
+++ b/plugins/p2p.h
@@ -26,6 +26,7 @@
 struct near_p2p_driver {
        const char *name;
        const char *service_name;
+       const char *fallback_service_name;
        near_bool_t (*read)(int client_fd,
                                uint32_t adapter_idx, uint32_t target_idx,
                                near_device_io_cb cb);

diff --git a/plugins/snep.c b/plugins/snep.c
index 4a2367a..e181f21 100644 (file)
--- a/plugins/snep.c
+++ b/plugins/snep.c
@@ -521,6 +521,7 @@ error:
 struct near_p2p_driver snep_driver = {
        .name = "SNEP",
        .service_name = NEAR_DEVICE_SN_SNEP,
+       .fallback_service_name = NEAR_DEVICE_SN_NPP,
        .read = snep_read,
        .push = snep_push,
        .close = snep_close,