Mercurial > louis > mq > lightsd

changeset 197:e3488126729c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wip tag/untag testing, also fixes encoding of packets, things a probably brokeno on mips32
author Louis Opter <kalessin@kalessin.fr>
date Sun, 19 Jul 2015 02:21:45 -0700
parents abd8ede0093d
children 5609a782e502
files series tag_untag_testing_wip.patch
diffstat 2 files changed, 607 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/series	Sat Jul 18 20:26:56 2015 -0700
+++ b/series	Sun Jul 19 02:21:45 2015 -0700
@@ -2,3 +2,4 @@
 tag_untag.patch
 ignore_duplicated_listening_addresses.patch
 add_command_pipe.patch
+tag_untag_testing_wip.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tag_untag_testing_wip.patch	Sun Jul 19 02:21:45 2015 -0700
@@ -0,0 +1,606 @@
+# HG changeset patch
+# Parent  952ee0ab36a1500722322ef4720723279f9bee77
+
+diff --git a/core/proto.c b/core/proto.c
+--- a/core/proto.c
++++ b/core/proto.c
+@@ -263,7 +263,7 @@
+     struct lgtd_lifx_site *site;
+ 
+     // Loop over the devices and do allocations first, this makes error
+-    // handling easier (since you can't rollback enqueued packets) and builb
++    // handling easier (since you can't rollback enqueued packets) and build
+     // the list of affected gateways so we can do SET_TAG_LABELS:
+     SLIST_FOREACH(device, devices, link) {
+         struct lgtd_lifx_gateway *gw = device->device->gw;
+@@ -283,6 +283,7 @@
+         struct lgtd_lifx_packet_tag_labels pkt = { .tags = 0 };
+         pkt.tags = LGTD_LIFX_WIRE_TAG_ID_TO_VALUE(tag_id);
+         strncpy(pkt.label, tag_label, sizeof(pkt.label) - 1);
++        lgtd_lifx_wire_encode_tag_labels(&pkt);
+         bool enqueued = lgtd_lifx_gateway_send_to_site(
+             site->gw, LGTD_LIFX_SET_TAG_LABELS, &pkt, sizeof(pkt)
+         );
+@@ -302,6 +303,7 @@
+         assert(tag_id > -1 && tag_id < LGTD_LIFX_GATEWAY_MAX_TAGS);
+         struct lgtd_lifx_packet_tags pkt;
+         pkt.tags = bulb->state.tags | LGTD_LIFX_WIRE_TAG_ID_TO_VALUE(tag_id);
++        lgtd_lifx_wire_encode_tags(&pkt);
+         lgtd_router_send_to_device(bulb, LGTD_LIFX_SET_TAGS, &pkt);
+     }
+ 
+@@ -360,6 +362,7 @@
+             if (bulb->state.tags & tag_value) {
+                 struct lgtd_lifx_packet_tags pkt;
+                 pkt.tags = bulb->state.tags & ~tag_value;
++                lgtd_lifx_wire_encode_tags(&pkt);
+                 lgtd_router_send_to_device(bulb, LGTD_LIFX_SET_TAGS, &pkt);
+             }
+         }
+diff --git a/core/router.c b/core/router.c
+--- a/core/router.c
++++ b/core/router.c
+@@ -61,6 +61,8 @@
+         );
+         assert(pkt_infos);
+ 
++        pkt_infos->encode(pkt);
++
+         lgtd_lifx_gateway_enqueue_packet(
+             gw, &hdr, pkt_type, pkt, pkt_infos->size
+         );
+diff --git a/lifx/gateway.c b/lifx/gateway.c
+--- a/lifx/gateway.c
++++ b/lifx/gateway.c
+@@ -405,6 +405,7 @@
+             struct lgtd_lifx_packet_tag_labels pkt = {
+                 .tags = ~(gw->tag_ids & ~tag_id)
+             };
++            lgtd_lifx_wire_encode_tag_labels(&pkt);
+             lgtd_lifx_gateway_send_to_site(
+                 gw, LGTD_LIFX_SET_TAG_LABELS, &pkt, sizeof(pkt)
+             );
+diff --git a/tests/core/jsonrpc/test_jsonrpc_check_and_call_set_light_from_hsbk_from_array.c b/tests/core/jsonrpc/test_jsonrpc_check_and_call_set_light_from_hsbk_from_array.c
+--- a/tests/core/jsonrpc/test_jsonrpc_check_and_call_set_light_from_hsbk_from_array.c
++++ b/tests/core/jsonrpc/test_jsonrpc_check_and_call_set_light_from_hsbk_from_array.c
+@@ -1,6 +1,7 @@
+ #include "jsonrpc.c"
+ 
+ #include "mock_client_buf.h"
++#include "tests_shims.h"
+ 
+ #define LGTD_TESTING_SET_LIGHT_FROM_HSBK
+ #include "test_jsonrpc_utils.h"
+diff --git a/tests/core/jsonrpc/test_jsonrpc_check_and_call_set_light_from_hsbk_invalid_params.c b/tests/core/jsonrpc/test_jsonrpc_check_and_call_set_light_from_hsbk_invalid_params.c
+--- a/tests/core/jsonrpc/test_jsonrpc_check_and_call_set_light_from_hsbk_invalid_params.c
++++ b/tests/core/jsonrpc/test_jsonrpc_check_and_call_set_light_from_hsbk_invalid_params.c
+@@ -1,6 +1,7 @@
+ #include "jsonrpc.c"
+ 
+ #include "mock_client_buf.h"
++#include "tests_shims.h"
+ 
+ #define LGTD_TESTING_SET_LIGHT_FROM_HSBK
+ #include "test_jsonrpc_utils.h"
+diff --git a/tests/core/proto/test_proto_get_light_state.c b/tests/core/proto/test_proto_get_light_state.c
+--- a/tests/core/proto/test_proto_get_light_state.c
++++ b/tests/core/proto/test_proto_get_light_state.c
+@@ -1,6 +1,7 @@
+ #include "proto.c"
+ 
+ #include "mock_client_buf.h"
++#include "tests_shims.h"
+ #include "tests_utils.h"
+ 
+ #define MOCKED_ROUTER_TARGETS_TO_DEVICES
+@@ -34,8 +35,7 @@
+     };
+     static struct lgtd_lifx_bulb bulb_1 = {
+         .addr = { 1, 2, 3, 4, 5 },
+-        .state = {
+-            .hue = 0xaaaa,
++        .state = { .hue = 0xaaaa,
+             .saturation = 0xffff,
+             .brightness = 0xbbbb,
+             .kelvin = 3600,
+@@ -80,7 +80,7 @@
+ int
+ main(void)
+ {
+-    struct lgtd_client client;
++    struct lgtd_client client = { .io = FAKE_BUFFEREVENT };
+     struct lgtd_proto_target_list *targets = (void *)0x2a;
+ 
+     lgtd_proto_get_light_state(&client, targets);
+diff --git a/tests/core/proto/test_proto_get_light_state_empty_device_list.c b/tests/core/proto/test_proto_get_light_state_empty_device_list.c
+--- a/tests/core/proto/test_proto_get_light_state_empty_device_list.c
++++ b/tests/core/proto/test_proto_get_light_state_empty_device_list.c
+@@ -1,6 +1,7 @@
+ #include "proto.c"
+ 
+ #include "mock_client_buf.h"
++#include "tests_shims.h"
+ #include "tests_utils.h"
+ 
+ #define MOCKED_ROUTER_TARGETS_TO_DEVICES
+@@ -35,7 +36,7 @@
+ int
+ main(void)
+ {
+-    struct lgtd_client client;
++    struct lgtd_client client = { .io = FAKE_BUFFEREVENT };
+     struct lgtd_proto_target_list *targets = (void *)0x2a;
+ 
+     lgtd_proto_get_light_state(&client, targets);
+diff --git a/tests/core/proto/test_proto_get_light_state_null_device_list.c b/tests/core/proto/test_proto_get_light_state_null_device_list.c
+--- a/tests/core/proto/test_proto_get_light_state_null_device_list.c
++++ b/tests/core/proto/test_proto_get_light_state_null_device_list.c
+@@ -1,6 +1,7 @@
+ #include "proto.c"
+ 
+ #include "mock_client_buf.h"
++#include "tests_shims.h"
+ #include "tests_utils.h"
+ 
+ #define MOCKED_ROUTER_TARGETS_TO_DEVICES
+@@ -45,7 +46,7 @@
+ int
+ main(void)
+ {
+-    struct lgtd_client client;
++    struct lgtd_client client = { .io = FAKE_BUFFEREVENT };
+     struct lgtd_proto_target_list *targets = (void *)0x2a;
+ 
+     lgtd_proto_get_light_state(&client, targets);
+diff --git a/tests/core/proto/test_proto_power_off.c b/tests/core/proto/test_proto_power_off.c
+--- a/tests/core/proto/test_proto_power_off.c
++++ b/tests/core/proto/test_proto_power_off.c
+@@ -1,6 +1,7 @@
+ #include "proto.c"
+ 
+ #include "mock_client_buf.h"
++#include "tests_shims.h"
+ #include "tests_utils.h"
+ 
+ #define MOCKED_CLIENT_SEND_RESPONSE
+@@ -52,7 +53,7 @@
+     struct lgtd_proto_target_list *targets;
+     targets = lgtd_tests_build_target_list("*", NULL);
+ 
+-    struct lgtd_client client;
++    struct lgtd_client client = { .io = FAKE_BUFFEREVENT };
+ 
+     lgtd_proto_power_off(&client, targets);
+ 
+diff --git a/tests/core/proto/test_proto_power_off_routing_error.c b/tests/core/proto/test_proto_power_off_routing_error.c
+--- a/tests/core/proto/test_proto_power_off_routing_error.c
++++ b/tests/core/proto/test_proto_power_off_routing_error.c
+@@ -1,6 +1,7 @@
+ #include "proto.c"
+ 
+ #include "mock_client_buf.h"
++#include "tests_shims.h"
+ #include "tests_utils.h"
+ 
+ #define MOCKED_CLIENT_SEND_RESPONSE
+@@ -52,7 +53,7 @@
+     struct lgtd_proto_target_list *targets;
+     targets = lgtd_tests_build_target_list("*", NULL);
+ 
+-    struct lgtd_client client;
++    struct lgtd_client client = { .io = FAKE_BUFFEREVENT };
+ 
+     lgtd_proto_power_off(&client, targets);
+ 
+diff --git a/tests/core/proto/test_proto_power_on.c b/tests/core/proto/test_proto_power_on.c
+--- a/tests/core/proto/test_proto_power_on.c
++++ b/tests/core/proto/test_proto_power_on.c
+@@ -1,6 +1,7 @@
+ #include "proto.c"
+ 
+ #include "mock_client_buf.h"
++#include "tests_shims.h"
+ #include "tests_utils.h"
+ 
+ #define MOCKED_CLIENT_SEND_RESPONSE
+@@ -52,7 +53,7 @@
+     struct lgtd_proto_target_list *targets;
+     targets = lgtd_tests_build_target_list("*", NULL);
+ 
+-    struct lgtd_client client;
++    struct lgtd_client client = { .io = FAKE_BUFFEREVENT };
+ 
+     lgtd_proto_power_on(&client, targets);
+ 
+diff --git a/tests/core/proto/test_proto_power_on_routing_error.c b/tests/core/proto/test_proto_power_on_routing_error.c
+--- a/tests/core/proto/test_proto_power_on_routing_error.c
++++ b/tests/core/proto/test_proto_power_on_routing_error.c
+@@ -1,6 +1,7 @@
+ #include "proto.c"
+ 
+ #include "mock_client_buf.h"
++#include "tests_shims.h"
+ #include "tests_utils.h"
+ 
+ #define MOCKED_CLIENT_SEND_RESPONSE
+@@ -52,7 +53,7 @@
+     struct lgtd_proto_target_list *targets;
+     targets = lgtd_tests_build_target_list("*", NULL);
+ 
+-    struct lgtd_client client;
++    struct lgtd_client client = { .io = FAKE_BUFFEREVENT };
+ 
+     lgtd_proto_power_on(&client, targets);
+ 
+diff --git a/tests/core/proto/test_proto_set_light_from_hsbk.c b/tests/core/proto/test_proto_set_light_from_hsbk.c
+--- a/tests/core/proto/test_proto_set_light_from_hsbk.c
++++ b/tests/core/proto/test_proto_set_light_from_hsbk.c
+@@ -3,6 +3,7 @@
+ #include "proto.c"
+ 
+ #include "mock_client_buf.h"
++#include "tests_shims.h"
+ #include "tests_utils.h"
+ 
+ #define MOCKED_CLIENT_SEND_RESPONSE
+diff --git a/tests/core/proto/test_proto_set_light_from_hsbk_on_routing_error.c b/tests/core/proto/test_proto_set_light_from_hsbk_on_routing_error.c
+--- a/tests/core/proto/test_proto_set_light_from_hsbk_on_routing_error.c
++++ b/tests/core/proto/test_proto_set_light_from_hsbk_on_routing_error.c
+@@ -3,6 +3,7 @@
+ #include "proto.c"
+ 
+ #include "mock_client_buf.h"
++#include "tests_shims.h"
+ #include "tests_utils.h"
+ 
+ #define MOCKED_CLIENT_SEND_RESPONSE
+diff --git a/tests/core/proto/test_proto_set_waveform.c b/tests/core/proto/test_proto_set_waveform.c
+--- a/tests/core/proto/test_proto_set_waveform.c
++++ b/tests/core/proto/test_proto_set_waveform.c
+@@ -3,6 +3,7 @@
+ #include "proto.c"
+ 
+ #include "mock_client_buf.h"
++#include "tests_shims.h"
+ #include "tests_utils.h"
+ 
+ #define MOCKED_CLIENT_SEND_RESPONSE
+diff --git a/tests/core/proto/test_proto_set_waveform_on_routing_error.c b/tests/core/proto/test_proto_set_waveform_on_routing_error.c
+--- a/tests/core/proto/test_proto_set_waveform_on_routing_error.c
++++ b/tests/core/proto/test_proto_set_waveform_on_routing_error.c
+@@ -3,6 +3,7 @@
+ #include "proto.c"
+ 
+ #include "mock_client_buf.h"
++#include "tests_shims.h"
+ #include "tests_utils.h"
+ 
+ #define MOCKED_CLIENT_SEND_RESPONSE
+diff --git a/tests/core/proto/test_proto_tag_create.c b/tests/core/proto/test_proto_tag_create.c
+--- a/tests/core/proto/test_proto_tag_create.c
++++ b/tests/core/proto/test_proto_tag_create.c
+@@ -1,6 +1,9 @@
+ #include "proto.c"
+ 
+ #include "mock_client_buf.h"
++#define MOCKED_LIFX_GATEWAY_SEND_TO_SITE
++#define MOCKED_LIFX_GATEWAY_ALLOCATE_TAG_ID
++#include "tests_shims.h"
+ #include "tests_utils.h"
+ 
+ #define MOCKED_ROUTER_TARGETS_TO_DEVICES
+@@ -8,33 +11,11 @@
+ #define MOCKED_ROUTER_DEVICE_LIST_FREE
+ #include "tests_proto_utils.h"
+ 
++#define FAKE_TARGET_LIST (void *)0x2a
++
+ static struct lgtd_router_device_list devices = 
+     SLIST_HEAD_INITIALIZER(&devices);
+ 
+-static bool device_list_free_called = false;
+-
+-void
+-lgtd_router_device_list_free(struct lgtd_router_device_list *devices)
+-{
+-    if (!devices) {
+-        lgtd_errx(1, "the device list must be passed");
+-    }
+-
+-    device_list_free_called = true;
+-}
+-
+-static struct lgtd_lifx_tag *tag_vapor = NULL;
+-
+-struct lgtd_router_device_list *
+-lgtd_router_targets_to_devices(const struct lgtd_proto_target_list *targets)
+-{
+-    if (targets != (void *)0x2a) {
+-        lgtd_errx(1, "unexpected targets list");
+-    }
+-
+-    return &devices;
+-}
+-
+ static bool send_to_device_called = false;
+ 
+ void
+@@ -64,17 +45,121 @@
+         errx(1, "missing SET_TAGS payload");
+     }
+ 
+-    struct lgtd_lifx_packet_tags *pkt_tags = pkt;
+-    if (pkt_tags->tags != 0x1) {
++    const struct lgtd_lifx_packet_tags *pkt_tags = pkt;
++    uint64_t tags = le64toh(pkt_tags->tags);
++    if (tags != 0x1) {
+         errx(
+             1, "invalid SET_TAGS payload=%#jx (expected %#x)",
+-            (uintmax_t)pkt_tags->tags, 0x2
++            (uintmax_t)tags, 0x1
+         );
+     }
+ 
+     send_to_device_called = true;
+ }
+ 
++static bool gateway_send_to_site_called = false;
++
++bool
++lgtd_lifx_gateway_send_to_site(struct lgtd_lifx_gateway *gw,
++                               enum lgtd_lifx_packet_type pkt_type,
++                               const void *pkt,
++                               int pkt_size)
++{
++    if (!gw) {
++        errx(1, "missing gateway");
++    }
++
++    if (pkt_type != LGTD_LIFX_SET_TAG_LABELS) {
++        errx(
++            1, "got packet type %#x (expected %#hx)",
++            pkt_type, LGTD_LIFX_SET_TAG_LABELS
++        );
++    }
++
++    const struct lgtd_lifx_packet_tag_labels *pkt_tag_labels = pkt;
++    uint64_t tags = le64toh(pkt_tag_labels->tags);
++    if (tags != 0x1) {
++        errx(1, "got tags %#jx (expected %#x)", (uintmax_t)tags, 0x1);
++    }
++
++    if (strcmp(pkt_tag_labels->label, "dub")) {
++        errx(1, "got label %s (expected dub)", pkt_tag_labels->label);
++    }
++
++    if (pkt_size != sizeof(*pkt_tag_labels)) {
++        errx(
++            1, "got pkt_size %d (expected %d)",
++            pkt_size, (int)sizeof(*pkt_tag_labels)
++        );
++    }
++
++    gateway_send_to_site_called = true;
++
++    return true;
++}
++
++static bool gateway_allocate_tag_id_called = false;
++
++int
++lgtd_lifx_gateway_allocate_tag_id(struct lgtd_lifx_gateway *gw,
++                                  int tag_id,
++                                  const char *tag_label)
++{
++    if (gateway_allocate_tag_id_called) {
++        errx(
++            1, "lgtd_lifx_gateway_allocate_tag_id "
++            "should have been called once only"
++        );
++    }
++
++    if (tag_id != -1) {
++        errx(
++            1, "lgtd_lifx_gateway_allocate_tag_id "
++            "tag_id %d (expected -1)", tag_id
++        );
++    }
++
++    if (!gw) {
++        errx(
++            1, "lgtd_lifx_gateway_allocate_tag_id "
++            "must be called with gateway"
++        );
++    }
++
++    if (!tag_label) {
++        errx(
++            1, "lgtd_lifx_gateway_allocate_tag_id "
++            "must be called with a tag_label"
++        );
++    }
++
++    gateway_allocate_tag_id_called = true;
++
++    return 0;
++}
++
++static bool device_list_free_called = false;
++
++void
++lgtd_router_device_list_free(struct lgtd_router_device_list *devices)
++{
++    if (!devices) {
++        lgtd_errx(1, "the device list must be passed");
++    }
++
++    device_list_free_called = true;
++}
++
++struct lgtd_router_device_list *
++lgtd_router_targets_to_devices(const struct lgtd_proto_target_list *targets)
++{
++    if (targets != FAKE_TARGET_LIST) {
++        lgtd_errx(1, "unexpected targets list");
++    }
++
++    return &devices;
++}
++
+ static void
+ setup_devices(void)
+ {
+@@ -127,15 +212,13 @@
+ int
+ main(void)
+ {
+-    struct lgtd_client client;
+-    memset(&client, 0, sizeof(client));
++    struct lgtd_client client = { .io = FAKE_BUFFEREVENT };
+ 
+     setup_devices();
+ 
+-    lgtd_proto_tag(&client, targets, "dub");
++    lgtd_proto_tag(&client, FAKE_TARGET_LIST, "dub");
+ 
+     const char expected[] = "true";
+-
+     if (client_write_buf_idx != sizeof(expected) - 1) {
+         lgtd_errx(
+             1,
+@@ -145,7 +228,6 @@
+             client_write_buf_idx, client_write_buf, expected
+         );
+     }
+-
+     if (memcmp(expected, client_write_buf, sizeof(expected) - 1)) {
+         lgtd_errx(
+             1, "got %.*s instead of %s",
+@@ -153,11 +235,14 @@
+         );
+     }
+ 
++    if (!gateway_send_to_site_called) {
++        lgtd_errx(1, "SET_TAG_LABELS wasn't sent");
++    }
+     if (!device_list_free_called) {
+         lgtd_errx(1, "the list of devices hasn't been freed");
+     }
+     if (!send_to_device_called) {
+-        lgtd_errx(1, "nothing was send to any device");
++        lgtd_errx(1, "SET_TAGS wasn't send to any device");
+     }
+ 
+     return 0;
+diff --git a/tests/core/proto/test_proto_tag_create_lifx_gw_tag_ids_full.c b/tests/core/proto/test_proto_tag_create_lifx_gw_tag_ids_full.c
+--- a/tests/core/proto/test_proto_tag_create_lifx_gw_tag_ids_full.c
++++ b/tests/core/proto/test_proto_tag_create_lifx_gw_tag_ids_full.c
+@@ -0,0 +1,6 @@
++int
++main(void)
++{
++
++    return 0;
++}
+diff --git a/tests/core/proto/test_proto_tag_update.c b/tests/core/proto/test_proto_tag_update.c
+--- a/tests/core/proto/test_proto_tag_update.c
++++ b/tests/core/proto/test_proto_tag_update.c
+@@ -0,0 +1,5 @@
++int
++main(void)
++{
++    return 0;
++}
+diff --git a/tests/core/proto/test_proto_untag.c b/tests/core/proto/test_proto_untag.c
+--- a/tests/core/proto/test_proto_untag.c
++++ b/tests/core/proto/test_proto_untag.c
+@@ -1,6 +1,7 @@
+ #include "proto.c"
+ 
+ #include "mock_client_buf.h"
++#include "tests_shims.h"
+ #include "tests_utils.h"
+ 
+ #define MOCKED_ROUTER_TARGETS_TO_DEVICES
+@@ -130,8 +131,7 @@
+ int
+ main(void)
+ {
+-    struct lgtd_client client;
+-    memset(&client, 0, sizeof(client));
++    struct lgtd_client client = { .io = FAKE_BUFFEREVENT };
+ 
+     struct lgtd_proto_target_list *targets = (void *)0x2a;
+ 
+diff --git a/tests/core/proto/test_proto_untag_tag_does_not_exist.c b/tests/core/proto/test_proto_untag_tag_does_not_exist.c
+--- a/tests/core/proto/test_proto_untag_tag_does_not_exist.c
++++ b/tests/core/proto/test_proto_untag_tag_does_not_exist.c
+@@ -1,6 +1,7 @@
+ #include "proto.c"
+ 
+ #include "mock_client_buf.h"
++#include "tests_shims.h"
+ #include "tests_utils.h"
+ 
+ #define MOCKED_ROUTER_TARGETS_TO_DEVICES
+@@ -49,8 +50,7 @@
+ int
+ main(void)
+ {
+-    struct lgtd_client client;
+-    memset(&client, 0, sizeof(client));
++    struct lgtd_client client = { .io = FAKE_BUFFEREVENT };
+ 
+     struct lgtd_proto_target_list *targets;
+     targets = lgtd_tests_build_target_list("*", NULL);
+diff --git a/tests/core/proto/tests_proto_utils.h b/tests/core/proto/tests_proto_utils.h
+--- a/tests/core/proto/tests_proto_utils.h
++++ b/tests/core/proto/tests_proto_utils.h
+@@ -1,5 +1,7 @@
+ #pragma once
+ 
++#define FAKE_BUFFEREVENT (void *)0xfeed
++
+ void
+ lgtd_client_start_send_response(struct lgtd_client *client)
+ {
+diff --git a/tests/core/tests_shims.c b/tests/core/tests_shims.c
+--- a/tests/core/tests_shims.c
++++ b/tests/core/tests_shims.c
+@@ -79,17 +79,6 @@
+     (void)pkt;
+ }
+ 
+-int
+-lgtd_lifx_gateway_allocate_tag_id(struct lgtd_lifx_gateway *gw,
+-                                  int tag_id,
+-                                  const char *tag_label)
+-{
+-    (void)gw;
+-    (void)tag_id;
+-    (void)tag_label;
+-    return -1;
+-}
+-
+ void
+ lgtd_lifx_gateway_deallocate_tag_id(struct lgtd_lifx_gateway *gw, int tag_id)
+ {
+@@ -111,18 +100,6 @@
+     return -1;
+ }
+ 
+-bool lgtd_lifx_gateway_send_to_site(struct lgtd_lifx_gateway *gw,
+-                                    enum lgtd_lifx_packet_type pkt_type,
+-                                    const void *pkt,
+-                                    int pkt_size)
+-{
+-    (void)gw;
+-    (void)pkt_type;
+-    (void)pkt;
+-    (void)pkt_size;
+-    return false;
+-}
+-
+ void
+ lgtd_lifx_gateway_update_tag_refcounts(struct lgtd_lifx_gateway *gw,
+                                        uint64_t bulb_tags,