Attachment #388928 for bug #528722

View | Details | Raw Unified | Return to bug 528722
Collapse All | Expand All

Lines 211-217 static void netlink_callback(AvahiNetlink nl, struct nlmsghdr n, void* userdat Link Here

(-)a/avahi-core/iface-linux.c (-2 / +2 lines)
211	return;	211	return;
212		212
213	memcpy(rlocal.data.data, RTA_DATA(a), RTA_PAYLOAD(a));	213	memcpy(rlocal.data.data, RTA_DATA(a), RTA_PAYLOAD(a));
214	rlocal_valid = 1;	214	raddr_valid = 1;
215		215
216	break;	216	break;
217		217
Lines 228-234 static void netlink_callback(AvahiNetlink nl, struct nlmsghdr n, void* userdat Link Here
228	return;	228	return;
229		229
230	memcpy(raddr.data.data, RTA_DATA(a), RTA_PAYLOAD(a));	230	memcpy(raddr.data.data, RTA_DATA(a), RTA_PAYLOAD(a));
231	raddr_valid = 1;	231	rlocal_valid = 1;
232		232
233	break;	233	break;
234		234




        }

        /* If there was no adress attached to this message, let's quit. */
        if (raddr_valid)
            r = &rlocal;
        else if (raddr_valid)
            r = &raddr;
        else if (rlocal_valid)
            r = &rlocal;
        else 
            return;

        if (n->nlmsg_type == RTM_NEWADDR) {

Return to bug 528722

Lines 240-250 static void netlink_callback(AvahiNetlink nl, struct nlmsghdr n, void* userdat Link Here

(-)a/avahi-core/iface-linux.c (-4 / +4 lines)
240	}	240	}
241		241
242	/* If there was no adress attached to this message, let's quit. */	242	/* If there was no adress attached to this message, let's quit. */
243	if (rlocal_valid)	243	if (raddr_valid)
244	r = &rlocal;
245	else if (raddr_valid)
246	r = &raddr;	244	r = &raddr;
247	else	245	else if (rlocal_valid)
		246	r = &rlocal;
		247	else
248	return;	248	return;
249		249
250	if (n->nlmsg_type == RTM_NEWADDR) {	250	if (n->nlmsg_type == RTM_NEWADDR) {