Date: Sat, 16 Jan 2016 10:19:22 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r406207 - in branches/2016Q1/net/minidlna: . files Message-ID: <201601161019.u0GAJMrT012356@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sat Jan 16 10:19:21 2016 New Revision: 406207 URL: https://svnweb.freebsd.org/changeset/ports/406207 Log: MFH: r406193 Revert upstream change which prevents minidlna from replying to certain multicast queries. PR: 205430 Submitted by: pvoigt@uos.de Approved by: wg (maintainer, implicit) Approved by: portmgr (erwin) Modified: branches/2016Q1/net/minidlna/Makefile branches/2016Q1/net/minidlna/files/patch-minissdp.c Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/net/minidlna/Makefile ============================================================================== --- branches/2016Q1/net/minidlna/Makefile Sat Jan 16 10:06:08 2016 (r406206) +++ branches/2016Q1/net/minidlna/Makefile Sat Jan 16 10:19:21 2016 (r406207) @@ -3,6 +3,7 @@ PORTNAME= minidlna PORTVERSION= 1.1.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net multimedia www MASTER_SITES= SF Modified: branches/2016Q1/net/minidlna/files/patch-minissdp.c ============================================================================== --- branches/2016Q1/net/minidlna/files/patch-minissdp.c Sat Jan 16 10:06:08 2016 (r406206) +++ branches/2016Q1/net/minidlna/files/patch-minissdp.c Sat Jan 16 10:19:21 2016 (r406207) @@ -1,6 +1,6 @@ ---- minissdp.c.orig 2014-03-06 16:30:25.000000000 -0800 -+++ minissdp.c 2014-05-29 09:34:58.763663228 -0700 -@@ -60,7 +60,7 @@ +--- minissdp.c.orig 2015-09-10 19:24:09 UTC ++++ minissdp.c +@@ -60,7 +60,7 @@ static int AddMulticastMembership(int s, struct lan_addr_s *iface) { int ret; @@ -8,4 +8,16 @@ +#if defined(HAVE_STRUCT_IP_MREQN) && !defined(__FreeBSD__) struct ip_mreqn imr; /* Ip multicast membership */ /* setting up imr structure */ - imr.imr_multiaddr.s_addr = inet_addr(SSDP_MCAST_ADDR); + memset(&imr, '\0', sizeof(imr)); +@@ -117,7 +117,11 @@ OpenAndConfSSDPReceiveSocket(void) + * to receive datagramms send to this multicast address. + * To specify the local nics we want to use we have to use setsockopt, + * see AddMulticastMembership(...). */ ++#ifdef __FreeBSD__ ++ sockname.sin_addr.s_addr = htonl(INADDR_ANY); ++#else + sockname.sin_addr.s_addr = inet_addr(SSDP_MCAST_ADDR); ++#endif + + if (bind(s, (struct sockaddr *)&sockname, sizeof(struct sockaddr_in)) < 0) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601161019.u0GAJMrT012356>