Date: Fri, 18 Jan 2013 05:58:03 +0000 (UTC) From: Lawrence Stewart <lstewart@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245589 - projects/diffused_head/sbin/ipfw/diffuse_collector Message-ID: <201301180558.r0I5w3hG069793@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lstewart Date: Fri Jan 18 05:58:02 2013 New Revision: 245589 URL: http://svnweb.freebsd.org/changeset/base/245589 Log: I didn't realise the beXXdec() functions implicitly converted to host byte order. Oops! Discussed with: imp Modified: projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c Modified: projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c ============================================================================== --- projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c Fri Jan 18 04:51:38 2013 (r245588) +++ projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c Fri Jan 18 05:58:02 2013 (r245589) @@ -889,7 +889,7 @@ parse_rule(struct class_node *cnode, str c->cname[DI_MAX_NAME_STR_LEN - 1] = '\0'; offs += strlen(c->cname) + 1; - c->class = be16toh(be16dec(rb + offs)); + c->class = be16dec(rb + offs); offs += sizeof(uint16_t); SLIST_INSERT_HEAD(&n->flow_classes, c, next); @@ -912,11 +912,11 @@ parse_rule(struct class_node *cnode, str break; case DIP_IE_SRC_PORT: - n->id.src_port = be16toh(be16dec(rb + offs)); + n->id.src_port = be16dec(rb + offs); break; case DIP_IE_DST_PORT: - n->id.dst_port = be16toh(be16dec(rb + offs)); + n->id.dst_port = be16dec(rb + offs); break; case DIP_IE_PROTO: @@ -928,7 +928,7 @@ parse_rule(struct class_node *cnode, str break; case DIP_IE_TIMEOUT: - n->expire = be16toh(be16dec(rb + offs)); + n->expire = be16dec(rb + offs); break; case DIP_IE_EXPORT_NAME: @@ -944,7 +944,7 @@ parse_rule(struct class_node *cnode, str break; case DIP_IE_ACTION_FLAGS: - n->rtype = be16toh(be16dec(rb + offs)); + n->rtype = be16dec(rb + offs); break; case DIP_IE_ACTION_PARAMS: @@ -1081,7 +1081,7 @@ parse_msg(struct class_node *cnode, char (int)sizeof(struct dip_set_header) - (int)sizeof(struct dip_templ_header)) { r->fields[r->fcnt].id = - be16toh(be16dec(buf + offs)); + be16dec(buf + offs); offs += sizeof(uint16_t); info = diffuse_proto_get_info( r->fields[r->fcnt].id); @@ -1089,7 +1089,7 @@ parse_msg(struct class_node *cnode, char r->fields[r->fcnt].len = info.len; if (r->fields[r->fcnt].len == 0) { r->fields[r->fcnt].len = - be16toh(be16dec(buf + offs)); + be16dec(buf + offs); offs += sizeof(uint16_t); } r->fcnt++;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301180558.r0I5w3hG069793>