style fixes, and make errors positive as standard in FreeBSD

Author: Luigi Rizzo

bsd_nlsock.c

@@ -199,7 +199,7 @@ netlink_attach(struct socket *so, int proto, struct thread *td)
 	struct rawcb *rp;
 	int error;
 
-	D("so %p thread %p", _P32(so), _P32(td));
+	ND("so %p thread %p", _P32(so), _P32(td));
 	KASSERT(so->so_pcb == NULL, ("netlink_attach: so_pcb != NULL"));
 
 	error = bsd_nl_proto_check(proto);
@@ -256,7 +256,7 @@ netlink_connect(struct socket *so, struct sockaddr *nam, struct thread *td)
 	so->nl_src_portid = atomic_fetchadd_32(&netlinkpids, 1);
 	so->nl_dst_portid = nla->nl_pid; /* not used */
 
-	D("src_portid %d dst_portid %d", so->nl_src_portid, so->nl_dst_portid);
+	ND("src_portid %d dst_portid %d", so->nl_src_portid, so->nl_dst_portid);
 	soisconnected(so);
 
 	return 0;

genetlink.c

@@ -93,7 +93,7 @@ genl_register_family_with_ops(struct genl_family *family,
 	 * should try assign that as family id
 	 */
 	if (idfamily != GENL_ID_GENERATE)
-		return -EEXIST;
+		return EEXIST;
 	/* TODO: id generation should be done better */
 	idfamily = atomic_fetchadd_int(&cur_max_genl_family, 1);
 
@@ -238,7 +238,7 @@ genetlink_call_op_dumpit(const struct genl_ops *curop,
 	genl_unlock();
 
 	/* If no error avoid ack */
-	return (res == 0)?-EINTR:res;
+	return (res == 0) ? EINTR : res;
 }
 
 static int
@@ -284,24 +284,30 @@ genetlink_receive_message(char *data)
 			break;
 	}
 
+	D("process family %d %p", idfamily, curfamily);
+
 	if (curfamily == NULL)
-		return -ENOENT;
+		return ENOENT;
 
 	/* check if we have space */
-	if (curfamily->maxattr + 1 > _GNL_MAX_ATTR)
-		return -ENOMEM;
+	if (curfamily->maxattr + 1 > _GNL_MAX_ATTR) {
+		D("no space to process attributes");
+		return ENOMEM;
+	}
 
 	ops = curfamily->ops;
 
 	genlmsg = (struct genlmsghdr *)(data + NLMSG_HDRLEN);
 	numop = genlmsg->cmd;
+	D("cmd is %d look into %d options", numop, curfamily->n_ops);
 	for (i = 0; i < curfamily->n_ops; ++i) {
-		if(ops[i].cmd == numop)
+		if (ops[i].cmd == numop)
 			break;
 	}
 
-	if (i >= curfamily->n_ops)
-		return -EOPNOTSUPP;
+	if (i >= curfamily->n_ops) {
+		return EOPNOTSUPP;
+	}
 
 	curop = &(curfamily->ops[i]);
 
@@ -319,8 +325,10 @@ genetlink_receive_message(char *data)
 
 	info.attrs = attrs;
 	err = genl_parse_info(data, curfamily, curop->policy, &info);
-	if (err)
+	if (err) {
+		D("genl_parse_info returns error %d", err);
 		return err;
+	}
 
 	/* XXX remove this log */
 	log(LOG_INFO, "myhandler:idfamily:%d, numop%d %s\n",
@@ -332,7 +340,7 @@ genetlink_receive_message(char *data)
 	} else if(!(nlmsg->nlmsg_flags & NLM_F_DUMP) && curop->doit) {
 		err = genetlink_call_op_doit(curop, nlmsg, &info);
 	} else {
-		return -EOPNOTSUPP;
+		return EOPNOTSUPP;
 	}
 
 	return err;
@@ -407,15 +415,15 @@ genl_ctrl_lookup_family(struct mbuf *m, struct genl_info * info)
 
 	/* TODO:implement also lookup by id */
 	if (nlaname == NULL)
-		return -EINVAL;
+		return EINVAL;
 
 	LIST_FOREACH(family, &genl_family_list, family_list) {
 		if (strncmp(family->name, familyname, GENL_NAMSIZ) == 0)
 			break;
 	}
 
 	if (family == NULL)
-		return -ENOENT;
+		return ENOENT;
 
 	/* Family found!! */
 	reply = nlmsg_new(NLMSG_DEFAULT_SIZE, M_WAITOK);

linux/netlink.h

@@ -134,7 +134,7 @@ struct mbuf;	/* we must be compilable with an opaque type */
 
 #else /* __COMPAT_MBUF_TYPE */	/* mbufs are remapped XXX */
 /* returns a readonly object */
