Date: Wed, 11 Aug 2010 22:07:05 GMT From: Ana Kukec <anchie@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 182274 for review Message-ID: <201008112207.o7BM75x7032381@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@182274?ac=10 Change 182274 by anchie@anchie_malimis on 2010/08/11 22:06:09 Whitespaces cleanup. Affected files ... .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/snd_freebsd.c#6 edit Differences ... ==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/snd_freebsd.c#6 (text+ko) ==== @@ -95,7 +95,7 @@ return (-1); } - return (0); + return (0); } int @@ -129,20 +129,20 @@ { struct snd_ifinfo *p; - if ((p = malloc(sizeof (*p))) == NULL) { - APPLOG_NOMEM(); - return (-1); - } - memset(p, 0, sizeof (*p)); + if ((p = malloc(sizeof (*p))) == NULL) { + APPLOG_NOMEM(); + return (-1); + } + memset(p, 0, sizeof (*p)); - snprintf(p->name, sizeof (p->name), "%s", ifname); - DBG(&dbg_snd, "os_specific_handle_iface -> p->name = %s", p->name); - p->ifidx = ifidx; - DBG(&dbg_snd, "os_specific_handle_iface -> p->ifidx = %d", ifidx); - p->snds = -1; - list_add_tail(&p->list, &ifaces); + snprintf(p->name, sizeof (p->name), "%s", ifname); + DBG(&dbg_snd, "os_specific_handle_iface -> p->name = %s", p->name); + p->ifidx = ifidx; + DBG(&dbg_snd, "os_specific_handle_iface -> p->ifidx = %d", ifidx); + p->snds = -1; + list_add_tail(&p->list, &ifaces); - return (0); + return (0); } static void @@ -155,44 +155,44 @@ int n; if ((b = snd_get_buf()) == NULL) { - goto done; - } + goto done; + } - pi = sbuff_data(b); - sbuff_advance(b, sizeof (*pi)); + pi = sbuff_data(b); + sbuff_advance(b, sizeof (*pi)); - len = sizeof(sendsrc); - bzero(&sendsrc, sizeof(sendsrc)); - n = recvfrom(sndsock, b->data, b->rem, 0, (struct sockaddr *)&sendsrc, &len); - if (n < 0) { - applog(LOG_ERR, "%s: read: %s", __func__, strerror(errno)); - goto done; - } else - DBG(&dbg_snd, "%d bytes received on send socket. (%d)", n, b->rem); + len = sizeof(sendsrc); + bzero(&sendsrc, sizeof(sendsrc)); + n = recvfrom(sndsock, b->data, b->rem, 0, (struct sockaddr *)&sendsrc, &len); + if (n < 0) { + applog(LOG_ERR, "%s: read: %s", __func__, strerror(errno)); + goto done; + } else + DBG(&dbg_snd, "%d bytes received on send socket. (%d)", n, b->rem); - b->len = n; + b->len = n; - switch(sendsrc.send_direction) { - case SND_IN: - applog(LOG_ERR, "Direction: SND_IN"); - pi->ifinfo = p; - pi->in = 1; - snd_recv_pkt(b, p->ifidx, SND_IN, pi); - break; - case SND_OUT: - applog(LOG_ERR, "Direction: SND_OUT"); - pi->ifinfo = p; - pi->in = 0; - snd_recv_pkt(b, p->ifidx, SND_OUT, pi); - break; - default: - applog(LOG_ERR, "Unknown SEND pkt header: unknown direction."); - } + switch(sendsrc.send_direction) { + case SND_IN: + applog(LOG_ERR, "Direction: SND_IN"); + pi->ifinfo = p; + pi->in = 1; + snd_recv_pkt(b, p->ifidx, SND_IN, pi); + break; + case SND_OUT: + applog(LOG_ERR, "Direction: SND_OUT"); + pi->ifinfo = p; + pi->in = 0; + snd_recv_pkt(b, p->ifidx, SND_OUT, pi); + break; + default: + applog(LOG_ERR, "Unknown SEND pkt header: unknown direction."); + } done: - /* ToDo: Free memory! */ - snd_put_buf(b); - return; + /* ToDo: Free memory! */ + snd_put_buf(b); + return; } void @@ -200,11 +200,11 @@ { struct snd_ifinfo *p; - list_for_each_entry(p, &ifaces, list) { - p->snds = sndsock; - FD_SET(p->snds, fds); - *maxfd = sendd_max(*maxfd, p->snds); - } + list_for_each_entry(p, &ifaces, list) { + p->snds = sndsock; + FD_SET(p->snds, fds); + *maxfd = sendd_max(*maxfd, p->snds); + } } void @@ -212,40 +212,40 @@ { struct snd_ifinfo *p; - list_for_each_entry(p, &ifaces, list) { - if (FD_ISSET(sndsock, fds)) { - snd_sock_read(p); - } - } + list_for_each_entry(p, &ifaces, list) { + if (FD_ISSET(sndsock, fds)) { + snd_sock_read(p); + } + } } void os_specific_deliver_pkt(void *p, struct sbuff *b, int drop, int changed) { - struct snd_packet_info *pi; - struct sockaddr_send sendsrc; + struct snd_packet_info *pi; + struct sockaddr_send sendsrc; - if (drop) { - snd_put_buf(b); - return; - } + if (drop) { + snd_put_buf(b); + return; + } - pi = (struct snd_packet_info *)(b->head); - bzero(&sendsrc, sizeof(sendsrc)); - sendsrc.send_len = sizeof(sendsrc); - sendsrc.send_family = AF_INET6; - sendsrc.send_direction = pi->in; - sendsrc.send_ifidx = pi->ifinfo->ifidx; + pi = (struct snd_packet_info *)(b->head); + bzero(&sendsrc, sizeof(sendsrc)); + sendsrc.send_len = sizeof(sendsrc); + sendsrc.send_family = AF_INET6; + sendsrc.send_direction = pi->in; + sendsrc.send_ifidx = pi->ifinfo->ifidx; - DBG(&dbg_snd, "Sending %d bytes.\n", b->len); - if (sendto(sndsock, b->data, b->len, 0, (struct sockaddr *)&sendsrc, - sizeof(sendsrc)) < 0) { - DBG(&dbg_snd, "Failed to send SEND message back to kernel."); - perror("Failed"); - snd_put_buf(b); - return; - } + DBG(&dbg_snd, "Sending %d bytes.\n", b->len); + if (sendto(sndsock, b->data, b->len, 0, (struct sockaddr *)&sendsrc, + sizeof(sendsrc)) < 0) { + DBG(&dbg_snd, "Failed to send SEND message back to kernel."); + perror("Failed"); + snd_put_buf(b); + return; + } - snd_put_buf(b); - return; + snd_put_buf(b); + return; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008112207.o7BM75x7032381>