libhdhomerun/hdhomerun_channels.c libhdhomerun/hdhomerun_channels.h libhdhomerun/hdhomerun_dhcp.c libhdhomerun/hdhomerun_dhcp.h @@ -1,28 +1,40 @@ - LIBSRCS += hdhomerun_pkt.c LIBSRCS += hdhomerun_debug.c LIBSRCS += hdhomerun_discover.c -LIBSRCS += hdhomerun_control.c +LIBSRCS += hdhomerun_channels.c LIBSRCS += hdhomerun_channelscan.c +LIBSRCS += hdhomerun_control.c LIBSRCS += hdhomerun_video.c LIBSRCS += hdhomerun_device.c CFLAGS += -Wall -O2 -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -CPPFLAGS += -Wall -O2 +LDFLAGS += -lpthread -hdhomerun_config : $(LIBSRCS) hdhomerun_config.c - gcc $(CFLAGS) $(LIBSRCS) hdhomerun_config.c -lpthread -o $@ - strip $@ +ifeq ($(OS),Windows_NT) + BINEXT := .exe + LIBEXT := .dll + LDFLAGS += -liphlpapi +else + LIBEXT := .so + ifneq ($(findstring solaris,$(OSTYPE)),) + LDFLAGS += -lns -lsocket + endif +endif -hdhomerun_config.exe : $(LIBSRCS) hdhomerun_config.c - gcc $(CFLAGS) $(LIBSRCS) hdhomerun_config.c -lpthread -liphlpapi -o $@ - strip $@ -hdhomerun_mythconfig : $(LIBSRCS) hdhomerun_mythconfig.cpp - g++ $(CPPFLAGS) $(LIBSRCS) hdhomerun_mythconfig.cpp -lpthread -lmysqlclient -o $@ +hdhomerun_config$(BINEXT) : hdhomerun_config.c $(LIBSRCS) + $(CC) $(CFLAGS) $+ $(LDFLAGS) -o $@ strip $@ +libhdhomerun$(LIBEXT) : $(LIBSRCS) + $(CC) -shared -Wl,-soname,libhdhomerun$(LIBEXT) $+ $(LDFLAGS) -o $@ + +list : + @echo hdhomerun_config$(BINEXT) + @echo libhdhomerun$(LIBEXT) + clean : - rm -f hdhomerun_config - rm -f hdhomerun_config.exe - rm -f hdhomerun_mythconfig + -rm -f hdhomerun_config$(BINEXT) + -rm -f libhdhomerun$(LIBEXT) + +.PHONY: list clean libhdhomerun/Makefile @@ -3,10 +3,10 @@ * * Copyright © 2005-2006 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ Top level include file: hdhomerun.h libhdhomerun/README @@ -3,10 +3,10 @@ * * Copyright © 2006 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #include "hdhomerun_os.h" @@ -25,4 +24,5 @@ #include "hdhomerun_control.h" #include "hdhomerun_video.h" #include "hdhomerun_device.h" +#include "hdhomerun_channels.h" #include "hdhomerun_channelscan.h" libhdhomerun/hdhomerun.h @@ -1,12 +1,12 @@ /* * hdhomerun_channelscan.c * - * Copyright © 2006 Silicondust Engineering Ltd. <www.silicondust.com>. + * Copyright © 2007 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #include "hdhomerun_os.h" @@ -23,154 +22,15 @@ #include "hdhomerun_debug.h" #include "hdhomerun_control.h" #include "hdhomerun_device.h" +#include "hdhomerun_channels.h" #include "hdhomerun_channelscan.h" -#define CHANNEL_MAP_US_BCAST 1 -#define CHANNEL_MAP_US_CABLE 2 -#define CHANNEL_MAP_US_HRC 3 -#define CHANNEL_MAP_US_IRC 4 - -struct channelscan_entry_t { - struct channelscan_entry_t *next; - uint8_t channel_map; - uint8_t channel; - uint32_t frequency; -}; - -struct channelscan_map_range_t { - uint8_t channel_map; - uint8_t channel_range_start; - uint8_t channel_range_end; - uint32_t frequency; - uint32_t spacing; -}; - -static const struct channelscan_map_range_t channelscan_map_ranges[] = { - {CHANNEL_MAP_US_BCAST, 2, 4, 57000000, 6000000}, - {CHANNEL_MAP_US_BCAST, 5, 6, 79000000, 6000000}, - {CHANNEL_MAP_US_BCAST, 7, 13, 177000000, 6000000}, - {CHANNEL_MAP_US_BCAST, 14, 69, 473000000, 6000000}, - {CHANNEL_MAP_US_BCAST, 70, 83, 809000000, 6000000}, - - {CHANNEL_MAP_US_CABLE, 1, 1, 75000000, 6000000}, - {CHANNEL_MAP_US_CABLE, 2, 4, 57000000, 6000000}, - {CHANNEL_MAP_US_CABLE, 5, 6, 79000000, 6000000}, - {CHANNEL_MAP_US_CABLE, 7, 13, 177000000, 6000000}, - {CHANNEL_MAP_US_CABLE, 14, 22, 123000000, 6000000}, - {CHANNEL_MAP_US_CABLE, 23, 94, 219000000, 6000000}, - {CHANNEL_MAP_US_CABLE, 95, 99, 93000000, 6000000}, - {CHANNEL_MAP_US_CABLE, 100, 159, 651000000, 6000000}, - - {CHANNEL_MAP_US_HRC, 1, 1, 73753600, 6000300}, - {CHANNEL_MAP_US_HRC, 2, 4, 55752700, 6000300}, - {CHANNEL_MAP_US_HRC, 5, 6, 79753900, 6000300}, - {CHANNEL_MAP_US_HRC, 7, 13, 175758700, 6000300}, - {CHANNEL_MAP_US_HRC, 14, 22, 121756000, 6000300}, - {CHANNEL_MAP_US_HRC, 23, 94, 217760800, 6000300}, - {CHANNEL_MAP_US_HRC, 95, 99, 91754500, 6000300}, - {CHANNEL_MAP_US_HRC, 100, 159, 649782400, 6000300}, - - {CHANNEL_MAP_US_IRC, 1, 1, 75012500, 6000000}, - {CHANNEL_MAP_US_IRC, 2, 4, 57012500, 6000000}, - {CHANNEL_MAP_US_IRC, 5, 6, 81012500, 6000000}, - {CHANNEL_MAP_US_IRC, 7, 13, 177012500, 6000000}, - {CHANNEL_MAP_US_IRC, 14, 22, 123012500, 6000000}, - {CHANNEL_MAP_US_IRC, 23, 41, 219012500, 6000000}, - {CHANNEL_MAP_US_IRC, 42, 42, 333025000, 6000000}, - {CHANNEL_MAP_US_IRC, 43, 94, 339012500, 6000000}, - {CHANNEL_MAP_US_IRC, 95, 97, 93012500, 6000000}, - {CHANNEL_MAP_US_IRC, 98, 99, 111025000, 6000000}, - {CHANNEL_MAP_US_IRC, 100, 159, 651012500, 6000000}, - - {0, 0, 0, 0, 0} -}; - -struct channelscan_entry_t *channelscan_list = NULL; - -static const char *channelscan_map_name(uint8_t channel_map) -{ - switch (channel_map) { - case CHANNEL_MAP_US_BCAST: - return "us-bcast"; - case CHANNEL_MAP_US_CABLE: - return "us-cable"; - case CHANNEL_MAP_US_HRC: - return "us-hrc"; - case CHANNEL_MAP_US_IRC: - return "us-irc"; - default: - return "unknown"; - } -} - -static void channelscan_list_build_insert(struct channelscan_entry_t *entry) -{ - struct channelscan_entry_t **pprev = &channelscan_list; - struct channelscan_entry_t *p = channelscan_list; - - while (p) { - if (p->frequency > entry->frequency) { - break; - } - - pprev = &p->next; - p = p->next; - } - - entry->next = p; - *pprev = entry; -} - -static void channelscan_list_build_range(const struct channelscan_map_range_t *range) -{ - uint8_t channel; - for (channel = range->channel_range_start; channel <= range->channel_range_end; channel++) { - struct channelscan_entry_t *entry = (struct channelscan_entry_t *)calloc(1, sizeof(struct channelscan_entry_t)); - if (!entry) { - return; - } - - entry->channel_map = range->channel_map; - entry->channel = channel; - entry->frequency = range->frequency + ((uint32_t)(channel - range->channel_range_start) * range->spacing); - entry->frequency = (entry->frequency / 62500) * 62500; - - channelscan_list_build_insert(entry); - } -} - -static void channelscan_list_build(void) -{ - if (channelscan_list) { - return; - } - - const struct channelscan_map_range_t *range = channelscan_map_ranges; - while (range->channel_map) { - channelscan_list_build_range(range); - range++; - } -} - -static void channelscan_list_free(void) -{ - while (1) { - struct channelscan_entry_t *entry = channelscan_list; - if (!entry) { - break; - } - - channelscan_list = entry->next; - free(entry); - } -} - static int channelscan_execute_find_lock_internal(struct hdhomerun_device_t *hd, uint32_t frequency, struct hdhomerun_tuner_status_t *status) { char channel_str[64]; - /* Set 8vsb channel. */ - sprintf(channel_str, "8vsb:%ld", (unsigned long)frequency); + /* Set auto channel. */ + sprintf(channel_str, "auto:%ld", (unsigned long)frequency); int ret = hdhomerun_device_set_tuner_channel(hd, channel_str); if (ret <= 0) { return ret; @@ -185,22 +45,6 @@ static int channelscan_execute_find_lock_internal(struct hdhomerun_device_t *hd, return 1; } - /* Set qam channel. */ - sprintf(channel_str, "qam:%ld", (unsigned long)frequency); - ret = hdhomerun_device_set_tuner_channel(hd, channel_str); - if (ret <= 0) { - return ret; - } - - /* Wait for lock. */ - ret = hdhomerun_device_wait_for_lock(hd, status); - if (ret <= 0) { - return ret; - } - if (status->lock_supported || status->lock_unsupported) { - return 1; - } - return 1; } @@ -269,7 +113,7 @@ static int channelscan_execute_find_programs(struct hdhomerun_device_t *hd, char } same++; - if (same >= 4 - 1) { + if (same >= 8) { break; } } @@ -292,10 +136,10 @@ static int channelscan_execute_callback(channelscan_callback_t callback, va_list return ret; } -static int channelscan_execute_internal(struct hdhomerun_device_t *hd, int mode, struct channelscan_entry_t **pentry, channelscan_callback_t callback, va_list callback_ap) +static int channelscan_execute_internal(struct hdhomerun_device_t *hd, uint32_t channel_map, struct hdhomerun_channel_entry_t **pentry, channelscan_callback_t callback, va_list callback_ap) { - struct channelscan_entry_t *entry = *pentry; - uint32_t frequency = entry->frequency; + struct hdhomerun_channel_entry_t *entry = *pentry; + uint32_t frequency = hdhomerun_channel_entry_frequency(entry); char buffer[256]; int ret; @@ -304,14 +148,15 @@ static int channelscan_execute_internal(struct hdhomerun_device_t *hd, int mode, sprintf(ptr, "%ld (", (unsigned long)frequency); ptr = strchr(ptr, 0); while (1) { - sprintf(ptr, "%s:%d", channelscan_map_name(entry->channel_map), entry->channel); + const char *name = hdhomerun_channel_entry_name(entry); + strcpy(ptr, name); ptr = strchr(ptr, 0); - entry = entry->next; + entry = hdhomerun_channel_list_next(channel_map, entry); if (!entry) { break; } - if (entry->frequency != frequency) { + if (hdhomerun_channel_entry_frequency(entry) != frequency) { break; } @@ -326,13 +171,12 @@ static int channelscan_execute_internal(struct hdhomerun_device_t *hd, int mode, return ret; } - if (mode == HDHOMERUN_CHANNELSCAN_MODE_CHANNELLIST) { - return 1; - } - /* Find lock. */ struct hdhomerun_tuner_status_t status; ret = channelscan_execute_find_lock(hd, frequency, &status); + if (ret <= 0) { + return ret; + } ptr = buffer; sprintf(ptr, "%s (ss=%u snq=%u seq=%u)", status.lock_str, status.signal_strength, status.signal_to_noise_quality, status.symbol_error_quality); @@ -377,33 +221,30 @@ static int channelscan_execute_internal(struct hdhomerun_device_t *hd, int mode, return 1; } -int channelscan_execute_single(struct hdhomerun_device_t *hd, int mode, struct channelscan_entry_t **pentry, channelscan_callback_t callback, ...) +int channelscan_execute_single(struct hdhomerun_device_t *hd, uint32_t channel_map, struct hdhomerun_channel_entry_t **pentry, channelscan_callback_t callback, ...) { - channelscan_list_build(); if (!*pentry) { - *pentry = channelscan_list; + *pentry = hdhomerun_channel_list_first(channel_map); } va_list callback_ap; va_start(callback_ap, callback); - int result = channelscan_execute_internal(hd, mode, pentry, callback, callback_ap); + int result = channelscan_execute_internal(hd, channel_map, pentry, callback, callback_ap); va_end(callback_ap); return result; } -int channelscan_execute_all(struct hdhomerun_device_t *hd, int mode, channelscan_callback_t callback, ...) +int channelscan_execute_all(struct hdhomerun_device_t *hd, uint32_t channel_map, channelscan_callback_t callback, ...) { - channelscan_list_build(); - va_list callback_ap; va_start(callback_ap, callback); int result = 0; - struct channelscan_entry_t *entry = channelscan_list; + struct hdhomerun_channel_entry_t *entry = hdhomerun_channel_list_first(channel_map); while (entry) { - result = channelscan_execute_internal(hd, mode, &entry, callback, callback_ap); + result = channelscan_execute_internal(hd, channel_map, &entry, callback, callback_ap); if (result <= 0) { break; } libhdhomerun/hdhomerun_channelscan.c @@ -1,12 +1,12 @@ /* * hdhomerun_channelscan.h * - * Copyright © 2006 Silicondust Engineering Ltd. <www.silicondust.com>. + * Copyright © 2007 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,16 +14,12 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ struct channelscan_entry_t; -#define HDHOMERUN_CHANNELSCAN_MODE_SCAN 0 -#define HDHOMERUN_CHANNELSCAN_MODE_CHANNELLIST 1 - typedef int (*channelscan_callback_t)(va_list ap, const char *type, const char *str); -extern int channelscan_execute_single(struct hdhomerun_device_t *hd, int mode, struct channelscan_entry_t **pentry, channelscan_callback_t callback, ...); -extern int channelscan_execute_all(struct hdhomerun_device_t *hd, int mode, channelscan_callback_t callback, ...); +extern int channelscan_execute_single(struct hdhomerun_device_t *hd, uint32_t channel_map, struct hdhomerun_channel_entry_t **pentry, channelscan_callback_t callback, ...); +extern int channelscan_execute_all(struct hdhomerun_device_t *hd, uint32_t channel_map, channelscan_callback_t callback, ...); libhdhomerun/hdhomerun_channelscan.h @@ -3,10 +3,10 @@ * * Copyright © 2006 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #include "hdhomerun.h" @@ -148,12 +147,6 @@ static int cmd_set(const char *item, const char *value) return 1; } -static int cmd_streaminfo(const char *tuner_str) -{ - fprintf(stderr, "streaminfo: use \"get /tuner<n>/streaminfo\"\n"); - return -1; -} - static int cmd_scan_callback(va_list ap, const char *type, const char *str) { FILE *fp = va_arg(ap, FILE *); @@ -174,6 +167,12 @@ static int cmd_scan(const char *tuner_str, const char *filename) return -1; } + uint32_t channel_map = hdhomerun_device_model_channel_map_all(hd); + if (channel_map == 0) { + fprintf(stderr, "failed to detect channel_map set\n"); + return -1; + } + FILE *fp = NULL; if (filename) { fp = fopen(filename, "w"); @@ -183,11 +182,17 @@ static int cmd_scan(const char *tuner_str, const char *filename) } } - int ret = channelscan_execute_all(hd, HDHOMERUN_CHANNELSCAN_MODE_SCAN, cmd_scan_callback, fp); + int ret = channelscan_execute_all(hd, channel_map, cmd_scan_callback, fp); if (fp) { fclose(fp); } + if (ret < 0) { + fprintf(stderr, "communication error sending request to hdhomerun device\n"); + } + if (ret == 0) { + fprintf(stderr, "error running channel scan\n"); + } return ret; } @@ -240,13 +245,36 @@ static int cmd_upgrade(const char *filename) return -1; } + printf("uploading firmware...\n"); if (hdhomerun_device_upgrade(hd, fp) <= 0) { fprintf(stderr, "error sending upgrade file to hdhomerun device\n"); fclose(fp); return -1; } + sleep(2); + + printf("upgrading firmware...\n"); + sleep(8); + + printf("rebooting...\n"); + int count = 0; + char *version_str; + while (1) { + if (hdhomerun_device_get_version(hd, &version_str, NULL) >= 0) { + break; + } - printf("upgrade complete\n"); + count++; + if (count > 30) { + fprintf(stderr, "error finding device after firmware upgrade\n"); + fclose(fp); + return -1; + } + + sleep(1); + } + + printf("upgrade complete - now running firmware %s\n", version_str); return 0; } @@ -272,13 +300,6 @@ static int main_cmd(int argc, char *argv[]) return cmd_set(argv[0], argv[1]); } - if (contains(cmd, "streaminfo")) { - if (argc < 1) { - return help(); - } - return cmd_streaminfo(argv[0]); - } - if (contains(cmd, "scan")) { if (argc < 1) { return help(); @@ -310,7 +331,6 @@ static int main_cmd(int argc, char *argv[]) static int main_internal(int argc, char *argv[]) { #if defined(__WINDOWS__) - // Start WinSock WORD wVersionRequested = MAKEWORD(2, 0); WSADATA wsaData; WSAStartup(wVersionRequested, &wsaData); @@ -343,19 +363,22 @@ static int main_internal(int argc, char *argv[]) return -1; } - /* Connect to device and check firmware version. */ - int ret = hdhomerun_device_firmware_version_check(hd, 0); - if (ret < 0) { + /* Device ID check. */ + uint32_t device_id_requested = hdhomerun_device_get_device_id_requested(hd); + if (!hdhomerun_discover_validate_device_id(device_id_requested)) { + fprintf(stderr, "invalid device id: %08lX\n", (unsigned long)device_id_requested); + } + + /* Connect to device and check model. */ + const char *model = hdhomerun_device_get_model_str(hd); + if (!model) { fprintf(stderr, "unable to connect to device\n"); hdhomerun_device_destroy(hd); return -1; } - if (ret == 0) { - fprintf(stderr, "WARNING: firmware upgrade needed for all operations to function\n"); - } /* Command. */ - ret = main_cmd(argc, argv); + int ret = main_cmd(argc, argv); /* Cleanup. */ hdhomerun_device_destroy(hd); libhdhomerun/hdhomerun_config.c @@ -3,10 +3,10 @@ * * Copyright © 2006 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,56 +14,72 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #include "hdhomerun_os.h" #include "hdhomerun_pkt.h" +#include "hdhomerun_debug.h" #include "hdhomerun_discover.h" #include "hdhomerun_control.h" +#define HDHOMERUN_CONTROL_SEND_TIMEOUT 5000 +#define HDHOMERUN_CONTROL_RECV_TIMEOUT 5000 +#define HDHOMERUN_CONTROL_UPGRADE_TIMEOUT 20000 + struct hdhomerun_control_sock_t { uint32_t desired_device_id; uint32_t desired_device_ip; uint32_t actual_device_id; uint32_t actual_device_ip; int sock; - uint8_t buffer[16384]; + struct hdhomerun_debug_t *dbg; + struct hdhomerun_pkt_t tx_pkt; + struct hdhomerun_pkt_t rx_pkt; }; -struct hdhomerun_control_sock_t *hdhomerun_control_create(uint32_t device_id, uint32_t device_ip) +static void hdhomerun_control_close_sock(struct hdhomerun_control_sock_t *cs) { - struct hdhomerun_control_sock_t *cs = (struct hdhomerun_control_sock_t *)malloc(sizeof(struct hdhomerun_control_sock_t)); - if (!cs) { - return NULL; + if (cs->sock == -1) { + return; } - + + close(cs->sock); + cs->sock = -1; +} + +void hdhomerun_control_set_device(struct hdhomerun_control_sock_t *cs, uint32_t device_id, uint32_t device_ip) +{ + hdhomerun_control_close_sock(cs); + cs->desired_device_id = device_id; cs->desired_device_ip = device_ip; cs->actual_device_id = 0; cs->actual_device_ip = 0; +} + +struct hdhomerun_control_sock_t *hdhomerun_control_create(uint32_t device_id, uint32_t device_ip) +{ + struct hdhomerun_control_sock_t *cs = (struct hdhomerun_control_sock_t *)calloc(1, sizeof(struct hdhomerun_control_sock_t)); + if (!cs) { + return NULL; + } + cs->sock = -1; + hdhomerun_control_set_device(cs, device_id, device_ip); return cs; } void hdhomerun_control_destroy(struct hdhomerun_control_sock_t *cs) { - if (cs->sock != -1) { - close(cs->sock); - } + hdhomerun_control_close_sock(cs); free(cs); } -static void hdhomerun_control_close_sock(struct hdhomerun_control_sock_t *cs) +void hdhomerun_control_set_debug(struct hdhomerun_control_sock_t *cs, struct hdhomerun_debug_t *dbg) { - if (cs->sock == -1) { - return; - } - - close(cs->sock); - cs->sock = -1; + cs->dbg = dbg; } static bool_t hdhomerun_control_connect_sock(struct hdhomerun_control_sock_t *cs) @@ -72,9 +88,15 @@ static bool_t hdhomerun_control_connect_sock(struct hdhomerun_control_sock_t *cs return TRUE; } + if ((cs->desired_device_id == 0) && (cs->desired_device_ip == 0)) { + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_connect_sock: no device specified\n"); + return FALSE; + } + /* Find device. */ struct hdhomerun_discover_device_t result; - if (hdhomerun_discover_find_devices_custom(cs->desired_device_ip, HDHOMERUN_DEVICE_TYPE_TUNER, cs->desired_device_id, &result, 1) <= 0) { + if (hdhomerun_discover_find_devices_custom(cs->desired_device_ip, HDHOMERUN_DEVICE_TYPE_WILDCARD, cs->desired_device_id, &result, 1) <= 0) { + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_connect_sock: device not found\n"); return FALSE; } cs->actual_device_ip = result.ip_addr; @@ -83,12 +105,13 @@ static bool_t hdhomerun_control_connect_sock(struct hdhomerun_control_sock_t *cs /* Create socket. */ cs->sock = (int)socket(AF_INET, SOCK_STREAM, 0); if (cs->sock == -1) { + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_connect_sock: failed to create socket (%d)\n", sock_getlasterror); return FALSE; } /* Set timeouts. */ - setsocktimeout(cs->sock, SOL_SOCKET, SO_SNDTIMEO, 5000); - setsocktimeout(cs->sock, SOL_SOCKET, SO_RCVTIMEO, 5000); + setsocktimeout(cs->sock, SOL_SOCKET, SO_SNDTIMEO, HDHOMERUN_CONTROL_SEND_TIMEOUT); + setsocktimeout(cs->sock, SOL_SOCKET, SO_RCVTIMEO, HDHOMERUN_CONTROL_RECV_TIMEOUT); /* Initiate connection. */ struct sockaddr_in sock_addr; @@ -97,6 +120,7 @@ static bool_t hdhomerun_control_connect_sock(struct hdhomerun_control_sock_t *cs sock_addr.sin_addr.s_addr = htonl(cs->actual_device_ip); sock_addr.sin_port = htons(HDHOMERUN_CONTROL_TCP_PORT); if (connect(cs->sock, (struct sockaddr *)&sock_addr, sizeof(sock_addr)) != 0) { + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_connect_sock: failed to connect (%d)\n", sock_getlasterror); hdhomerun_control_close_sock(cs); return FALSE; } @@ -105,16 +129,10 @@ static bool_t hdhomerun_control_connect_sock(struct hdhomerun_control_sock_t *cs return TRUE; } -void hdhomerun_control_set_device(struct hdhomerun_control_sock_t *cs, uint32_t device_id, uint32_t device_ip) -{ - hdhomerun_control_close_sock(cs); - cs->desired_device_id = device_id; - cs->desired_device_ip = device_ip; -} - uint32_t hdhomerun_control_get_device_id(struct hdhomerun_control_sock_t *cs) { if (!hdhomerun_control_connect_sock(cs)) { + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_get_device_id: connect failed\n"); return 0; } @@ -124,137 +142,183 @@ uint32_t hdhomerun_control_get_device_id(struct hdhomerun_control_sock_t *cs) uint32_t hdhomerun_control_get_device_ip(struct hdhomerun_control_sock_t *cs) { if (!hdhomerun_control_connect_sock(cs)) { + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_get_device_ip: connect failed\n"); return 0; } return cs->actual_device_ip; } +uint32_t hdhomerun_control_get_device_id_requested(struct hdhomerun_control_sock_t *cs) +{ + return cs->desired_device_id; +} + +uint32_t hdhomerun_control_get_device_ip_requested(struct hdhomerun_control_sock_t *cs) +{ + return cs->desired_device_ip; +} + uint32_t hdhomerun_control_get_local_addr(struct hdhomerun_control_sock_t *cs) { if (!hdhomerun_control_connect_sock(cs)) { + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_get_local_addr: connect failed\n"); return 0; } struct sockaddr_in sock_addr; socklen_t sockaddr_size = sizeof(sock_addr); if (getsockname(cs->sock, (struct sockaddr*)&sock_addr, &sockaddr_size) != 0) { + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_get_local_addr: getsockname failed (%d)\n", sock_getlasterror); return 0; } return ntohl(sock_addr.sin_addr.s_addr); } -int hdhomerun_control_get_sock(struct hdhomerun_control_sock_t *cs) -{ - return cs->sock; -} - -static int hdhomerun_control_send(struct hdhomerun_control_sock_t *cs, uint8_t *start, uint8_t *end) +static int hdhomerun_control_send_sock(struct hdhomerun_control_sock_t *cs, struct hdhomerun_pkt_t *tx_pkt) { - int length = (int)(end - start); - - if (send(cs->sock, (char *)start, (int)length, 0) != length) { + int length = (int)(tx_pkt->end - tx_pkt->start); + if (send(cs->sock, (char *)tx_pkt->start, (int)length, 0) != length) { + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_send_sock: send failed (%d)\n", sock_getlasterror); + hdhomerun_control_close_sock(cs); return -1; } - return length; + return 1; } -static int hdhomerun_control_recv_sock(struct hdhomerun_control_sock_t *cs, uint8_t *buffer, uint8_t *limit) +static int hdhomerun_control_recv_sock(struct hdhomerun_control_sock_t *cs, struct hdhomerun_pkt_t *rx_pkt, uint16_t *ptype, uint64_t recv_timeout) { - struct timeval t; - t.tv_sec = 0; - t.tv_usec = 250000; + uint64_t stop_time = getcurrenttime() + recv_timeout; + hdhomerun_pkt_reset(rx_pkt); - fd_set readfds; - FD_ZERO(&readfds); - FD_SET(cs->sock, &readfds); - - if (select(cs->sock+1, &readfds, NULL, NULL, &t) < 0) { - return -1; - } + while (getcurrenttime() < stop_time) { + struct timeval t; + t.tv_sec = 0; + t.tv_usec = 250000; + + fd_set readfds; + FD_ZERO(&readfds); + FD_SET(cs->sock, &readfds); + + if (select(cs->sock+1, &readfds, NULL, NULL, &t) < 0) { + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_recv_sock: select failed (%d)\n", sock_getlasterror); + hdhomerun_control_close_sock(cs); + return -1; + } + + if (!FD_ISSET(cs->sock, &readfds)) { + continue; + } + + int rx_length = recv(cs->sock, (char *)rx_pkt->end, (int)(rx_pkt->limit - rx_pkt->end), 0); + if (rx_length <= 0) { + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_recv_sock: recv failed (%d)\n", sock_getlasterror); + hdhomerun_control_close_sock(cs); + return -1; + } + rx_pkt->end += rx_length; - if (!FD_ISSET(cs->sock, &readfds)) { - return 0; - } + int ret = hdhomerun_pkt_open_frame(rx_pkt, ptype); + if (ret < 0) { + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_recv_sock: frame error\n"); + hdhomerun_control_close_sock(cs); + return -1; + } + if (ret == 0) { + continue; + } - int length = recv(cs->sock, (char *)buffer, (int)(limit - buffer), 0); - if (length <= 0) { - return -1; + return 1; } - return length; + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_recv_sock: timeout\n"); + hdhomerun_control_close_sock(cs); + return -1; } -static int hdhomerun_control_recv(struct hdhomerun_control_sock_t *cs, uint8_t *buffer, uint8_t *limit) +static int hdhomerun_control_send_recv_internal(struct hdhomerun_control_sock_t *cs, struct hdhomerun_pkt_t *tx_pkt, struct hdhomerun_pkt_t *rx_pkt, uint16_t type, uint64_t recv_timeout) { - uint64_t timeout = getcurrenttime() + 2000; - uint8_t *ptr = buffer; - - while (getcurrenttime() < timeout) { - int length = hdhomerun_control_recv_sock(cs, ptr, limit); - if (length < 0) { - return -1; + hdhomerun_pkt_seal_frame(tx_pkt, type); + + int i; + for (i = 0; i < 2; i++) { + if (cs->sock == -1) { + if (!hdhomerun_control_connect_sock(cs)) { + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_send_recv: connect failed\n"); + return -1; + } } - if (length == 0) { + + if (hdhomerun_control_send_sock(cs, tx_pkt) < 0) { continue; } - ptr += length; + if (!rx_pkt) { + return 1; + } - if (buffer + HDHOMERUN_MIN_PEEK_LENGTH > ptr) { + uint16_t rsp_type; + if (hdhomerun_control_recv_sock(cs, rx_pkt, &rsp_type, recv_timeout) < 0) { continue; } - - length = (int)hdhomerun_peek_packet_length(buffer); - if (buffer + length > ptr) { + if (rsp_type != type + 1) { + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_send_recv: unexpected frame type\n"); + hdhomerun_control_close_sock(cs); continue; } - return length; + return 1; } + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_send_recv: failed\n"); return -1; } -static int hdhomerun_control_get_set_internal(struct hdhomerun_control_sock_t *cs, const char *name, const char *value, char **pvalue, char **perror) +int hdhomerun_control_send_recv(struct hdhomerun_control_sock_t *cs, struct hdhomerun_pkt_t *tx_pkt, struct hdhomerun_pkt_t *rx_pkt, uint16_t type) { - /* Send request. */ - uint8_t *ptr = cs->buffer; - hdhomerun_write_get_set_request(&ptr, name, value); - if (hdhomerun_control_send(cs, cs->buffer, ptr) < 0) { - return -1; - } + return hdhomerun_control_send_recv_internal(cs, tx_pkt, rx_pkt, type, HDHOMERUN_CONTROL_RECV_TIMEOUT); +} - /* Receive response. */ - int length = hdhomerun_control_recv(cs, cs->buffer, cs->buffer + sizeof(cs->buffer)); - if (length <= 0) { - return -1; +static int hdhomerun_control_get_set(struct hdhomerun_control_sock_t *cs, const char *name, const char *value, char **pvalue, char **perror) +{ + struct hdhomerun_pkt_t *tx_pkt = &cs->tx_pkt; + struct hdhomerun_pkt_t *rx_pkt = &cs->rx_pkt; + + /* Request. */ + hdhomerun_pkt_reset(tx_pkt); + + int name_len = (int)strlen(name) + 1; + hdhomerun_pkt_write_u8(tx_pkt, HDHOMERUN_TAG_GETSET_NAME); + hdhomerun_pkt_write_var_length(tx_pkt, name_len); + hdhomerun_pkt_write_mem(tx_pkt, (void *)name, name_len); + + if (value) { + int value_len = (int)strlen(value) + 1; + hdhomerun_pkt_write_u8(tx_pkt, HDHOMERUN_TAG_GETSET_VALUE); + hdhomerun_pkt_write_var_length(tx_pkt, value_len); + hdhomerun_pkt_write_mem(tx_pkt, (void *)value, value_len); } - /* Parse response. */ - ptr = cs->buffer; - uint8_t *end = ptr + length; - int type = hdhomerun_process_packet(&ptr, &end); - if (type < 0) { - return -1; - } - if (type != HDHOMERUN_TYPE_GETSET_RPY) { + /* Send/Recv. */ + if (hdhomerun_control_send_recv_internal(cs, tx_pkt, rx_pkt, HDHOMERUN_TYPE_GETSET_REQ, HDHOMERUN_CONTROL_RECV_TIMEOUT) < 0) { return -1; } - while (ptr < end) { + /* Response. */ + while (1) { uint8_t tag; size_t len; - uint8_t *val; - if (hdhomerun_read_tlv(&ptr, end, &tag, &len, &val) < 0) { + uint8_t *next = hdhomerun_pkt_read_tlv(rx_pkt, &tag, &len); + if (!next) { break; } + switch (tag) { case HDHOMERUN_TAG_GETSET_VALUE: if (pvalue) { - *pvalue = (char *)val; - val[len] = 0; + *pvalue = (char *)rx_pkt->pos; + rx_pkt->pos[len] = 0; } if (perror) { *perror = NULL; @@ -266,39 +330,17 @@ static int hdhomerun_control_get_set_internal(struct hdhomerun_control_sock_t *c *pvalue = NULL; } if (perror) { - *perror = (char *)val; - val[len] = 0; + *perror = (char *)rx_pkt->pos; + rx_pkt->pos[len] = 0; } return 0; } - } - - return -1; -} - -static int hdhomerun_control_get_set(struct hdhomerun_control_sock_t *cs, const char *name, const char *value, char **pvalue, char **perror) -{ - if (cs->sock == -1) { - if (!hdhomerun_control_connect_sock(cs)) { - return -1; - } - - int ret = hdhomerun_control_get_set_internal(cs, name, value, pvalue, perror); - if (ret < 0) { - hdhomerun_control_close_sock(cs); - return -1; - } - return ret; + rx_pkt->pos = next; } - int ret = hdhomerun_control_get_set_internal(cs, name, value, pvalue, perror); - if (ret < 0) { - hdhomerun_control_close_sock(cs); - return hdhomerun_control_get_set(cs, name, value, pvalue, perror); - } - - return ret; + hdhomerun_debug_printf(cs->dbg, "hdhomerun_control_get_set: missing response tags\n"); + return -1; } int hdhomerun_control_get(struct hdhomerun_control_sock_t *cs, const char *name, char **pvalue, char **perror) @@ -313,13 +355,11 @@ int hdhomerun_control_set(struct hdhomerun_control_sock_t *cs, const char *name, int hdhomerun_control_upgrade(struct hdhomerun_control_sock_t *cs, FILE *upgrade_file) { - if (!hdhomerun_control_connect_sock(cs)) { - return -1; - } - + struct hdhomerun_pkt_t *tx_pkt = &cs->tx_pkt; + struct hdhomerun_pkt_t *rx_pkt = &cs->rx_pkt; uint32_t sequence = 0; - uint8_t *ptr; + /* Upload. */ while (1) { uint8_t data[256]; size_t length = fread(data, 1, 256, upgrade_file); @@ -327,10 +367,11 @@ int hdhomerun_control_upgrade(struct hdhomerun_control_sock_t *cs, FILE *upgrade break; } - ptr = cs->buffer; - hdhomerun_write_upgrade_request(&ptr, sequence, data, length); - if (hdhomerun_control_send(cs, cs->buffer, ptr) < 0) { - hdhomerun_control_close_sock(cs); + hdhomerun_pkt_reset(tx_pkt); + hdhomerun_pkt_write_u32(tx_pkt, sequence); + hdhomerun_pkt_write_mem(tx_pkt, data, length); + + if (hdhomerun_control_send_recv_internal(cs, tx_pkt, NULL, HDHOMERUN_TYPE_UPGRADE_REQ, 0) < 0) { return -1; } @@ -342,12 +383,33 @@ int hdhomerun_control_upgrade(struct hdhomerun_control_sock_t *cs, FILE *upgrade return 0; } - ptr = cs->buffer; - hdhomerun_write_upgrade_request(&ptr, 0xFFFFFFFF, NULL, 0); - if (hdhomerun_control_send(cs, cs->buffer, ptr) < 0) { - hdhomerun_control_close_sock(cs); + /* Execute upgrade. */ + hdhomerun_pkt_reset(tx_pkt); + hdhomerun_pkt_write_u32(tx_pkt, 0xFFFFFFFF); + + if (hdhomerun_control_send_recv_internal(cs, tx_pkt, rx_pkt, HDHOMERUN_TYPE_UPGRADE_REQ, HDHOMERUN_CONTROL_UPGRADE_TIMEOUT) < 0) { return -1; } + /* Check response. */ + while (1) { + uint8_t tag; + size_t len; + uint8_t *next = hdhomerun_pkt_read_tlv(rx_pkt, &tag, &len); + if (!next) { + break; + } + + switch (tag) { + case HDHOMERUN_TAG_ERROR_MESSAGE: + return 0; + + default: + break; + } + + rx_pkt->pos = next; + } + return 1; } libhdhomerun/hdhomerun_control.c @@ -3,10 +3,10 @@ * * Copyright © 2006 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #ifdef __cplusplus extern "C" { @@ -46,6 +45,9 @@ extern void hdhomerun_control_destroy(struct hdhomerun_control_sock_t *cs); */ extern uint32_t hdhomerun_control_get_device_id(struct hdhomerun_control_sock_t *cs); extern uint32_t hdhomerun_control_get_device_ip(struct hdhomerun_control_sock_t *cs); +extern uint32_t hdhomerun_control_get_device_id_requested(struct hdhomerun_control_sock_t *cs); +extern uint32_t hdhomerun_control_get_device_ip_requested(struct hdhomerun_control_sock_t *cs); + extern void hdhomerun_control_set_device(struct hdhomerun_control_sock_t *cs, uint32_t device_id, uint32_t device_ip); /* @@ -58,9 +60,9 @@ extern void hdhomerun_control_set_device(struct hdhomerun_control_sock_t *cs, ui extern uint32_t hdhomerun_control_get_local_addr(struct hdhomerun_control_sock_t *cs); /* - * Get the low-level socket handle. + * Low-level communication. */ -extern int hdhomerun_control_get_sock(struct hdhomerun_control_sock_t *cs); +extern int hdhomerun_control_send_recv(struct hdhomerun_control_sock_t *cs, struct hdhomerun_pkt_t *tx_pkt, struct hdhomerun_pkt_t *rx_pkt, uint16_t type); /* * Get/set a control variable on the device. @@ -93,6 +95,11 @@ extern int hdhomerun_control_set(struct hdhomerun_control_sock_t *cs, const char */ extern int hdhomerun_control_upgrade(struct hdhomerun_control_sock_t *cs, FILE *upgrade_file); +/* + * Debug logging. + */ +extern void hdhomerun_control_set_debug(struct hdhomerun_control_sock_t *cs, struct hdhomerun_debug_t *dbg); + #ifdef __cplusplus } #endif libhdhomerun/hdhomerun_control.h @@ -3,10 +3,10 @@ * * Copyright © 2006 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ /* @@ -29,6 +28,13 @@ #include "hdhomerun_os.h" #include "hdhomerun_debug.h" +#if !defined(HDHOMERUN_DEBUG_HOST) +#define HDHOMERUN_DEBUG_HOST "debug.silicondust.com" +#endif +#if !defined(HDHOMERUN_DEBUG_PORT) +#define HDHOMERUN_DEBUG_PORT "8002" +#endif + struct hdhomerun_debug_message_t { struct hdhomerun_debug_message_t *next; @@ -39,19 +45,23 @@ struct hdhomerun_debug_message_t struct hdhomerun_debug_t { pthread_t thread; + volatile bool_t enabled; volatile bool_t terminate; + char *prefix; + pthread_mutex_t print_lock; pthread_mutex_t queue_lock; + pthread_mutex_t send_lock; + struct hdhomerun_debug_message_t *queue_head; struct hdhomerun_debug_message_t *queue_tail; + uint32_t queue_depth; - pthread_mutex_t file_lock; - FILE *log_file; + uint64_t connect_delay; - pthread_mutex_t server_lock; - bool_t server_enabled; - int server_sock; - uint64_t server_delay; + char *file_name; + FILE *file_fp; + int sock; }; static THREAD_FUNC_PREFIX hdhomerun_debug_thread_execute(void *arg); @@ -63,13 +73,11 @@ struct hdhomerun_debug_t *hdhomerun_debug_create(void) return NULL; } - dbg->log_file = NULL; - dbg->server_sock = -1; - dbg->terminate = FALSE; + dbg->sock = -1; + pthread_mutex_init(&dbg->print_lock, NULL); pthread_mutex_init(&dbg->queue_lock, NULL); - pthread_mutex_init(&dbg->file_lock, NULL); - pthread_mutex_init(&dbg->server_lock, NULL); + pthread_mutex_init(&dbg->send_lock, NULL); if (pthread_create(&dbg->thread, NULL, &hdhomerun_debug_thread_execute, dbg) != 0) { free(dbg); @@ -79,64 +87,106 @@ struct hdhomerun_debug_t *hdhomerun_debug_create(void) return dbg; } +/* Send lock held by caller */ +static void hdhomerun_debug_close_file(struct hdhomerun_debug_t *dbg) +{ + if (!dbg->file_fp) { + return; + } + + fclose(dbg->file_fp); + dbg->file_fp = NULL; +} + +/* Send lock held by caller */ +static void hdhomerun_debug_close_sock(struct hdhomerun_debug_t *dbg) +{ + if (dbg->sock == -1) { + return; + } + + close(dbg->sock); + dbg->sock = -1; +} + void hdhomerun_debug_destroy(struct hdhomerun_debug_t *dbg) { dbg->terminate = TRUE; pthread_join(dbg->thread, NULL); - if (dbg->server_sock != -1) { - close(dbg->server_sock); - } - if (dbg->log_file) { - fclose(dbg->log_file); + hdhomerun_debug_close_file(dbg); + hdhomerun_debug_close_sock(dbg); + + if (dbg->prefix) { + free(dbg->prefix); } free(dbg); } -void hdhomerun_debug_enable_log_file(struct hdhomerun_debug_t *dbg, char *filename) +void hdhomerun_debug_set_prefix(struct hdhomerun_debug_t *dbg, const char *prefix) { - pthread_mutex_lock(&dbg->file_lock); + pthread_mutex_lock(&dbg->print_lock); - if (!dbg->log_file) { - dbg->log_file = fopen(filename, "a"); + if (dbg->prefix) { + free(dbg->prefix); + dbg->prefix = NULL; } - pthread_mutex_unlock(&dbg->file_lock); + if (prefix) { + dbg->prefix = strdup(prefix); + } + + pthread_mutex_unlock(&dbg->print_lock); } -void hdhomerun_debug_disable_log_file(struct hdhomerun_debug_t *dbg) +void hdhomerun_debug_set_filename(struct hdhomerun_debug_t *dbg, const char *filename) { - pthread_mutex_lock(&dbg->file_lock); + pthread_mutex_lock(&dbg->send_lock); + + if (!filename && !dbg->file_name) { + pthread_mutex_unlock(&dbg->send_lock); + return; + } + if (filename && dbg->file_name) { + if (strcmp(filename, dbg->file_name) == 0) { + pthread_mutex_unlock(&dbg->send_lock); + return; + } + } + + hdhomerun_debug_close_file(dbg); + hdhomerun_debug_close_sock(dbg); - if (dbg->log_file) { - fclose(dbg->log_file); - dbg->log_file = NULL; + if (dbg->file_name) { + free(dbg->file_name); + dbg->file_name = NULL; + } + if (filename) { + dbg->file_name = strdup(filename); } - pthread_mutex_unlock(&dbg->file_lock); + pthread_mutex_unlock(&dbg->send_lock); } -void hdhomerun_debug_enable_support_server(struct hdhomerun_debug_t *dbg) +void hdhomerun_debug_enable(struct hdhomerun_debug_t *dbg) { - pthread_mutex_lock(&dbg->server_lock); + pthread_mutex_lock(&dbg->send_lock); - dbg->server_enabled = TRUE; + dbg->enabled = TRUE; - pthread_mutex_unlock(&dbg->server_lock); + pthread_mutex_unlock(&dbg->send_lock); } -void hdhomerun_debug_disable_support_server(struct hdhomerun_debug_t *dbg) +void hdhomerun_debug_disable(struct hdhomerun_debug_t *dbg) { - pthread_mutex_lock(&dbg->server_lock); + pthread_mutex_lock(&dbg->send_lock); - dbg->server_enabled = FALSE; - if (dbg->server_sock != -1) { - close(dbg->server_sock); - dbg->server_sock = -1; - } + dbg->enabled = FALSE; + hdhomerun_debug_close_file(dbg); + hdhomerun_debug_close_sock(dbg); - pthread_mutex_unlock(&dbg->server_lock); + pthread_mutex_unlock(&dbg->send_lock); } bool_t hdhomerun_debug_enabled(struct hdhomerun_debug_t *dbg) @@ -145,14 +195,24 @@ bool_t hdhomerun_debug_enabled(struct hdhomerun_debug_t *dbg) return FALSE; } - if (dbg->log_file) { - return TRUE; - } - if (dbg->server_enabled) { - return TRUE; - } + return dbg->enabled; +} + +void hdhomerun_debug_flush(struct hdhomerun_debug_t *dbg, uint64_t timeout) +{ + timeout = getcurrenttime() + timeout; - return FALSE; + while (getcurrenttime() < timeout) { + pthread_mutex_lock(&dbg->queue_lock); + struct hdhomerun_debug_message_t *message = dbg->queue_tail; + pthread_mutex_unlock(&dbg->queue_lock); + + if (!message) { + return; + } + + usleep(10*1000); + } } void hdhomerun_debug_printf(struct hdhomerun_debug_t *dbg, const char *fmt, ...) @@ -168,6 +228,9 @@ void hdhomerun_debug_vprintf(struct hdhomerun_debug_t *dbg, const char *fmt, va_ if (!dbg) { return; } + if (!dbg->enabled) { + return; + } struct hdhomerun_debug_message_t *message = (struct hdhomerun_debug_message_t *)malloc(sizeof(struct hdhomerun_debug_message_t)); if (!message) { @@ -180,14 +243,22 @@ void hdhomerun_debug_vprintf(struct hdhomerun_debug_t *dbg, const char *fmt, va_ time_t t = time(NULL); strftime(ptr, end - ptr, "%Y%m%d-%H:%M:%S ", localtime(&t)); + ptr = strchr(ptr, 0); + + pthread_mutex_lock(&dbg->print_lock); + + if (dbg->prefix) { + snprintf(ptr, end - ptr, "%s ", dbg->prefix); + ptr = strchr(ptr, 0); + } + + pthread_mutex_unlock(&dbg->print_lock); - ptr = strchr(ptr, '\0'); vsnprintf(ptr, end - ptr, fmt, args); - ptr = strchr(ptr, '\0') - 1; + ptr = strchr(ptr, 0) - 1; if (*ptr++ != '\n') { - *ptr++ = '\n'; - *ptr++ = 0; + strcpy(ptr, "\n"); } pthread_mutex_lock(&dbg->queue_lock); @@ -200,40 +271,52 @@ void hdhomerun_debug_vprintf(struct hdhomerun_debug_t *dbg, const char *fmt, va_ } else { dbg->queue_tail = message; } + dbg->queue_depth++; pthread_mutex_unlock(&dbg->queue_lock); } -static void hdhomerun_debug_output_message_log_file(struct hdhomerun_debug_t *dbg, struct hdhomerun_debug_message_t *message) +/* Send lock held by caller */ +static bool_t hdhomerun_debug_output_message_file(struct hdhomerun_debug_t *dbg, struct hdhomerun_debug_message_t *message) { - if (!dbg->log_file) { - return; + if (!dbg->file_fp) { + uint64_t current_time = getcurrenttime(); + if (current_time < dbg->connect_delay) { + return FALSE; + } + dbg->connect_delay = current_time + 60*1000; + + dbg->file_fp = fopen(dbg->file_name, "a"); + if (!dbg->file_fp) { + return FALSE; + } } - fwrite(message->buffer, 1, strlen(message->buffer), dbg->log_file); + fprintf(dbg->file_fp, "%s", message->buffer); + fflush(dbg->file_fp); + + return TRUE; } +/* Send lock held by caller */ #if defined(__CYGWIN__) -static void hdhomerun_debug_output_message_support_server(struct hdhomerun_debug_t *dbg, struct hdhomerun_debug_message_t *message) +static bool_t hdhomerun_debug_output_message_sock(struct hdhomerun_debug_t *dbg, struct hdhomerun_debug_message_t *message) { + return TRUE; } #else -static void hdhomerun_debug_output_message_support_server(struct hdhomerun_debug_t *dbg, struct hdhomerun_debug_message_t *message) +static bool_t hdhomerun_debug_output_message_sock(struct hdhomerun_debug_t *dbg, struct hdhomerun_debug_message_t *message) { - if (!dbg->server_enabled) { - return; - } - - if (dbg->server_sock == -1) { + if (dbg->sock == -1) { uint64_t current_time = getcurrenttime(); - if (current_time < dbg->server_delay) { - return; + if (current_time < dbg->connect_delay) { + return FALSE; } - dbg->server_delay = current_time + 60*1000; + dbg->connect_delay = current_time + 60*1000; - dbg->server_sock = (int)socket(AF_INET, SOCK_STREAM, 0); - if (dbg->server_sock == -1) { - return; + dbg->sock = (int)socket(AF_INET, SOCK_STREAM, 0); + if (dbg->sock == -1) { + return FALSE; } struct addrinfo hints; @@ -243,59 +326,64 @@ static void hdhomerun_debug_output_message_support_server(struct hdhomerun_debug hints.ai_protocol = IPPROTO_TCP; struct addrinfo *sock_info; - if (getaddrinfo("debug.silicondust.com", "8002", &hints, &sock_info) != 0) { - close(dbg->server_sock); - dbg->server_sock = -1; - return; + if (getaddrinfo(HDHOMERUN_DEBUG_HOST, HDHOMERUN_DEBUG_PORT, &hints, &sock_info) != 0) { + hdhomerun_debug_close_sock(dbg); + return FALSE; } - if (connect(dbg->server_sock, sock_info->ai_addr, (int)sock_info->ai_addrlen) != 0) { + if (connect(dbg->sock, sock_info->ai_addr, (int)sock_info->ai_addrlen) != 0) { freeaddrinfo(sock_info); - close(dbg->server_sock); - dbg->server_sock = -1; - return; + hdhomerun_debug_close_sock(dbg); + return FALSE; } freeaddrinfo(sock_info); } - size_t length = strlen(message->buffer); - if (send(dbg->server_sock, (char *)message->buffer, (int)length, 0) != length) { - close(dbg->server_sock); - dbg->server_sock = -1; - return; + size_t length = strlen(message->buffer); + if (send(dbg->sock, (char *)message->buffer, (int)length, 0) != length) { + hdhomerun_debug_close_sock(dbg); + return FALSE; } + + return TRUE; } #endif -static bool_t hdhomerun_debug_output_message(struct hdhomerun_debug_t *dbg) +static bool_t hdhomerun_debug_output_message(struct hdhomerun_debug_t *dbg, struct hdhomerun_debug_message_t *message) { - pthread_mutex_lock(&dbg->queue_lock); + pthread_mutex_lock(&dbg->send_lock); - struct hdhomerun_debug_message_t *message = dbg->queue_tail; - if (!message) { - pthread_mutex_unlock(&dbg->queue_lock); - return FALSE; + if (!dbg->enabled) { + pthread_mutex_unlock(&dbg->send_lock); + return TRUE; + } + + bool_t ret; + if (dbg->file_name) { + ret = hdhomerun_debug_output_message_file(dbg, message); + } else { + ret = hdhomerun_debug_output_message_sock(dbg, message); } + pthread_mutex_unlock(&dbg->send_lock); + return ret; +} + +static void hdhomerun_debug_pop_and_free_message(struct hdhomerun_debug_t *dbg) +{ + pthread_mutex_lock(&dbg->queue_lock); + + struct hdhomerun_debug_message_t *message = dbg->queue_tail; dbg->queue_tail = message->prev; if (message->prev) { message->prev->next = NULL; } else { dbg->queue_head = NULL; } + dbg->queue_depth--; pthread_mutex_unlock(&dbg->queue_lock); - pthread_mutex_lock(&dbg->file_lock); - hdhomerun_debug_output_message_log_file(dbg, message); - pthread_mutex_unlock(&dbg->file_lock); - - pthread_mutex_lock(&dbg->server_lock); - hdhomerun_debug_output_message_support_server(dbg, message); - pthread_mutex_unlock(&dbg->server_lock); - free(message); - - return TRUE; } static THREAD_FUNC_PREFIX hdhomerun_debug_thread_execute(void *arg) @@ -303,9 +391,28 @@ static THREAD_FUNC_PREFIX hdhomerun_debug_thread_execute(void *arg) struct hdhomerun_debug_t *dbg = (struct hdhomerun_debug_t *)arg; while (!dbg->terminate) { - if (!hdhomerun_debug_output_message(dbg)) { + + pthread_mutex_lock(&dbg->queue_lock); + struct hdhomerun_debug_message_t *message = dbg->queue_tail; + uint32_t queue_depth = dbg->queue_depth; + pthread_mutex_unlock(&dbg->queue_lock); + + if (!message) { sleep(1); + continue; } + + if (queue_depth > 256) { + hdhomerun_debug_pop_and_free_message(dbg); + continue; + } + + if (!hdhomerun_debug_output_message(dbg, message)) { + sleep(1); + continue; + } + + hdhomerun_debug_pop_and_free_message(dbg); } return 0; libhdhomerun/hdhomerun_debug.c @@ -3,10 +3,10 @@ * * Copyright © 2006 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ /* @@ -35,13 +34,14 @@ struct hdhomerun_debug_t; extern struct hdhomerun_debug_t *hdhomerun_debug_create(void); extern void hdhomerun_debug_destroy(struct hdhomerun_debug_t *dbg); -extern void hdhomerun_debug_enable_log_file(struct hdhomerun_debug_t *dbg, char *filename); -extern void hdhomerun_debug_disable_log_file(struct hdhomerun_debug_t *dbg); -extern void hdhomerun_debug_enable_support_server(struct hdhomerun_debug_t *dbg); -extern void hdhomerun_debug_disable_support_server(struct hdhomerun_debug_t *dbg); - +extern void hdhomerun_debug_set_prefix(struct hdhomerun_debug_t *dbg, const char *prefix); +extern void hdhomerun_debug_set_filename(struct hdhomerun_debug_t *dbg, const char *filename); +extern void hdhomerun_debug_enable(struct hdhomerun_debug_t *dbg); +extern void hdhomerun_debug_disable(struct hdhomerun_debug_t *dbg); extern bool_t hdhomerun_debug_enabled(struct hdhomerun_debug_t *dbg); +extern void hdhomerun_debug_flush(struct hdhomerun_debug_t *dbg, uint64_t timeout); + extern void hdhomerun_debug_printf(struct hdhomerun_debug_t *dbg, const char *fmt, ...); extern void hdhomerun_debug_vprintf(struct hdhomerun_debug_t *dbg, const char *fmt, va_list args); libhdhomerun/hdhomerun_debug.h @@ -1,12 +1,12 @@ /* - * hdhomerun_record.c + * hdhomerun_device.c * * Copyright © 2006 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,13 +14,13 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #include "hdhomerun_os.h" #include "hdhomerun_pkt.h" #include "hdhomerun_debug.h" +#include "hdhomerun_channels.h" #include "hdhomerun_discover.h" #include "hdhomerun_control.h" #include "hdhomerun_video.h" @@ -29,16 +29,33 @@ struct hdhomerun_device_t { struct hdhomerun_control_sock_t *cs; struct hdhomerun_video_sock_t *vs; + struct hdhomerun_debug_t *dbg; unsigned int tuner; char name[32]; - char result_buffer[1024]; + char model[32]; }; -static void hdhomerun_device_update_name(struct hdhomerun_device_t *hd) +static void hdhomerun_device_set_update(struct hdhomerun_device_t *hd) { + /* Clear cached information. */ + *hd->model = 0; + + /* New name. */ sprintf(hd->name, "%08lX-%u", (unsigned long)hdhomerun_control_get_device_id(hd->cs), hd->tuner); } +void hdhomerun_device_set_device(struct hdhomerun_device_t *hd, uint32_t device_id, uint32_t device_ip) +{ + hdhomerun_control_set_device(hd->cs, device_id, device_ip); + hdhomerun_device_set_update(hd); +} + +void hdhomerun_device_set_tuner(struct hdhomerun_device_t *hd, unsigned int tuner) +{ + hd->tuner = tuner; + hdhomerun_device_set_update(hd); +} + struct hdhomerun_device_t *hdhomerun_device_create(uint32_t device_id, uint32_t device_ip, unsigned int tuner) { struct hdhomerun_device_t *hd = (struct hdhomerun_device_t *)calloc(1, sizeof(struct hdhomerun_device_t)); @@ -46,63 +63,130 @@ struct hdhomerun_device_t *hdhomerun_device_create(uint32_t device_id, uint32_t return NULL; } - hd->tuner = tuner; - - hd->cs = hdhomerun_control_create(device_id, device_ip); + hd->cs = hdhomerun_control_create(0, 0); if (!hd->cs) { free(hd); return NULL; } - hdhomerun_device_update_name(hd); + hdhomerun_device_set_device(hd, device_id, device_ip); + hdhomerun_device_set_tuner(hd, tuner); return hd; } -struct hdhomerun_device_t *hdhomerun_device_create_from_str(const char *device_str) +void hdhomerun_device_destroy(struct hdhomerun_device_t *hd) { - unsigned long a[4]; - if (sscanf(device_str, "%lu.%lu.%lu.%lu", &a[0], &a[1], &a[2], &a[3]) == 4) { - unsigned long device_ip = (a[0] << 24) | (a[1] << 16) | (a[2] << 8) | (a[3] << 0); - return hdhomerun_device_create(HDHOMERUN_DEVICE_ID_WILDCARD, (uint32_t)device_ip, 0); + if (hd->vs) { + hdhomerun_video_destroy(hd->vs); } - unsigned long device_id; - unsigned int tuner; - if (sscanf(device_str, "%lx:%u", &device_id, &tuner) == 2) { - return hdhomerun_device_create((uint32_t)device_id, 0, tuner); + hdhomerun_control_destroy(hd->cs); + + free(hd); +} + +static bool_t is_hex_char(char c) +{ + if ((c >= '0') && (c <= '9')) { + return TRUE; } - if (sscanf(device_str, "%lx-%u", &device_id, &tuner) == 2) { - return hdhomerun_device_create((uint32_t)device_id, 0, tuner); + if ((c >= 'A') && (c <= 'F')) { + return TRUE; + } + if ((c >= 'a') && (c <= 'f')) { + return TRUE; + } + return FALSE; +} + +static struct hdhomerun_device_t *hdhomerun_device_create_from_str_device_id(const char *device_str) +{ + int i; + const char *ptr = device_str; + for (i = 0; i < 8; i++) { + if (!is_hex_char(*ptr++)) { + return NULL; + } } - if (sscanf(device_str, "%lx", &device_id) == 1) { + + if (*ptr == 0) { + unsigned long device_id; + if (sscanf(device_str, "%lx", &device_id) != 1) { + return NULL; + } return hdhomerun_device_create((uint32_t)device_id, 0, 0); } + if (*ptr == '-') { + unsigned long device_id; + unsigned int tuner; + if (sscanf(device_str, "%lx-%u", &device_id, &tuner) != 2) { + return NULL; + } + return hdhomerun_device_create((uint32_t)device_id, 0, tuner); + } + return NULL; } -void hdhomerun_device_destroy(struct hdhomerun_device_t *hd) +static struct hdhomerun_device_t *hdhomerun_device_create_from_str_ip(const char *device_str) { - if (hd->vs) { - hdhomerun_video_destroy(hd->vs); + unsigned long a[4]; + if (sscanf(device_str, "%lu.%lu.%lu.%lu", &a[0], &a[1], &a[2], &a[3]) != 4) { + return NULL; } - hdhomerun_control_destroy(hd->cs); - - free(hd); + unsigned long device_ip = (a[0] << 24) | (a[1] << 16) | (a[2] << 8) | (a[3] << 0); + return hdhomerun_device_create(HDHOMERUN_DEVICE_ID_WILDCARD, (uint32_t)device_ip, 0); } -void hdhomerun_device_set_device(struct hdhomerun_device_t *hd, uint32_t device_id, uint32_t device_ip) +static struct hdhomerun_device_t *hdhomerun_device_create_from_str_dns(const char *device_str) { - hdhomerun_control_set_device(hd->cs, device_id, device_ip); - hdhomerun_device_update_name(hd); +#if defined(__CYGWIN__) + return NULL; +#else + struct addrinfo hints; + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_INET; + hints.ai_socktype = SOCK_STREAM; + hints.ai_protocol = IPPROTO_TCP; + + struct addrinfo *sock_info; + if (getaddrinfo(device_str, "65001", &hints, &sock_info) != 0) { + return NULL; + } + + struct sockaddr_in *sock_addr = (struct sockaddr_in *)sock_info->ai_addr; + uint32_t device_ip = ntohl(sock_addr->sin_addr.s_addr); + freeaddrinfo(sock_info); + + if (device_ip == 0) { + return NULL; + } + + return hdhomerun_device_create(HDHOMERUN_DEVICE_ID_WILDCARD, (uint32_t)device_ip, 0); +#endif } -void hdhomerun_device_set_tuner(struct hdhomerun_device_t *hd, unsigned int tuner) +struct hdhomerun_device_t *hdhomerun_device_create_from_str(const char *device_str) { - hd->tuner = tuner; - hdhomerun_device_update_name(hd); + struct hdhomerun_device_t *device = hdhomerun_device_create_from_str_device_id(device_str); + if (device) { + return device; + } + + device = hdhomerun_device_create_from_str_ip(device_str); + if (device) { + return device; + } + + device = hdhomerun_device_create_from_str_dns(device_str); + if (device) { + return device; + } + + return NULL; } int hdhomerun_device_set_tuner_from_str(struct hdhomerun_device_t *hd, const char *tuner_str) @@ -120,6 +204,16 @@ int hdhomerun_device_set_tuner_from_str(struct hdhomerun_device_t *hd, const cha return -1; } +void hdhomerun_device_set_debug(struct hdhomerun_device_t *hd, struct hdhomerun_debug_t *dbg) +{ + hd->dbg = dbg; + hdhomerun_control_set_debug(hd->cs, dbg); + + if (hd->vs) { + hdhomerun_video_set_debug(hd->vs, dbg); + } +} + uint32_t hdhomerun_device_get_device_id(struct hdhomerun_device_t *hd) { return hdhomerun_control_get_device_id(hd->cs); @@ -130,6 +224,16 @@ uint32_t hdhomerun_device_get_device_ip(struct hdhomerun_device_t *hd) return hdhomerun_control_get_device_ip(hd->cs); } +uint32_t hdhomerun_device_get_device_id_requested(struct hdhomerun_device_t *hd) +{ + return hdhomerun_control_get_device_id_requested(hd->cs); +} + +uint32_t hdhomerun_device_get_device_ip_requested(struct hdhomerun_device_t *hd) +{ + return hdhomerun_control_get_device_ip_requested(hd->cs); +} + unsigned int hdhomerun_device_get_tuner(struct hdhomerun_device_t *hd) { return hd->tuner; @@ -142,9 +246,16 @@ struct hdhomerun_control_sock_t *hdhomerun_device_get_control_sock(struct hdhome struct hdhomerun_video_sock_t *hdhomerun_device_get_video_sock(struct hdhomerun_device_t *hd) { + if (hd->vs) { + return hd->vs; + } + + hd->vs = hdhomerun_video_create(0, VIDEO_DATA_BUFFER_SIZE_1S * 2); if (!hd->vs) { - hd->vs = hdhomerun_video_create(0, VIDEO_DATA_BUFFER_SIZE_1S); + return NULL; } + + hdhomerun_video_set_debug(hd->vs, hd->dbg); return hd->vs; } @@ -166,6 +277,55 @@ static uint32_t hdhomerun_device_get_status_parse(const char *status_str, const return (uint32_t)value; } +uint32_t hdhomerun_device_get_tuner_status_ss_color(struct hdhomerun_tuner_status_t *status) +{ + unsigned int ss_yellow_min; + unsigned int ss_green_min; + + if (strstr(status->lock_str, "8vsb")) { + ss_yellow_min = 50; /* -30dBmV */ + ss_green_min = 75; /* -15dBmV */ + } else if (strstr(status->lock_str, "qam64")) { + ss_yellow_min = 80; /* -12dBmV */ + ss_green_min = 90; /* -6dBmV */ + } else if (strstr(status->lock_str, "qam256")) { + ss_yellow_min = 80; /* -12dBmV */ + ss_green_min = 90; /* -6dBmV */ + } else { + return HDHOMERUN_STATUS_COLOR_NEUTRAL; + } + + if (status->signal_strength >= ss_green_min) { + return HDHOMERUN_STATUS_COLOR_GREEN; + } + if (status->signal_strength >= ss_yellow_min) { + return HDHOMERUN_STATUS_COLOR_YELLOW; + } + + return HDHOMERUN_STATUS_COLOR_RED; +} + +uint32_t hdhomerun_device_get_tuner_status_snq_color(struct hdhomerun_tuner_status_t *status) +{ + if (status->signal_to_noise_quality >= 60) { + return HDHOMERUN_STATUS_COLOR_GREEN; + } + if (status->signal_to_noise_quality >= 40) { + return HDHOMERUN_STATUS_COLOR_YELLOW; + } + + return HDHOMERUN_STATUS_COLOR_RED; +} + +uint32_t hdhomerun_device_get_tuner_status_seq_color(struct hdhomerun_tuner_status_t *status) +{ + if (status->symbol_error_quality >= 100) { + return HDHOMERUN_STATUS_COLOR_GREEN; + } + + return HDHOMERUN_STATUS_COLOR_RED; +} + int hdhomerun_device_get_tuner_status(struct hdhomerun_device_t *hd, struct hdhomerun_tuner_status_t *status) { memset(status, 0, sizeof(struct hdhomerun_tuner_status_t)); @@ -250,6 +410,55 @@ int hdhomerun_device_get_tuner_target(struct hdhomerun_device_t *hd, char **ptar return hdhomerun_control_get(hd->cs, name, ptarget, NULL); } +int hdhomerun_device_get_tuner_plotsample(struct hdhomerun_device_t *hd, struct hdhomerun_plotsample_t **psamples, size_t *pcount) +{ + char name[32]; + sprintf(name, "/tuner%u/plotsample", hd->tuner); + + char *result; + int ret = hdhomerun_control_get(hd->cs, name, &result, NULL); + if (ret <= 0) { + return ret; + } + + struct hdhomerun_plotsample_t *samples = (struct hdhomerun_plotsample_t *)result; + *psamples = samples; + size_t count = 0; + + while (1) { + char *ptr = strchr(result, ' '); + if (!ptr) { + break; + } + *ptr++ = 0; + + unsigned long raw; + if (sscanf(result, "%lx", &raw) != 1) { + break; + } + + uint16_t real = (raw >> 12) & 0x0FFF; + if (real & 0x0800) { + real |= 0xF000; + } + + uint16_t imag = (raw >> 0) & 0x0FFF; + if (imag & 0x0800) { + imag |= 0xF000; + } + + samples->real = (int16_t)real; + samples->imag = (int16_t)imag; + samples++; + count++; + + result = ptr; + } + + *pcount = count; + return 1; +} + int hdhomerun_device_get_ir_target(struct hdhomerun_device_t *hd, char **ptarget) { return hdhomerun_control_get(hd->cs, "/ir/target", ptarget, NULL); @@ -430,9 +639,9 @@ int hdhomerun_device_set_var(struct hdhomerun_device_t *hd, const char *name, co int hdhomerun_device_wait_for_lock(struct hdhomerun_device_t *hd, struct hdhomerun_tuner_status_t *status) { - /* Wait for up to 1.5 seconds for lock. */ + /* Wait for up to 2.5 seconds for lock. */ int i; - for (i = 0; i < 6; i++) { + for (i = 0; i < 10; i++) { usleep(250000); /* Get status to check for lock. Quality numbers will not be valid yet. */ @@ -500,6 +709,63 @@ int hdhomerun_device_firmware_version_check(struct hdhomerun_device_t *hd, uint3 return 1; } +const char *hdhomerun_device_get_model_str(struct hdhomerun_device_t *hd) +{ + if (*hd->model) { + return hd->model; + } + + char *model_str; + int ret = hdhomerun_control_get(hd->cs, "/sys/model", &model_str, NULL); + if (ret < 0) { + return NULL; + } + if (ret == 0) { + strcpy(hd->model, "hdhomerun_atsc"); + return hd->model; + } + + strcpy(hd->model, model_str); + return hd->model; +} + +uint32_t hdhomerun_device_model_channel_map_all(struct hdhomerun_device_t *hd) +{ + return hdhomerun_device_model_channel_map_antenna(hd) | hdhomerun_device_model_channel_map_cable(hd); +} + +uint32_t hdhomerun_device_model_channel_map_antenna(struct hdhomerun_device_t *hd) +{ + const char *model = hdhomerun_device_get_model_str(hd); + if (!model) { + return 0; + } + + if (strstr(model, "atsc")) { + return CHANNEL_MAP_US_BCAST; + } + + if (strstr(model, "dvbt")) { + return CHANNEL_MAP_UK_BCAST | CHANNEL_MAP_NZ_BCAST; + } + + return 0; +} + +uint32_t hdhomerun_device_model_channel_map_cable(struct hdhomerun_device_t *hd) +{ + const char *model = hdhomerun_device_get_model_str(hd); + if (!model) { + return 0; + } + + if (strstr(model, "atsc")) { + return CHANNEL_MAP_US_CABLE | CHANNEL_MAP_US_HRC | CHANNEL_MAP_US_IRC; + } + + return 0; +} + int hdhomerun_device_upgrade(struct hdhomerun_device_t *hd, FILE *upgrade_file) { hdhomerun_control_set(hd->cs, "/tuner0/channel", "none", NULL, NULL); @@ -507,9 +773,9 @@ int hdhomerun_device_upgrade(struct hdhomerun_device_t *hd, FILE *upgrade_file) return hdhomerun_control_upgrade(hd->cs, upgrade_file); } -void hdhomerun_device_debug_print_video_stats(struct hdhomerun_device_t *hd, struct hdhomerun_debug_t *dbg) +void hdhomerun_device_debug_print_video_stats(struct hdhomerun_device_t *hd) { - if (!hdhomerun_debug_enabled(dbg)) { + if (!hdhomerun_debug_enabled(hd->dbg)) { return; } @@ -520,17 +786,17 @@ void hdhomerun_device_debug_print_video_stats(struct hdhomerun_device_t *hd, str char *error_str; int ret = hdhomerun_control_get(hd->cs, name, &debug_str, &error_str); if (ret < 0) { - hdhomerun_debug_printf(dbg, "%s video dev: communication error getting debug stats\n", hd->name); + hdhomerun_debug_printf(hd->dbg, "video dev: communication error getting debug stats\n"); return; } if (error_str) { - hdhomerun_debug_printf(dbg, "%s video dev: %s\n", hd->name, error_str); + hdhomerun_debug_printf(hd->dbg, "video dev: %s\n", error_str); } else { - hdhomerun_debug_printf(dbg, "%s video dev: %s\n", hd->name, debug_str); + hdhomerun_debug_printf(hd->dbg, "video dev: %s\n", debug_str); } if (hd->vs) { - hdhomerun_video_debug_print_stats(hd->vs, dbg, hd->name); + hdhomerun_video_debug_print_stats(hd->vs); } } libhdhomerun/hdhomerun_device.c @@ -3,10 +3,10 @@ * * Copyright © 2006 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #ifdef __cplusplus @@ -26,6 +25,11 @@ extern "C" { #define HDHOMERUN_DEVICE_MAX_LOCK_TO_DATA_TIME 2000 #define HDHOMERUN_DEVICE_MAX_TUNE_TO_DATA_TIME (HDHOMERUN_DEVICE_MAX_TUNE_TO_LOCK_TIME + HDHOMERUN_DEVICE_MAX_LOCK_TO_DATA_TIME) +#define HDHOMERUN_STATUS_COLOR_NEUTRAL 0xFFFFFFFF +#define HDHOMERUN_STATUS_COLOR_RED 0xFFFF0000 +#define HDHOMERUN_STATUS_COLOR_YELLOW 0xFFFFFF00 +#define HDHOMERUN_STATUS_COLOR_GREEN 0xFF008000 + struct hdhomerun_device_t; struct hdhomerun_tuner_status_t { @@ -41,6 +45,11 @@ struct hdhomerun_tuner_status_t { uint32_t packets_per_second; }; +struct hdhomerun_plotsample_t { + int16_t real; + int16_t imag; +}; + /* * Create a device object. * @@ -65,7 +74,6 @@ struct hdhomerun_tuner_status_t { * The hdhomerun_device_create_from_str function creates a device object from the given device_str. * The device_str parameter can be any of the following forms: * <device id> - * <device id>:<tuner index> * <device id>-<tuner index> * <ip address> * If the tuner index is not included in the device_str then it is set to zero. @@ -85,7 +93,10 @@ extern void hdhomerun_device_destroy(struct hdhomerun_device_t *hd); */ extern uint32_t hdhomerun_device_get_device_id(struct hdhomerun_device_t *hd); extern uint32_t hdhomerun_device_get_device_ip(struct hdhomerun_device_t *hd); +extern uint32_t hdhomerun_device_get_device_id_requested(struct hdhomerun_device_t *hd); +extern uint32_t hdhomerun_device_get_device_ip_requested(struct hdhomerun_device_t *hd); extern unsigned int hdhomerun_device_get_tuner(struct hdhomerun_device_t *hd); + extern void hdhomerun_device_set_device(struct hdhomerun_device_t *hd, uint32_t device_id, uint32_t device_ip); extern void hdhomerun_device_set_tuner(struct hdhomerun_device_t *hd, unsigned int tuner); extern int hdhomerun_device_set_tuner_from_str(struct hdhomerun_device_t *hd, const char *tuner_str); @@ -117,10 +128,20 @@ extern int hdhomerun_device_get_tuner_channelmap(struct hdhomerun_device_t *hd, extern int hdhomerun_device_get_tuner_filter(struct hdhomerun_device_t *hd, char **pfilter); extern int hdhomerun_device_get_tuner_program(struct hdhomerun_device_t *hd, char **pprogram); extern int hdhomerun_device_get_tuner_target(struct hdhomerun_device_t *hd, char **ptarget); +extern int hdhomerun_device_get_tuner_plotsample(struct hdhomerun_device_t *hd, struct hdhomerun_plotsample_t **psamples, size_t *pcount); extern int hdhomerun_device_get_ir_target(struct hdhomerun_device_t *hd, char **ptarget); extern int hdhomerun_device_get_lineup_location(struct hdhomerun_device_t *hd, char **plocation); extern int hdhomerun_device_get_version(struct hdhomerun_device_t *hd, char **pversion_str, uint32_t *pversion_num); +extern uint32_t hdhomerun_device_get_tuner_status_ss_color(struct hdhomerun_tuner_status_t *status); +extern uint32_t hdhomerun_device_get_tuner_status_snq_color(struct hdhomerun_tuner_status_t *status); +extern uint32_t hdhomerun_device_get_tuner_status_seq_color(struct hdhomerun_tuner_status_t *status); + +extern const char *hdhomerun_device_get_model_str(struct hdhomerun_device_t *hd); +extern uint32_t hdhomerun_device_model_channel_map_all(struct hdhomerun_device_t *hd); +extern uint32_t hdhomerun_device_model_channel_map_antenna(struct hdhomerun_device_t *hd); +extern uint32_t hdhomerun_device_model_channel_map_cable(struct hdhomerun_device_t *hd); + /* * Set operations. * @@ -224,7 +245,8 @@ extern struct hdhomerun_video_sock_t *hdhomerun_device_get_video_sock(struct hdh /* * Debug print internal stats. */ -extern void hdhomerun_device_debug_print_video_stats(struct hdhomerun_device_t *hd, struct hdhomerun_debug_t *dbg); +extern void hdhomerun_device_set_debug(struct hdhomerun_device_t *hd, struct hdhomerun_debug_t *dbg); +extern void hdhomerun_device_debug_print_video_stats(struct hdhomerun_device_t *hd); #ifdef __cplusplus } libhdhomerun/hdhomerun_device.h @@ -1,12 +1,12 @@ /* * hdhomerun_discover.c * - * Copyright © 2006 Silicondust Engineering Ltd. <www.silicondust.com>. + * Copyright © 2006-2007 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #include "hdhomerun_os.h" @@ -24,85 +23,68 @@ #if defined(__CYGWIN__) || defined(__WINDOWS__) #include <windows.h> -#include <iptypes.h> #include <iphlpapi.h> +#define USE_IPHLPAPI 1 #endif -#if defined(__APPLE__) || defined(__BSD__) +#if defined(__linux__) || defined(__APPLE__) || defined(BSD) #include <ifaddrs.h> +#define USE_IFADDRS 1 #endif +#define HDHOMERUN_DISOCVER_MAX_SOCK_COUNT 16 + struct hdhomerun_discover_sock_t { int sock; + uint32_t broadcast_ip; +}; + +struct hdhomerun_discover_t { + struct hdhomerun_discover_sock_t socks[HDHOMERUN_DISOCVER_MAX_SOCK_COUNT]; + unsigned int sock_count; + struct hdhomerun_pkt_t tx_pkt; + struct hdhomerun_pkt_t rx_pkt; }; -static struct hdhomerun_discover_sock_t *hdhomerun_discover_create(void) +static void hdhomerun_discover_sock_create(struct hdhomerun_discover_t *ds, uint32_t local_ip, uint32_t mask) { - struct hdhomerun_discover_sock_t *ds = (struct hdhomerun_discover_sock_t *)malloc(sizeof(struct hdhomerun_discover_sock_t)); - if (!ds) { - return NULL; + if (ds->sock_count >= HDHOMERUN_DISOCVER_MAX_SOCK_COUNT) { + return; } - + /* Create socket. */ - ds->sock = (int)socket(AF_INET, SOCK_DGRAM, 0); - if (ds->sock == -1) { - free(ds); - return NULL; + int sock = (int)socket(AF_INET, SOCK_DGRAM, 0); + if (sock == -1) { + return; } /* Set timeouts. */ - setsocktimeout(ds->sock, SOL_SOCKET, SO_SNDTIMEO, 1000); - setsocktimeout(ds->sock, SOL_SOCKET, SO_RCVTIMEO, 1000); + setsocktimeout(sock, SOL_SOCKET, SO_SNDTIMEO, 1000); + setsocktimeout(sock, SOL_SOCKET, SO_RCVTIMEO, 1000); /* Allow broadcast. */ int sock_opt = 1; - setsockopt(ds->sock, SOL_SOCKET, SO_BROADCAST, (char *)&sock_opt, sizeof(sock_opt)); + setsockopt(sock, SOL_SOCKET, SO_BROADCAST, (char *)&sock_opt, sizeof(sock_opt)); /* Bind socket. */ struct sockaddr_in sock_addr; memset(&sock_addr, 0, sizeof(sock_addr)); sock_addr.sin_family = AF_INET; - sock_addr.sin_addr.s_addr = htonl(INADDR_ANY); + sock_addr.sin_addr.s_addr = htonl(local_ip); sock_addr.sin_port = htons(0); - if (bind(ds->sock, (struct sockaddr *)&sock_addr, sizeof(sock_addr)) != 0) { - close(ds->sock); - free(ds); - return NULL; - } - - /* Success. */ - return ds; -} - -static void hdhomerun_discover_destroy(struct hdhomerun_discover_sock_t *ds) -{ - close(ds->sock); - free(ds); -} - -static int hdhomerun_discover_send_packet(struct hdhomerun_discover_sock_t *ds, uint32_t ip_addr, uint32_t device_type, uint32_t device_id) -{ - uint8_t buffer[1024]; - uint8_t *ptr = buffer; - hdhomerun_write_discover_request(&ptr, device_type, device_id); - - struct sockaddr_in sock_addr; - memset(&sock_addr, 0, sizeof(sock_addr)); - sock_addr.sin_family = AF_INET; - sock_addr.sin_addr.s_addr = htonl(ip_addr); - sock_addr.sin_port = htons(HDHOMERUN_DISCOVER_UDP_PORT); - - int length = (int)(ptr - buffer); - if (sendto(ds->sock, (char *)buffer, (int)length, 0, (struct sockaddr *)&sock_addr, sizeof(sock_addr)) != length) { - return -1; + if (bind(sock, (struct sockaddr *)&sock_addr, sizeof(sock_addr)) != 0) { + close(sock); + return; } - return 0; + /* Write sock entry. */ + struct hdhomerun_discover_sock_t *dss = &ds->socks[ds->sock_count++]; + dss->sock = sock; + dss->broadcast_ip = local_ip | ~mask; } -#if defined(__CYGWIN__) || defined(__WINDOWS__) - -static int hdhomerun_discover_send_internal(struct hdhomerun_discover_sock_t *ds, uint32_t device_type, uint32_t device_id) +#if defined(USE_IPHLPAPI) +static void hdhomerun_discover_sock_detect(struct hdhomerun_discover_t *ds) { PIP_ADAPTER_INFO pAdapterInfo = (IP_ADAPTER_INFO *)malloc(sizeof(IP_ADAPTER_INFO)); ULONG ulOutBufLen = sizeof(IP_ADAPTER_INFO); @@ -111,37 +93,29 @@ static int hdhomerun_discover_send_internal(struct hdhomerun_discover_sock_t *ds if (Ret != NO_ERROR) { free(pAdapterInfo); if (Ret != ERROR_BUFFER_OVERFLOW) { - return -1; + return; } pAdapterInfo = (IP_ADAPTER_INFO *)malloc(ulOutBufLen); Ret = GetAdaptersInfo(pAdapterInfo, &ulOutBufLen); if (Ret != NO_ERROR) { free(pAdapterInfo); - return -1; + return; } } - unsigned int send_count = 0; PIP_ADAPTER_INFO pAdapter = pAdapterInfo; while (pAdapter) { IP_ADDR_STRING *pIPAddr = &pAdapter->IpAddressList; while (pIPAddr) { - uint32_t addr = ntohl(inet_addr(pIPAddr->IpAddress.String)); + uint32_t local_ip = ntohl(inet_addr(pIPAddr->IpAddress.String)); uint32_t mask = ntohl(inet_addr(pIPAddr->IpMask.String)); - - uint32_t broadcast = addr | ~mask; - if ((broadcast == 0x00000000) || (broadcast == 0xFFFFFFFF)) { - pIPAddr = pIPAddr->Next; - continue; - } - if (hdhomerun_discover_send_packet(ds, broadcast, device_type, device_id) < 0) { + if (local_ip == 0) { pIPAddr = pIPAddr->Next; continue; } - send_count++; - + hdhomerun_discover_sock_create(ds, local_ip, mask); pIPAddr = pIPAddr->Next; } @@ -149,72 +123,18 @@ static int hdhomerun_discover_send_internal(struct hdhomerun_discover_sock_t *ds } free(pAdapterInfo); - - if (send_count == 0) { - return -1; - } - - return 0; } +#endif -#elif defined(__linux__) - -static int hdhomerun_discover_send_internal(struct hdhomerun_discover_sock_t *ds, uint32_t device_type, uint32_t device_id) -{ - FILE *fp = fopen("/proc/net/route", "r"); - if (!fp) { - return -1; - } - - unsigned int send_count = 0; - while (1) { - char line[256]; - if (!fgets(line, sizeof(line), fp)) { - break; - } - line[255] = 0; - - uint32_t dest; - uint32_t mask; - if (sscanf(line, "%*s %x %*x %*x %*d %*d %*d %x", &dest, &mask) != 2) { - continue; - } - dest = ntohl(dest); - mask = ntohl(mask); - - uint32_t broadcast = dest | ~mask; - - if ((broadcast == 0x00000000) || (broadcast == 0xFFFFFFFF)) { - continue; - } - - if (hdhomerun_discover_send_packet(ds, broadcast, device_type, device_id) < 0) { - continue; - } - - send_count++; - } - - fclose(fp); - - if (send_count == 0) { - return -1; - } - - return 0; -} - -#elif defined(__APPLE__) || defined(__BSD__) - -static int hdhomerun_discover_send_internal(struct hdhomerun_discover_sock_t *ds, uint32_t device_type, uint32_t device_id) +#if defined(USE_IFADDRS) +static void hdhomerun_discover_sock_detect(struct hdhomerun_discover_t *ds) { struct ifaddrs *ifap; if (getifaddrs(&ifap) < 0) { - return -1; + return; } struct ifaddrs *p = ifap; - unsigned int send_count = 0; while (p) { struct sockaddr_in *addr_in = (struct sockaddr_in *)p->ifa_addr; struct sockaddr_in *mask_in = (struct sockaddr_in *)p->ifa_netmask; @@ -223,93 +143,125 @@ static int hdhomerun_discover_send_internal(struct hdhomerun_discover_sock_t *ds continue; } - uint32_t addr = ntohl(addr_in->sin_addr.s_addr); + uint32_t local_ip = ntohl(addr_in->sin_addr.s_addr); uint32_t mask = ntohl(mask_in->sin_addr.s_addr); - - uint32_t broadcast = addr | ~mask; - - if ((broadcast == 0x00000000) || (broadcast == 0xFFFFFFFF)) { + if (local_ip == 0) { p = p->ifa_next; continue; } - if (hdhomerun_discover_send_packet(ds, broadcast, device_type, device_id) < 0) { - p = p->ifa_next; - continue; - } - - send_count++; + hdhomerun_discover_sock_create(ds, local_ip, mask); p = p->ifa_next; } freeifaddrs(ifap); - - if (send_count == 0) { - return -1; - } - - return 0; } +#endif -#else -static int hdhomerun_discover_send_internal(struct hdhomerun_discover_sock_t *ds, uint32_t device_type, uint32_t device_id) +#if !defined(USE_IPHLPAPI) && !defined(USE_IFADDRS) +static void hdhomerun_discover_sock_detect(struct hdhomerun_discover_t *ds) { - return -1; + /* do nothing */ } - #endif -static int hdhomerun_discover_send(struct hdhomerun_discover_sock_t *ds, uint32_t target_ip, uint32_t device_type, uint32_t device_id) +static struct hdhomerun_discover_t *hdhomerun_discover_create(void) { - if (target_ip != 0) { - return hdhomerun_discover_send_packet(ds, target_ip, device_type, device_id); + struct hdhomerun_discover_t *ds = (struct hdhomerun_discover_t *)calloc(1, sizeof(struct hdhomerun_discover_t)); + if (!ds) { + return NULL; } - if (hdhomerun_discover_send_internal(ds, device_type, device_id) < 0) { - return hdhomerun_discover_send_packet(ds, 0xFFFFFFFF, device_type, device_id); + /* Detect & create sockets. */ + hdhomerun_discover_sock_detect(ds); + if (ds->sock_count == 0) { + hdhomerun_discover_sock_create(ds, 0, 0); + if (ds->sock_count == 0) { + free(ds); + return NULL; + } } - return 0; + /* Success. */ + return ds; } -static int hdhomerun_discover_recv(struct hdhomerun_discover_sock_t *ds, struct hdhomerun_discover_device_t *result) +static void hdhomerun_discover_destroy(struct hdhomerun_discover_t *ds) { - struct timeval t; - t.tv_sec = 0; - t.tv_usec = 250000; + unsigned int i; + for (i = 0; i < ds->sock_count; i++) { + struct hdhomerun_discover_sock_t *dss = &ds->socks[i]; + close(dss->sock); + } - fd_set readfds; - FD_ZERO(&readfds); - FD_SET(ds->sock, &readfds); + free(ds); +} - if (select(ds->sock+1, &readfds, NULL, NULL, &t) < 0) { - return -1; +static bool_t hdhomerun_discover_send_internal(struct hdhomerun_discover_t *ds, struct hdhomerun_discover_sock_t *dss, uint32_t target_ip, uint32_t device_type, uint32_t device_id) +{ + if (target_ip == 0) { + target_ip = dss->broadcast_ip; } - if (!FD_ISSET(ds->sock, &readfds)) { - return 0; + + struct hdhomerun_pkt_t *tx_pkt = &ds->tx_pkt; + hdhomerun_pkt_reset(tx_pkt); + + hdhomerun_pkt_write_u8(tx_pkt, HDHOMERUN_TAG_DEVICE_TYPE); + hdhomerun_pkt_write_var_length(tx_pkt, 4); + hdhomerun_pkt_write_u32(tx_pkt, device_type); + hdhomerun_pkt_write_u8(tx_pkt, HDHOMERUN_TAG_DEVICE_ID); + hdhomerun_pkt_write_var_length(tx_pkt, 4); + hdhomerun_pkt_write_u32(tx_pkt, device_id); + hdhomerun_pkt_seal_frame(tx_pkt, HDHOMERUN_TYPE_DISCOVER_REQ); + + struct sockaddr_in sock_addr; + memset(&sock_addr, 0, sizeof(sock_addr)); + sock_addr.sin_family = AF_INET; + sock_addr.sin_addr.s_addr = htonl(target_ip); + sock_addr.sin_port = htons(HDHOMERUN_DISCOVER_UDP_PORT); + + int length = (int)(tx_pkt->end - tx_pkt->start); + if (sendto(dss->sock, (char *)tx_pkt->start, length, 0, (struct sockaddr *)&sock_addr, sizeof(sock_addr)) != length) { + return FALSE; + } + + return TRUE; +} + +static bool_t hdhomerun_discover_send(struct hdhomerun_discover_t *ds, uint32_t target_ip, uint32_t device_type, uint32_t device_id) +{ + bool_t result = FALSE; + + unsigned int i; + for (i = 0; i < ds->sock_count; i++) { + struct hdhomerun_discover_sock_t *dss = &ds->socks[i]; + result |= hdhomerun_discover_send_internal(ds, dss, target_ip, device_type, device_id); } - uint8_t buffer[1024]; + return result; +} + +static int hdhomerun_discover_recv_internal(struct hdhomerun_discover_t *ds, struct hdhomerun_discover_sock_t *dss, struct hdhomerun_discover_device_t *result) +{ + struct hdhomerun_pkt_t *rx_pkt = &ds->rx_pkt; + hdhomerun_pkt_reset(rx_pkt); + struct sockaddr_in sock_addr; + memset(&sock_addr, 0, sizeof(sock_addr)); socklen_t sockaddr_size = sizeof(sock_addr); - int rx_length = recvfrom(ds->sock, (char *)buffer, sizeof(buffer), 0, (struct sockaddr *)&sock_addr, &sockaddr_size); + + int rx_length = recvfrom(dss->sock, (char *)rx_pkt->end, (int)(rx_pkt->limit - rx_pkt->end), 0, (struct sockaddr *)&sock_addr, &sockaddr_size); if (rx_length <= 0) { /* Don't return error - windows machine on VPN can sometimes cause a sock error here but otherwise works. */ return 0; } - if (rx_length < HDHOMERUN_MIN_PEEK_LENGTH) { - return 0; - } + rx_pkt->end += rx_length; - size_t length = hdhomerun_peek_packet_length(buffer); - if (length > (size_t)rx_length) { + uint16_t type; + if (hdhomerun_pkt_open_frame(rx_pkt, &type) <= 0) { return 0; } - - uint8_t *ptr = buffer; - uint8_t *end = buffer + length; - int type = hdhomerun_process_packet(&ptr, &end); if (type != HDHOMERUN_TYPE_DISCOVER_RPY) { return 0; } @@ -317,11 +269,12 @@ static int hdhomerun_discover_recv(struct hdhomerun_discover_sock_t *ds, struct result->ip_addr = ntohl(sock_addr.sin_addr.s_addr); result->device_type = 0; result->device_id = 0; + while (1) { uint8_t tag; size_t len; - uint8_t *value; - if (hdhomerun_read_tlv(&ptr, end, &tag, &len, &value) < 0) { + uint8_t *next = hdhomerun_pkt_read_tlv(rx_pkt, &tag, &len); + if (!next) { break; } @@ -330,28 +283,71 @@ static int hdhomerun_discover_recv(struct hdhomerun_discover_sock_t *ds, struct if (len != 4) { break; } - result->device_type = hdhomerun_read_u32(&value); + result->device_type = hdhomerun_pkt_read_u32(rx_pkt); break; + case HDHOMERUN_TAG_DEVICE_ID: if (len != 4) { break; } - result->device_id = hdhomerun_read_u32(&value); + result->device_id = hdhomerun_pkt_read_u32(rx_pkt); break; + default: break; } + + rx_pkt->pos = next; } return 1; } -static struct hdhomerun_discover_device_t *hdhomerun_discover_find_in_list(struct hdhomerun_discover_device_t result_list[], int count, uint32_t device_id) +static int hdhomerun_discover_recv(struct hdhomerun_discover_t *ds, struct hdhomerun_discover_device_t *result) +{ + struct timeval t; + t.tv_sec = 0; + t.tv_usec = 250000; + + fd_set readfds; + FD_ZERO(&readfds); + int max_sock = -1; + + unsigned int i; + for (i = 0; i < ds->sock_count; i++) { + struct hdhomerun_discover_sock_t *dss = &ds->socks[i]; + FD_SET(dss->sock, &readfds); + if (dss->sock > max_sock) { + max_sock = dss->sock; + } + } + + if (select(max_sock+1, &readfds, NULL, NULL, &t) < 0) { + return -1; + } + + for (i = 0; i < ds->sock_count; i++) { + struct hdhomerun_discover_sock_t *dss = &ds->socks[i]; + if (!FD_ISSET(dss->sock, &readfds)) { + continue; + } + + if (hdhomerun_discover_recv_internal(ds, dss, result) <= 0) { + continue; + } + + return 1; + } + + return 0; +} + +static struct hdhomerun_discover_device_t *hdhomerun_discover_find_in_list(struct hdhomerun_discover_device_t result_list[], int count, uint32_t ip_addr) { int index; for (index = 0; index < count; index++) { struct hdhomerun_discover_device_t *result = &result_list[index]; - if (result->device_id == device_id) { + if (result->ip_addr == ip_addr) { return result; } } @@ -359,16 +355,12 @@ static struct hdhomerun_discover_device_t *hdhomerun_discover_find_in_list(struc return NULL; } -static int hdhomerun_discover_find_devices_internal(struct hdhomerun_discover_sock_t *ds, uint32_t target_ip, uint32_t device_type, uint32_t device_id, struct hdhomerun_discover_device_t result_list[], int max_count) +static int hdhomerun_discover_find_devices_internal(struct hdhomerun_discover_t *ds, uint32_t target_ip, uint32_t device_type, uint32_t device_id, struct hdhomerun_discover_device_t result_list[], int max_count) { - if (!hdhomerun_discover_validate_device_id(device_id)) { - return 0; - } - int count = 0; int attempt; for (attempt = 0; attempt < 4; attempt++) { - if (hdhomerun_discover_send(ds, target_ip, device_type, device_id) < 0) { + if (!hdhomerun_discover_send(ds, target_ip, device_type, device_id)) { return -1; } @@ -397,7 +389,7 @@ static int hdhomerun_discover_find_devices_internal(struct hdhomerun_discover_so } /* Ensure not already in list. */ - if (hdhomerun_discover_find_in_list(result_list, count, result->device_id)) { + if (hdhomerun_discover_find_in_list(result_list, count, result->ip_addr)) { continue; } @@ -412,35 +404,9 @@ static int hdhomerun_discover_find_devices_internal(struct hdhomerun_discover_so return count; } -int hdhomerun_discover_find_device(uint32_t device_id, struct hdhomerun_discover_device_t *result) -{ - struct hdhomerun_discover_sock_t *ds = hdhomerun_discover_create(); - if (!ds) { - return -1; - } - - int ret = hdhomerun_discover_find_devices_internal(ds, 0, HDHOMERUN_DEVICE_TYPE_WILDCARD, device_id, result, 1); - - hdhomerun_discover_destroy(ds); - return ret; -} - -int hdhomerun_discover_find_devices(uint32_t device_type, struct hdhomerun_discover_device_t result_list[], int max_count) -{ - struct hdhomerun_discover_sock_t *ds = hdhomerun_discover_create(); - if (!ds) { - return -1; - } - - int ret = hdhomerun_discover_find_devices_internal(ds, 0, device_type, HDHOMERUN_DEVICE_ID_WILDCARD, result_list, max_count); - - hdhomerun_discover_destroy(ds); - return ret; -} - int hdhomerun_discover_find_devices_custom(uint32_t target_ip, uint32_t device_type, uint32_t device_id, struct hdhomerun_discover_device_t result_list[], int max_count) { - struct hdhomerun_discover_sock_t *ds = hdhomerun_discover_create(); + struct hdhomerun_discover_t *ds = hdhomerun_discover_create(); if (!ds) { return -1; } libhdhomerun/hdhomerun_discover.c @@ -1,12 +1,12 @@ /* * hdhomerun_discover.h * - * Copyright © 2006 Silicondust Engineering Ltd. <www.silicondust.com>. + * Copyright © 2006-2007 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #ifdef __cplusplus extern "C" { @@ -28,36 +27,13 @@ struct hdhomerun_discover_device_t { }; /* - * Find a device by device ID. - * - * The device information is stored in caller-supplied hdhomerun_discover_device_t var. - * Multiple attempts are made to find the device. - * Worst-case execution time is 1 second. - * - * Returns 1 on success. - * Returns 0 if not found. - * Retruns -1 on error. - */ -extern int hdhomerun_discover_find_device(uint32_t device_id, struct hdhomerun_discover_device_t *result); - -/* - * Find all devices of a given type. + * Find devices. * * The device information is stored in caller-supplied array of hdhomerun_discover_device_t vars. * Multiple attempts are made to find devices. * Execution time is 1 second. * - * Returns the number of devices found. - * Retruns -1 on error. - */ -extern int hdhomerun_discover_find_devices(uint32_t device_type, struct hdhomerun_discover_device_t result_list[], int max_count); - -/* - * Find custom. - * - * The device information is stored in caller-supplied array of hdhomerun_discover_device_t vars. - * Multiple attempts are made to find devices. - * Execution time is 1 second. + * Set target_ip to zero to auto-detect IP address. * * Returns the number of devices found. * Retruns -1 on error. libhdhomerun/hdhomerun_discover.h @@ -3,10 +3,10 @@ * * Copyright © 2006 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,11 +14,10 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -#if defined(WIN32) +#if defined(_WIN32) || defined(_WIN64) #define __WINDOWS__ #endif @@ -27,6 +26,7 @@ #include <windows.h> #include <winsock2.h> #include <ws2tcpip.h> +#include <wspiapi.h> #include <stdlib.h> #include <stdio.h> #include <stdarg.h> @@ -64,6 +64,10 @@ #if defined(__WINDOWS__) typedef int bool_t; +typedef signed __int8 int8_t; +typedef signed __int16 int16_t; +typedef signed __int32 int32_t; +typedef signed __int64 int64_t; typedef unsigned __int8 uint8_t; typedef unsigned __int16 uint16_t; typedef unsigned __int32 uint32_t; libhdhomerun/hdhomerun_os.h @@ -3,10 +3,10 @@ * * Copyright © 2005-2006 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,257 +14,220 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #include "hdhomerun_os.h" #include "hdhomerun_pkt.h" -uint8_t hdhomerun_read_u8(uint8_t **pptr) +struct hdhomerun_pkt_t *hdhomerun_pkt_create(void) { - uint8_t *ptr = *pptr; - uint8_t v = *ptr++; - *pptr = ptr; + struct hdhomerun_pkt_t *pkt = (struct hdhomerun_pkt_t *)calloc(1, sizeof(struct hdhomerun_pkt_t)); + if (!pkt) { + return NULL; + } + + hdhomerun_pkt_reset(pkt); + + return pkt; +} + +void hdhomerun_pkt_destroy(struct hdhomerun_pkt_t *pkt) +{ + free(pkt); +} + +void hdhomerun_pkt_reset(struct hdhomerun_pkt_t *pkt) +{ + pkt->limit = pkt->buffer + sizeof(pkt->buffer); + pkt->start = pkt->buffer + 1024; + pkt->end = pkt->start; + pkt->pos = pkt->start; +} + +static uint32_t hdhomerun_pkt_calc_crc(uint8_t *start, uint8_t *end) +{ + uint8_t *pos = start; + uint32_t crc = 0xFFFFFFFF; + while (pos < end) { + uint8_t x = (uint8_t)(crc) ^ *pos++; + crc >>= 8; + if (x & 0x01) crc ^= 0x77073096; + if (x & 0x02) crc ^= 0xEE0E612C; + if (x & 0x04) crc ^= 0x076DC419; + if (x & 0x08) crc ^= 0x0EDB8832; + if (x & 0x10) crc ^= 0x1DB71064; + if (x & 0x20) crc ^= 0x3B6E20C8; + if (x & 0x40) crc ^= 0x76DC4190; + if (x & 0x80) crc ^= 0xEDB88320; + } + return crc ^ 0xFFFFFFFF; +} + +uint8_t hdhomerun_pkt_read_u8(struct hdhomerun_pkt_t *pkt) +{ + uint8_t v = *pkt->pos++; return v; } -uint16_t hdhomerun_read_u16(uint8_t **pptr) +uint16_t hdhomerun_pkt_read_u16(struct hdhomerun_pkt_t *pkt) { - uint8_t *ptr = *pptr; uint16_t v; - v = (uint16_t)*ptr++ << 8; - v |= (uint16_t)*ptr++ << 0; - *pptr = ptr; + v = (uint16_t)*pkt->pos++ << 8; + v |= (uint16_t)*pkt->pos++ << 0; return v; } -uint32_t hdhomerun_read_u32(uint8_t **pptr) +uint32_t hdhomerun_pkt_read_u32(struct hdhomerun_pkt_t *pkt) { - uint8_t *ptr = *pptr; uint32_t v; - v = (uint32_t)*ptr++ << 24; - v |= (uint32_t)*ptr++ << 16; - v |= (uint32_t)*ptr++ << 8; - v |= (uint32_t)*ptr++ << 0; - *pptr = ptr; + v = (uint32_t)*pkt->pos++ << 24; + v |= (uint32_t)*pkt->pos++ << 16; + v |= (uint32_t)*pkt->pos++ << 8; + v |= (uint32_t)*pkt->pos++ << 0; return v; } -size_t hdhomerun_read_var_length(uint8_t **pptr, uint8_t *end) +size_t hdhomerun_pkt_read_var_length(struct hdhomerun_pkt_t *pkt) { - uint8_t *ptr = *pptr; size_t length; - if (ptr + 1 > end) { - return -1; + if (pkt->pos + 1 > pkt->end) { + return (size_t)-1; } - length = (size_t)*ptr++; + length = (size_t)*pkt->pos++; if (length & 0x0080) { - if (ptr + 1 > end) { - return -1; + if (pkt->pos + 1 > pkt->end) { + return (size_t)-1; } length &= 0x007F; - length |= (size_t)*ptr++ << 7; + length |= (size_t)*pkt->pos++ << 7; } - *pptr = ptr; return length; } -int hdhomerun_read_tlv(uint8_t **pptr, uint8_t *end, uint8_t *ptag, size_t *plength, uint8_t **pvalue) +uint8_t *hdhomerun_pkt_read_tlv(struct hdhomerun_pkt_t *pkt, uint8_t *ptag, size_t *plength) { - if (end - *pptr < 2) { - return -1; + if (pkt->pos + 2 > pkt->end) { + return NULL; } - *ptag = hdhomerun_read_u8(pptr); - *plength = hdhomerun_read_var_length(pptr, end); - *pvalue = *pptr; - - if ((size_t)(end - *pptr) < *plength) { - return -1; + *ptag = hdhomerun_pkt_read_u8(pkt); + *plength = hdhomerun_pkt_read_var_length(pkt); + + if (pkt->pos + *plength > pkt->end) { + return NULL; } - *pptr += *plength; - return 0; + return pkt->pos + *plength; } -void hdhomerun_write_u8(uint8_t **pptr, uint8_t v) +void hdhomerun_pkt_write_u8(struct hdhomerun_pkt_t *pkt, uint8_t v) { - uint8_t *ptr = *pptr; - *ptr++ = v; - *pptr = ptr; -} + *pkt->pos++ = v; -void hdhomerun_write_u16(uint8_t **pptr, uint16_t v) -{ - uint8_t *ptr = *pptr; - *ptr++ = (uint8_t)(v >> 8); - *ptr++ = (uint8_t)(v >> 0); - *pptr = ptr; + if (pkt->pos > pkt->end) { + pkt->end = pkt->pos; + } } -void hdhomerun_write_u32(uint8_t **pptr, uint32_t v) +void hdhomerun_pkt_write_u16(struct hdhomerun_pkt_t *pkt, uint16_t v) { - uint8_t *ptr = *pptr; - *ptr++ = (uint8_t)(v >> 24); - *ptr++ = (uint8_t)(v >> 16); - *ptr++ = (uint8_t)(v >> 8); - *ptr++ = (uint8_t)(v >> 0); - *pptr = ptr; -} + *pkt->pos++ = (uint8_t)(v >> 8); + *pkt->pos++ = (uint8_t)(v >> 0); -void hdhomerun_write_var_length(uint8_t **pptr, size_t v) -{ - uint8_t *ptr = *pptr; - if (v <= 127) { - *ptr++ = (uint8_t)v; - } else { - *ptr++ = (uint8_t)(v | 0x80); - *ptr++ = (uint8_t)(v >> 7); + if (pkt->pos > pkt->end) { + pkt->end = pkt->pos; } - *pptr = ptr; } -void hdhomerun_write_mem(uint8_t **pptr, const void *mem, size_t length) +void hdhomerun_pkt_write_u32(struct hdhomerun_pkt_t *pkt, uint32_t v) { - uint8_t *ptr = *pptr; - memcpy(ptr, mem, length); - ptr += length; - *pptr = ptr; -} + *pkt->pos++ = (uint8_t)(v >> 24); + *pkt->pos++ = (uint8_t)(v >> 16); + *pkt->pos++ = (uint8_t)(v >> 8); + *pkt->pos++ = (uint8_t)(v >> 0); -static uint32_t hdhomerun_calc_crc(uint8_t *start, uint8_t *end) -{ - uint8_t *ptr = start; - uint32_t crc = 0xFFFFFFFF; - while (ptr < end) { - uint8_t x = (uint8_t)(crc) ^ *ptr++; - crc >>= 8; - if (x & 0x01) crc ^= 0x77073096; - if (x & 0x02) crc ^= 0xEE0E612C; - if (x & 0x04) crc ^= 0x076DC419; - if (x & 0x08) crc ^= 0x0EDB8832; - if (x & 0x10) crc ^= 0x1DB71064; - if (x & 0x20) crc ^= 0x3B6E20C8; - if (x & 0x40) crc ^= 0x76DC4190; - if (x & 0x80) crc ^= 0xEDB88320; + if (pkt->pos > pkt->end) { + pkt->end = pkt->pos; } - return crc ^ 0xFFFFFFFF; } -static int hdhomerun_check_crc(uint8_t *start, uint8_t *end) +void hdhomerun_pkt_write_var_length(struct hdhomerun_pkt_t *pkt, size_t v) { - if (end - start < 8) { - return -1; + if (v <= 127) { + *pkt->pos++ = (uint8_t)v; + } else { + *pkt->pos++ = (uint8_t)(v | 0x80); + *pkt->pos++ = (uint8_t)(v >> 7); } - uint8_t *ptr = end - 4; - uint32_t actual_crc = hdhomerun_calc_crc(start, ptr); - uint32_t packet_crc; - packet_crc = (uint32_t)*ptr++ << 0; - packet_crc |= (uint32_t)*ptr++ << 8; - packet_crc |= (uint32_t)*ptr++ << 16; - packet_crc |= (uint32_t)*ptr++ << 24; - if (actual_crc != packet_crc) { - return -1; + + if (pkt->pos > pkt->end) { + pkt->end = pkt->pos; } - return 0; } -void hdhomerun_write_header_length(uint8_t *buffer, uint8_t *end) +void hdhomerun_pkt_write_mem(struct hdhomerun_pkt_t *pkt, const void *mem, size_t length) { - uint8_t *ptr = buffer + 2; - size_t length = end - buffer - 4; - hdhomerun_write_u16(&ptr, (uint16_t)length); -} + memcpy(pkt->pos, mem, length); + pkt->pos += length; -void hdhomerun_write_crc(uint8_t **pptr, uint8_t *start) -{ - uint8_t *ptr = *pptr; - uint32_t crc = hdhomerun_calc_crc(start, ptr); - *ptr++ = (uint8_t)(crc >> 0); - *ptr++ = (uint8_t)(crc >> 8); - *ptr++ = (uint8_t)(crc >> 16); - *ptr++ = (uint8_t)(crc >> 24); - *pptr = ptr; + if (pkt->pos > pkt->end) { + pkt->end = pkt->pos; + } } -void hdhomerun_write_discover_request(uint8_t **pptr, uint32_t device_type, uint32_t device_id) +int hdhomerun_pkt_open_frame(struct hdhomerun_pkt_t *pkt, uint16_t *ptype) { - uint8_t *start = *pptr; - hdhomerun_write_u16(pptr, HDHOMERUN_TYPE_DISCOVER_REQ); - hdhomerun_write_u16(pptr, 0); - - hdhomerun_write_u8(pptr, HDHOMERUN_TAG_DEVICE_TYPE); - hdhomerun_write_var_length(pptr, 4); - hdhomerun_write_u32(pptr, device_type); - hdhomerun_write_u8(pptr, HDHOMERUN_TAG_DEVICE_ID); - hdhomerun_write_var_length(pptr, 4); - hdhomerun_write_u32(pptr, device_id); - - hdhomerun_write_header_length(start, *pptr); - hdhomerun_write_crc(pptr, start); -} + pkt->pos = pkt->start; -void hdhomerun_write_get_set_request(uint8_t **pptr, const char *name, const char *value) -{ - uint8_t *start = *pptr; - hdhomerun_write_u16(pptr, HDHOMERUN_TYPE_GETSET_REQ); - hdhomerun_write_u16(pptr, 0); - - int name_len = (int)strlen(name) + 1; - hdhomerun_write_u8(pptr, HDHOMERUN_TAG_GETSET_NAME); - hdhomerun_write_var_length(pptr, name_len); - hdhomerun_write_mem(pptr, (void *)name, name_len); - - if (value) { - int value_len = (int)strlen(value) + 1; - hdhomerun_write_u8(pptr, HDHOMERUN_TAG_GETSET_VALUE); - hdhomerun_write_var_length(pptr, value_len); - hdhomerun_write_mem(pptr, (void *)value, value_len); + if (pkt->pos + 4 > pkt->end) { + return 0; } - hdhomerun_write_header_length(start, *pptr); - hdhomerun_write_crc(pptr, start); -} + *ptype = hdhomerun_pkt_read_u16(pkt); + size_t length = hdhomerun_pkt_read_u16(pkt); + pkt->pos += length; -void hdhomerun_write_upgrade_request(uint8_t **pptr, uint32_t sequence, void *data, size_t length) -{ - uint8_t *start = *pptr; - hdhomerun_write_u16(pptr, HDHOMERUN_TYPE_UPGRADE_REQ); - hdhomerun_write_u16(pptr, 0); + if (pkt->pos + 4 > pkt->end) { + pkt->pos = pkt->start; + return 0; + } + + uint32_t calc_crc = hdhomerun_pkt_calc_crc(pkt->start, pkt->pos); - hdhomerun_write_u32(pptr, sequence); - if (length > 0) { - hdhomerun_write_mem(pptr, data, length); + uint32_t packet_crc; + packet_crc = (uint32_t)*pkt->pos++ << 0; + packet_crc |= (uint32_t)*pkt->pos++ << 8; + packet_crc |= (uint32_t)*pkt->pos++ << 16; + packet_crc |= (uint32_t)*pkt->pos++ << 24; + if (calc_crc != packet_crc) { + return -1; } - hdhomerun_write_header_length(start, *pptr); - hdhomerun_write_crc(pptr, start); + pkt->start += 4; + pkt->end = pkt->start + length; + pkt->pos = pkt->start; + return 1; } -size_t hdhomerun_peek_packet_length(uint8_t *ptr) +void hdhomerun_pkt_seal_frame(struct hdhomerun_pkt_t *pkt, uint16_t frame_type) { - ptr += 2; - return (size_t)hdhomerun_read_u16(&ptr) + 8; -} + size_t length = pkt->end - pkt->start; -int hdhomerun_process_packet(uint8_t **pptr, uint8_t **pend) -{ - if (hdhomerun_check_crc(*pptr, *pend) < 0) { - return -1; - } - *pend -= 4; - - uint16_t type = hdhomerun_read_u16(pptr); - uint16_t length = hdhomerun_read_u16(pptr); - if ((*pend - *pptr) < length) { - return -1; - } - *pend = *pptr + length; - return (int)type; -} + pkt->start -= 4; + pkt->pos = pkt->start; + hdhomerun_pkt_write_u16(pkt, frame_type); + hdhomerun_pkt_write_u16(pkt, (uint16_t)length); + uint32_t crc = hdhomerun_pkt_calc_crc(pkt->start, pkt->end); + *pkt->end++ = (uint8_t)(crc >> 0); + *pkt->end++ = (uint8_t)(crc >> 8); + *pkt->end++ = (uint8_t)(crc >> 16); + *pkt->end++ = (uint8_t)(crc >> 24); + + pkt->pos = pkt->start; +} libhdhomerun/hdhomerun_pkt.c @@ -3,10 +3,10 @@ * * Copyright © 2005-2006 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #ifdef __cplusplus extern "C" { @@ -129,27 +128,33 @@ extern "C" { #define HDHOMERUN_MIN_PEEK_LENGTH 4 -extern uint8_t hdhomerun_read_u8(uint8_t **pptr); -extern uint16_t hdhomerun_read_u16(uint8_t **pptr); -extern uint32_t hdhomerun_read_u32(uint8_t **pptr); -extern size_t hdhomerun_read_var_length(uint8_t **pptr, uint8_t *end); -extern void hdhomerun_write_u8(uint8_t **pptr, uint8_t v); -extern void hdhomerun_write_u16(uint8_t **pptr, uint16_t v); -extern void hdhomerun_write_u32(uint8_t **pptr, uint32_t v); -extern void hdhomerun_write_mem(uint8_t **pptr, const void *mem, size_t length); -extern void hdhomerun_write_var_length(uint8_t **pptr, size_t v); -extern void hdhomerun_write_header_length(uint8_t *buffer, uint8_t *end); -extern void hdhomerun_write_crc(uint8_t **pptr, uint8_t *start); +struct hdhomerun_pkt_t { + uint8_t *pos; + uint8_t *start; + uint8_t *end; + uint8_t *limit; + uint8_t buffer[3074]; +}; -extern size_t hdhomerun_peek_packet_length(uint8_t *ptr); -extern int hdhomerun_process_packet(uint8_t **pptr, uint8_t **pend); -extern int hdhomerun_read_tlv(uint8_t **pptr, uint8_t *end, uint8_t *ptag, size_t *plength, uint8_t **pvalue); +extern struct hdhomerun_pkt_t *hdhomerun_pkt_create(void); +extern void hdhomerun_pkt_destroy(struct hdhomerun_pkt_t *pkt); +extern void hdhomerun_pkt_reset(struct hdhomerun_pkt_t *pkt); -extern void hdhomerun_write_discover_request(uint8_t **pptr, uint32_t device_type, uint32_t device_id); -extern void hdhomerun_write_get_set_request(uint8_t **pptr, const char *name, const char *value); -extern void hdhomerun_write_upgrade_request(uint8_t **pptr, uint32_t sequence, void *data, size_t length); +extern uint8_t hdhomerun_pkt_read_u8(struct hdhomerun_pkt_t *pkt); +extern uint16_t hdhomerun_pkt_read_u16(struct hdhomerun_pkt_t *pkt); +extern uint32_t hdhomerun_pkt_read_u32(struct hdhomerun_pkt_t *pkt); +extern size_t hdhomerun_pkt_read_var_length(struct hdhomerun_pkt_t *pkt); +extern uint8_t *hdhomerun_pkt_read_tlv(struct hdhomerun_pkt_t *pkt, uint8_t *ptag, size_t *plength); + +extern void hdhomerun_pkt_write_u8(struct hdhomerun_pkt_t *pkt, uint8_t v); +extern void hdhomerun_pkt_write_u16(struct hdhomerun_pkt_t *pkt, uint16_t v); +extern void hdhomerun_pkt_write_u32(struct hdhomerun_pkt_t *pkt, uint32_t v); +extern void hdhomerun_pkt_write_var_length(struct hdhomerun_pkt_t *pkt, size_t v); +extern void hdhomerun_pkt_write_mem(struct hdhomerun_pkt_t *pkt, const void *mem, size_t length); + +extern bool_t hdhomerun_pkt_open_frame(struct hdhomerun_pkt_t *pkt, uint16_t *ptype); +extern void hdhomerun_pkt_seal_frame(struct hdhomerun_pkt_t *pkt, uint16_t frame_type); #ifdef __cplusplus } #endif - libhdhomerun/hdhomerun_pkt.h @@ -3,10 +3,10 @@ * * Copyright © 2006 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #include "hdhomerun_os.h" @@ -32,10 +31,12 @@ struct hdhomerun_video_sock_t { volatile bool_t terminate; pthread_t thread; int sock; - uint32_t packet_count; - uint32_t transport_error_count; - uint32_t sequence_error_count; - uint8_t sequence[0x2000]; + struct hdhomerun_debug_t *dbg; + volatile uint32_t packet_count; + volatile uint32_t transport_error_count; + volatile uint32_t sequence_error_count; + volatile uint32_t overflow_error_count; + volatile uint8_t sequence[0x2000]; }; static THREAD_FUNC_PREFIX hdhomerun_video_thread_execute(void *arg); @@ -85,7 +86,7 @@ struct hdhomerun_video_sock_t *hdhomerun_video_create(uint16_t listen_port, size } /* Reset sequence tracking. */ - memset(vs->sequence, 0xFF, sizeof(vs->sequence)); + hdhomerun_video_flush(vs); /* Buffer size. */ vs->buffer_size = (buffer_size / VIDEO_DATA_PACKET_SIZE) * VIDEO_DATA_PACKET_SIZE; @@ -149,21 +150,22 @@ void hdhomerun_video_destroy(struct hdhomerun_video_sock_t *vs) free(vs); } +void hdhomerun_video_set_debug(struct hdhomerun_video_sock_t *vs, struct hdhomerun_debug_t *dbg) +{ + vs->dbg = dbg; +} + uint16_t hdhomerun_video_get_local_port(struct hdhomerun_video_sock_t *vs) { struct sockaddr_in sock_addr; socklen_t sockaddr_size = sizeof(sock_addr); if (getsockname(vs->sock, (struct sockaddr*)&sock_addr, &sockaddr_size) != 0) { + hdhomerun_debug_printf(vs->dbg, "hdhomerun_video_get_local_port: getsockname failed (%d)\n", sock_getlasterror); return 0; } return ntohs(sock_addr.sin_port); } -int hdhomerun_video_get_sock(struct hdhomerun_video_sock_t *vs) -{ - return vs->sock; -} - static void hdhomerun_video_stats_ts_pkt(struct hdhomerun_video_sock_t *vs, uint8_t *ptr) { uint16_t packet_identifier = ((uint16_t)(ptr[1] & 0x1F) << 8) | (uint16_t)ptr[2]; @@ -179,16 +181,17 @@ static void hdhomerun_video_stats_ts_pkt(struct hdhomerun_video_sock_t *vs, uint } uint8_t continuity_counter = ptr[3] & 0x0F; + uint8_t previous_sequence = vs->sequence[packet_identifier]; - if (continuity_counter == ((vs->sequence[packet_identifier] + 1) & 0x0F)) { + if (continuity_counter == ((previous_sequence + 1) & 0x0F)) { vs->sequence[packet_identifier] = continuity_counter; return; } - if (vs->sequence[packet_identifier] == 0xFF) { + if (previous_sequence == 0xFF) { vs->sequence[packet_identifier] = continuity_counter; return; } - if (continuity_counter == vs->sequence[packet_identifier]) { + if (continuity_counter == previous_sequence) { return; } @@ -237,6 +240,7 @@ static THREAD_FUNC_PREFIX hdhomerun_video_thread_execute(void *arg) /* Check for buffer overflow. */ if (head == vs->tail) { + vs->overflow_error_count++; continue; } @@ -295,13 +299,18 @@ void hdhomerun_video_flush(struct hdhomerun_video_sock_t *vs) vs->tail = vs->head; vs->advance = 0; - memset(vs->sequence, 0xFF, sizeof(vs->sequence)); + int i; + for (i = 0; i < 8192; i++) { + vs->sequence[i] = 0xFF; + } + vs->packet_count = 0; vs->transport_error_count = 0; vs->sequence_error_count = 0; + vs->overflow_error_count = 0; } -void hdhomerun_video_debug_print_stats(struct hdhomerun_video_sock_t *vs, struct hdhomerun_debug_t *dbg, char *prefix) +void hdhomerun_video_debug_print_stats(struct hdhomerun_video_sock_t *vs) { - hdhomerun_debug_printf(dbg, "%s video sock: pkt=%ld te=%ld miss=%ld\n", prefix, vs->packet_count, vs->transport_error_count, vs->sequence_error_count); + hdhomerun_debug_printf(vs->dbg, "video sock: pkt=%ld te=%ld miss=%ld drop=%ld\n", vs->packet_count, vs->transport_error_count, vs->sequence_error_count, vs->overflow_error_count); } libhdhomerun/hdhomerun_video.c @@ -3,10 +3,10 @@ * * Copyright © 2006 Silicondust Engineering Ltd. <www.silicondust.com>. * - * This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #ifdef __cplusplus extern "C" { @@ -48,11 +47,6 @@ extern void hdhomerun_video_destroy(struct hdhomerun_video_sock_t *vs); extern uint16_t hdhomerun_video_get_local_port(struct hdhomerun_video_sock_t *vs); /* - * Get the low-level socket handle. - */ -extern int hdhomerun_video_get_sock(struct hdhomerun_video_sock_t *vs); - -/* * Read data from buffer. * * size_t max_size: The maximum amount of data to be returned. @@ -79,7 +73,8 @@ extern void hdhomerun_video_flush(struct hdhomerun_video_sock_t *vs); /* * Debug print internal stats. */ -extern void hdhomerun_video_debug_print_stats(struct hdhomerun_video_sock_t *vs, struct hdhomerun_debug_t *dbg, char *prefix); +extern void hdhomerun_video_set_debug(struct hdhomerun_video_sock_t *vs, struct hdhomerun_debug_t *dbg); +extern void hdhomerun_video_debug_print_stats(struct hdhomerun_video_sock_t *vs); #ifdef __cplusplus } libhdhomerun/hdhomerun_video.h @@ -1,504 +1,165 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. -* - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. -* - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. -* - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. -* - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. -* - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. -* - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. -* - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. -* - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS -* - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. libhdhomerun/lgpl.txt e340b9f372bc3cd64cfefe782141932ac3349e88 Andrew Kimpton awk@awkward.org http://github.com/awk/iontv/commit/5cb3595a350a2748273118b62ddfde20360b6ce5 5cb3595a350a2748273118b62ddfde20360b6ce5 2008-06-26T14:11:44-07:00 2008-06-26T14:11:44-07:00 Update to libhdhomerun_20080430 b74f7751da394175d3ae2664c883af7a65f083c8 Andrew Kimpton awk@awkward.org