I plan on checking in the re-fixed changes in this patch if there are no
objections.
Thanks,
Mark.
Index: manager.c
===================================================================
RCS file: /cvsroot/tipc/source/unstable/net/tipc/manager.c,v
retrieving revision 1.7
diff -u -r1.7 manager.c
--- manager.c 16 Apr 2004 04:03:46 -0000 1.7
+++ manager.c 16 Apr 2004 16:38:09 -0000
@@ -161,12 +161,12 @@
const char* data,
const uint size)
{
- memset(&rmsg, 0, sizeof (rmsg));
+ memset(rmsg, 0, sizeof (*rmsg));
rmsg->cmd = htonl(cmd);
rmsg->retval = htonl(res);
memcpy(rmsg->usr_handle,usr_handle,sizeof(rmsg->usr_handle));
rmsg->result_len = htonl(sizeof(rmsg->result));
- sct[0].data = (const unchar *) &rmsg;
+ sct[0].data = (const unchar *) rmsg;
sct[0].size = sizeof(*rmsg);
if (!data)
return;
Index: media.c
===================================================================
RCS file: /cvsroot/tipc/source/unstable/net/tipc/media.c,v
retrieving revision 1.11
diff -u -r1.11 media.c
--- media.c 16 Apr 2004 04:03:46 -0000 1.11
+++ media.c 16 Apr 2004 16:38:09 -0000
@@ -525,7 +525,7 @@
media++;
}
read_unlock_bh(&net_lock);
- return TIPC_OK;
+ return buf.crs-raw;;
}
Index: node.c
===================================================================
RCS file: /cvsroot/tipc/source/unstable/net/tipc/node.c,v
retrieving revision 1.13
diff -u -r1.13 node.c
--- node.c 16 Apr 2004 04:03:46 -0000 1.13
+++ node.c 16 Apr 2004 16:38:09 -0000
@@ -624,8 +624,8 @@
for(n = nodes;n;n = n->next) {
if (!in_scope(scope,n->addr))
continue;
- list[cnt].addr = n->addr;
- list[cnt].up = node_is_up(n);
+ list[cnt].addr = htonl(n->addr);
+ list[cnt].up = htonl(node_is_up(n));
cnt++;
};
return (cnt * sizeof(struct tipc_node_info));
Index: port.c
===================================================================
RCS file: /cvsroot/tipc/source/unstable/net/tipc/port.c,v
retrieving revision 1.13
diff -u -r1.13 port.c
--- port.c 16 Apr 2004 04:03:46 -0000 1.13
+++ port.c 16 Apr 2004 16:38:09 -0000
@@ -734,7 +734,7 @@
uport = dport->user_port;
usr_handle = uport->usr_handle;
connected = dport->publ.connected;
- published = dport->publ.connected;
+ published = dport->publ.published;
if (unlikely(msg_errcode(msg)))
goto err;
--
Mark Haverkamp <ma...@os...>
|
