tvheadend_ipv6.patch - Tvheadend

Feature #248 » tvheadend_ipv6.patch

patch 2 - add a minor correction - Steven VS -, 2010-07-25 20:27

+    {
       pthread_t tid;
       int fd;
       char straddr[INET6_ADDRSTRLEN];
       struct ip_mreqn m;
       struct ipv6_mreq m6;
       struct sockaddr_in sin;
       struct sockaddr_in6 sin6;
       struct ifreq ifr;
       struct epoll_event ev;
-...
+      }
       /* Now, open the real socket for UDP */
       fd = tvh_socket(AF_INET, SOCK_DGRAM, 0);
       if(t->tht_iptv_group.s_addr!=0) {
         fd = tvh_socket(AF_INET, SOCK_DGRAM, 0);
+      }
       else {
         fd = tvh_socket(AF_INET6, SOCK_DGRAM, 0);
+      }
       if(fd == -1) {
         tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot open socket", t->tht_identifier);
         return -1;
-...
         return -1;
+      }
       /* Bind to multicast group */
       memset(&sin, 0, sizeof(sin));
       sin.sin_family = AF_INET;
       sin.sin_port = htons(t->tht_iptv_port);
       sin.sin_addr.s_addr = t->tht_iptv_group.s_addr;
       /* Bind to IPv4 multicast group */
       if(t->tht_iptv_group.s_addr!=0) {
         memset(&sin, 0, sizeof(sin));
         sin.sin_family = AF_INET;
         sin.sin_port = htons(t->tht_iptv_port);
         sin.sin_addr.s_addr = t->tht_iptv_group.s_addr;
         if(bind(fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
           tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot bind %s:%d -- %s",
                t->tht_identifier, inet_ntoa(sin.sin_addr), t->tht_iptv_port,
                strerror(errno));
           close(fd);
           return -1;
+        }
         /* Join IPv4 group */
         memset(&m, 0, sizeof(m));
         m.imr_multiaddr.s_addr = t->tht_iptv_group.s_addr;
         m.imr_address.s_addr = 0;
         m.imr_ifindex = ifr.ifr_ifindex;
       if(bind(fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
         tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot bind %s:%d -- %s",
     	   t->tht_identifier, inet_ntoa(sin.sin_addr), t->tht_iptv_port,
     	   strerror(errno));
         close(fd);
         return -1;
           if(setsockopt(fd, SOL_IP, IP_ADD_MEMBERSHIP, &m,
                     sizeof(struct ip_mreqn)) == -1) {
           tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot join %s -- %s",
                t->tht_identifier, inet_ntoa(m.imr_multiaddr), strerror(errno));
           close(fd);
           return -1;
+        }
+      }
       else {
         /* Bind to IPv6 multicast group */
         memset(&sin6, 0, sizeof(sin6));
         sin6.sin6_family = AF_INET6;
         sin6.sin6_port = htons(t->tht_iptv_port);
         sin6.sin6_addr = t->tht_iptv_group6;
         if(bind(fd, (struct sockaddr *)&sin6, sizeof(sin6)) == -1) {
           inet_ntop(AF_INET6, &sin6.sin6_addr, straddr, sizeof(straddr));
           tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot bind %s:%d -- %s",
                t->tht_identifier, straddr, t->tht_iptv_port,
                strerror(errno));
           close(fd);
           return -1;
+        }
         /* Join IPv6 group */
         memset(&m6, 0, sizeof(m6));
         m6.ipv6mr_multiaddr = t->tht_iptv_group6;
         m6.ipv6mr_interface = ifr.ifr_ifindex;
       /* Join group */
       memset(&m, 0, sizeof(m));
       m.imr_multiaddr.s_addr = t->tht_iptv_group.s_addr;
       m.imr_address.s_addr = 0;
       m.imr_ifindex = ifr.ifr_ifindex;
       if(setsockopt(fd, SOL_IP, IP_ADD_MEMBERSHIP, &m,
     		sizeof(struct ip_mreqn)) == -1) {
         tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot join %s -- %s",
     	   t->tht_identifier, inet_ntoa(m.imr_multiaddr), strerror(errno));
         close(fd);
         return -1;
         if(setsockopt(fd, SOL_IPV6, IPV6_ADD_MEMBERSHIP, &m6,
                     sizeof(struct ipv6_mreq)) == -1) {
           inet_ntop(AF_INET6, m6.ipv6mr_multiaddr.s6_addr, straddr, sizeof(straddr));
           tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot join %s -- %s",
                t->tht_identifier, straddr, strerror(errno));
           close(fd);
           return -1;
+        }
+      }
       memset(&ev, 0, sizeof(ev));
       ev.events = EPOLLIN;
       ev.data.fd = fd;