-struct netlink_skb_parms NETLINK_CB(struct mbuf *);
+// struct netlink_skb_parms NETLINK_CB(struct mbuf *);
 #endif /* !__COMPAT_MBUF_TYPE */
 
 struct netlink_skb_parms { /* XXX needs work */

net/genetlink.h

@@ -102,11 +102,10 @@ struct genl_ops {
 			struct genl_info *info);
 	int                    (*dumpit)(struct mbuf *m,
 			struct netlink_callback *cb);
-	#if 0
-	/* TODO: fields not used by openvswitch */
+#if 0 /* TODO: fields not used by openvswitch */
 	int                    (*done)(struct netlink_callback *cb);
 	struct list_head        ops_list;
-	#endif
+#endif
 };
 
 struct genl_info {
@@ -161,7 +160,7 @@ genl_set_err(struct genl_family *fam, struct net *net,
 	uint32_t portid, uint32_t group, uint32_t code)
 {
 	if (group >= fam->mcgrp_offset)
-		return -EINVAL;
+		return EINVAL;
 	group += fam->mcgrp_offset;
 	/* we do not support namespaces yet */
 	netlink_set_err(NULL /* net->genl_sock */, portid, group, code);

netlink.c

@@ -104,8 +104,6 @@ static const uint16_t nla_attr_minlen[NLA_TYPE_MAX+1] = {
 };
 
 /*
- * These validate functions return a negative error number because
- * the nla_parse(), a linux API, does so.
  * XXX nla_type() is really a sequence number in the policy definition.
  */
 static int
@@ -124,12 +122,12 @@ validate_nla(const struct nlattr *nla, int maxtype,
 
 	pt = &policy[atype];
 	if (pt->type > NLA_TYPE_MAX) /* error in the policy! */
-		return -EINVAL;
+		return EINVAL;
 
 	plen = pt->len; /* how much space is allowed by policy ? */
         switch (pt->type) {
 	case NLA_FLAG:
-		return (alen != 0) ? -ERANGE : 0; /* nla error */
+		return (alen != 0) ? ERANGE : 0; /* nla error */
 
 	case NLA_NUL_STRING: /* plen excludes the NUL */
 		/*
@@ -139,41 +137,41 @@ validate_nla(const struct nlattr *nla, int maxtype,
 		if (plen && plen+1 < alen)
 			alen = plen + 1;
 		if (alen == 0)
-			return -EINVAL;
+			return EINVAL;
 
 		/* Search for NUL termination */
 		for (i = 0; i < alen; i++) {
 			if (data[i] == 0)
 				return 0; /* all fine */
 		}
-		return -EINVAL; /* missing terminator */
+		return EINVAL; /* missing terminator */
 
 	case NLA_STRING: /* non terminated strings */
 		if (alen == 0) /* empty strings not allowed */
-			return -ERANGE;
+			return ERANGE;
 		if (plen) { /* check the limit */
 			if (data[alen - 1] == 0)
 				alen--;
 			if (alen > plen)
-				return -ERANGE;
+				return ERANGE;
 		}
 		return 0;
 
 	case NLA_BINARY:
-		return (plen && alen > plen) ? -ERANGE : 0;
+		return (plen && alen > plen) ? ERANGE : 0;
 
 	case NLA_NESTED_COMPAT:
 		/* plen indicates minimum alen */
 		if (alen < plen) /* too short */
-			return -ERANGE;
+			return ERANGE;
 		if (alen < NLA_ALIGN(plen)) /* ok (including padding */
 			break;
 		/* if alen >= plen we need another header */
 		if (alen < NLA_ALIGN(plen) + NLA_HDRLEN)
-			return -ERANGE;
+			return ERANGE;
 		nla = (const struct nlattr *)(data + NLA_ALIGN(plen));
 		if (alen < NLA_ALIGN(plen) + NLA_HDRLEN + nla_len(nla))
-			return -ERANGE;
+			return ERANGE;
 		break;
 
 	case NLA_NESTED:
@@ -187,10 +185,10 @@ validate_nla(const struct nlattr *nla, int maxtype,
 	default:
 		if (plen) {
 			if (alen < plen)
-				return -ERANGE;
+				return ERANGE;
 		} else if (pt->type != NLA_UNSPEC) {
 			if (alen < nla_attr_minlen[pt->type])
-				return -ERANGE;
+				return ERANGE;
 		} /* else pass */
         }
 
@@ -366,7 +364,7 @@ netlink_receive_packet(struct mbuf *m, struct socket *so, int proto)
 			int old_l = datalen;
 			(void)old_l;
 			datalen = (l + 0x3ff) & ~0x3ff; /* round to 1k */
-			ND("reallocate buffer %d -> %d [%d]",
+			D("reallocate buffer %d -> %d [%d]",
 				old_l, l, datalen);
 			if (buf != NULL) {
 				free(buf, M_NETLINK);
@@ -378,12 +376,13 @@ netlink_receive_packet(struct mbuf *m, struct socket *so, int proto)
 				return ENOMEM;
 			}
 		}
-		ND("Copy the whole message");
+		ND("Copy message, including header");
 		m_copydata(m, ofs, l, buf);
 		h = (struct nlmsghdr *)buf;
 		if (h->nlmsg_flags & NLM_F_REQUEST &&
 		    h->nlmsg_type >= NLMSG_MIN_TYPE) {
-			D("process the callback");
+			D("msg_type %d callback %p len %d",
+				h->nlmsg_type, _P32(cb), l);
 			err = cb((void *)h);
 			D("callback returns %d", err);
 		}
@@ -409,7 +408,7 @@ nla_put(struct mbuf *m, int attrtype, int attrlen, const void *data)
 	size_t need = NLMSG_ALIGN(totlen);
 
 	if (m->m_pkthdr.len + need > _ML(m))
-		return -EMSGSIZE;
+		return EMSGSIZE;
 	nla = (struct nlattr *)_MC(m);
 	bzero(nla, NLA_HDRLEN);
 	nla->nla_len = totlen;