From owner-p4-projects@FreeBSD.ORG Sat Jul 4 22:53:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B5431065675; Sat, 4 Jul 2009 22:53:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5AE9C1065672 for ; Sat, 4 Jul 2009 22:53:57 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2ECE28FC1C for ; Sat, 4 Jul 2009 22:53:57 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n64MrvlU048203 for ; Sat, 4 Jul 2009 22:53:57 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n64Mrv3r048201 for perforce@freebsd.org; Sat, 4 Jul 2009 22:53:57 GMT (envelope-from anchie@FreeBSD.org) Date: Sat, 4 Jul 2009 22:53:57 GMT Message-Id: <200907042253.n64Mrv3r048201@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 165613 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jul 2009 22:53:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=165613 Change 165613 by anchie@anchie_malimis on 2009/07/04 22:53:22 Minor bug fix. Affected files ... .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/net.c#12 edit .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/sendd.c#9 edit Differences ... ==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/net.c#12 (text+ko) ==== @@ -117,11 +117,9 @@ struct snd_ifinfo *p; list_for_each_entry(p, &ifaces, list) { - DBG(&dbg_snd, "*maxfd = %d, p->snds = %d", *maxfd, p->snds); *maxfd = *maxfd > p->snds ? *maxfd : p->snds; p->snds = sock; FD_SET(p->snds, fds); - applog(LOG_ERR, "snds added to snd_ifinfo."); } } @@ -194,7 +192,7 @@ } void -snd_sock_read(void) +snd_sock_read() { struct rt_msghdr *rtm; struct if_announcemsghdr *ifan; @@ -205,6 +203,7 @@ return; } + applog(LOG_ERR, "sndsock prije read = %d", sndsock); n = read(sndsock, b, sizeof(b)); if (n < 0) { applog(LOG_ERR, "%s: read: %s", __FUNCTION__, strerror(errno)); @@ -312,7 +311,7 @@ } int -snd_net_init(int *icmp6sock, int *sndsock) +snd_net_init(int *icmp6socket, int *sndsocket) { int v; struct icmp6_filter filter; @@ -327,13 +326,13 @@ } #endif - if ((*icmp6sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) < 0) { + if ((*icmp6socket = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) < 0) { applog(LOG_ERR, "%s: socket: %s", __FUNCTION__, strerror(errno)); return (-1); } - if ((*sndsock = socket(PF_ROUTE, SOCK_RAW, 0)) < 0) { + if ((*sndsocket = socket(PF_ROUTE, SOCK_RAW, 0)) < 0) { applog(LOG_ERR, "%s: socket: %s", __FUNCTION__, strerror(errno)); return(-1); @@ -341,17 +340,18 @@ applog(LOG_ERR, "%s: routing socket created.", __FUNCTION__); } - applog(LOG_ERR, "*icmp6sock = %d, *sndsock = %d", *icmp6sock, *sndsock); + icmp6sock = *icmp6socket; + sndsock = *sndsocket; v = 255; - if (setsockopt(*icmp6sock, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &v, + if (setsockopt(icmp6sock, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &v, sizeof (v)) < 0) { applog(LOG_ERR, "%s: setsockopt(IPV6_UNICAST_HOPS): %s", __FUNCTION__, strerror(errno)); return (-1); } v = 255; - if (setsockopt(*icmp6sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &v, + if (setsockopt(icmp6sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &v, sizeof (v)) < 0) { applog(LOG_ERR, "%s: setsockopt(IPV6_MULTICAST_HOPS): %s", __FUNCTION__, strerror(errno)); @@ -363,7 +363,7 @@ ICMP6_FILTER_SETPASS(ICMP6_SND_CPA, &filter); ICMP6_FILTER_SETPASS(ND_ROUTER_ADVERT, &filter); - if (setsockopt(*icmp6sock, IPPROTO_ICMPV6, ICMP6_FILTER, &filter, + if (setsockopt(icmp6sock, IPPROTO_ICMPV6, ICMP6_FILTER, &filter, sizeof (filter)) < 0) { applog(LOG_ERR, "%s: setsockopt(ICMP6_FILTER): %s", __FUNCTION__, strerror(errno)); ==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/sendd.c#9 (text+ko) ====