-...
+    {
       htsmsg_t *m = htsmsg_create_map();
       char abuf[INET_ADDRSTRLEN];
       char abuf6[INET6_ADDRSTRLEN];
       lock_assert(&global_lock);
-...
       if(t->tht_iptv_iface)
         htsmsg_add_str(m, "interface", t->tht_iptv_iface);
       if(t->tht_iptv_group.s_addr) {
       if(t->tht_iptv_group.s_addr!= 0) {
         inet_ntop(AF_INET, &t->tht_iptv_group, abuf, sizeof(abuf));
         htsmsg_add_str(m, "group", abuf);
+      }
       if(IN6_IS_ADDR_MULTICAST(t->tht_iptv_group6.s6_addr) ) {
         inet_ntop(AF_INET6, &t->tht_iptv_group6, abuf6, sizeof(abuf6));
         htsmsg_add_str(m, "group", abuf6);
+      }
       if(t->tht_ch != NULL) {
         htsmsg_add_str(m, "channelname", t->tht_ch->ch_name);
         htsmsg_add_u32(m, "mapped", 1);
-...
     iptv_transport_quality(th_transport_t *t)
+    {
       if(t->tht_iptv_iface == NULL ||
          t->tht_iptv_group.s_addr == 0 ||
          (t->tht_iptv_group.s_addr == 0 && t->tht_iptv_group6.s6_addr == 0) ||
          t->tht_iptv_port == 0)
         return 0;
-...
     static void
     iptv_transport_setsourceinfo(th_transport_t *t, struct source_info *si)
+    {
       char straddr[INET6_ADDRSTRLEN];
       memset(si, 0, sizeof(struct source_info));
       si->si_adapter = t->tht_iptv_iface ? strdup(t->tht_iptv_iface) : NULL;
       si->si_mux = strdup(inet_ntoa(t->tht_iptv_group));
       if(t->tht_iptv_group.s_addr != 0) {
         si->si_mux = strdup(inet_ntoa(t->tht_iptv_group));
+      }
       else {
         inet_ntop(AF_INET6, &t->tht_iptv_group6, straddr, sizeof(straddr));
         si->si_mux = strdup(straddr);
+      }
+    }
-...
         tvh_str_update(&t->tht_iptv_iface, htsmsg_get_str(c, "interface"));
         if((s = htsmsg_get_str(c, "group")) != NULL)
           inet_pton(AF_INET, s, &t->tht_iptv_group.s_addr);
         if((s = htsmsg_get_str(c, "group")) != NULL){
           if (!inet_pton(AF_INET, s, &t->tht_iptv_group.s_addr)) {
              inet_pton(AF_INET6, s, &t->tht_iptv_group6.s6_addr);
+          }
+        }
         if(!htsmsg_get_u32(c, "port", &u32))
           t->tht_iptv_port = u32;

+        }
         if((s = htsmsg_get_str(c, "group")) != NULL) {
           inet_pton(AF_INET, s, &t->tht_iptv_group.s_addr);
           if(!inet_pton(AF_INET, s, &t->tht_iptv_group.s_addr)){
           	inet_pton(AF_INET6, s, &t->tht_iptv_group6.s6_addr);
+          }
           save = 1;
+        }
-...
+    {
       htsmsg_t *r = htsmsg_create_map();
       char abuf[INET_ADDRSTRLEN];
       char abuf6[INET6_ADDRSTRLEN];
       htsmsg_add_str(r, "id", t->tht_identifier);
       htsmsg_add_str(r, "channelname", t->tht_ch ? t->tht_ch->ch_name : "");
       htsmsg_add_str(r, "interface", t->tht_iptv_iface ?: "");
       inet_ntop(AF_INET, &t->tht_iptv_group, abuf, sizeof(abuf));
       htsmsg_add_str(r, "group", t->tht_iptv_group.s_addr ? abuf : "");
       if(t->tht_iptv_group.s_addr != 0){
         inet_ntop(AF_INET, &t->tht_iptv_group, abuf, sizeof(abuf));
         htsmsg_add_str(r, "group", t->tht_iptv_group.s_addr ? abuf : "");
+      }
       else {
         inet_ntop(AF_INET6, &t->tht_iptv_group6, abuf6, sizeof(abuf6));
         htsmsg_add_str(r, "group", t->tht_iptv_group6.s6_addr ? abuf6 : "");
+      }
       htsmsg_add_u32(r, "port", t->tht_iptv_port);
       htsmsg_add_u32(r, "enabled", t->tht_enabled);
-...
       in = entries != NULL ? htsmsg_json_deserialize(entries) : NULL;
       if(!strcmp(op, "get")) {
         LIST_FOREACH(t, &iptv_all_transports, tht_group_link)
           count++;
         tvec = alloca(sizeof(th_transport_t *) * count);
-...
       } else if(!strcmp(op, "delete")) {
         if(in != NULL)
           extjs_transport_delete(in);
         out = htsmsg_create_map();
       } else {

src/tvhead.h (working copy)
657	657	*/
658	658	char *tht_iptv_iface;
659	659	struct in_addr tht_iptv_group;
	660	struct in6_addr tht_iptv_group6;
660	661	uint16_t tht_iptv_port;
661	662	int tht_iptv_fd;
662	663

(1-1/1)

Project

General

Profile

Tvheadend

Feature #248 » tvheadend_ipv6.patch