hammer2 - Messaging layer separation work part 4
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 25 Oct 2012 18:09:16 +0000 (11:09 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 25 Oct 2012 18:09:16 +0000 (11:09 -0700)
* Cleanup, bug fixes, operations tests successful now.

sbin/mount_hammer2/mount_hammer2.c
sys/kern/kern_dmsg.c

index bf2ece2..9f26be6 100644 (file)
@@ -42,6 +42,7 @@
 #include <stdlib.h>
 #include <strings.h>
 #include <unistd.h>
+#include <dmsg.h>
 
 static int cluster_connect(const char *volume);
 
@@ -136,7 +137,7 @@ cluster_connect(const char *volume __unused)
        bzero(&lsin, sizeof(lsin));
        lsin.sin_family = AF_INET;
        lsin.sin_addr.s_addr = 0;
-       lsin.sin_port = htons(HAMMER2_LISTEN_PORT);
+       lsin.sin_port = htons(DMSG_LISTEN_PORT);
 
        if (connect(fd, (struct sockaddr *)&lsin, sizeof(lsin)) < 0) {
                close(fd);
index d65ee10..0bf8723 100644 (file)
@@ -857,6 +857,7 @@ kdmsg_state_msgtx(kdmsg_msg_t *msg)
        if ((state = iocom->freewr_state) == NULL) {
                state = kmalloc(sizeof(*state), iocom->mmsg, M_WAITOK | M_ZERO);
                state->flags = KDMSG_STATE_DYNAMIC;
+               state->router = &iocom->router;
                iocom->freewr_state = state;
        }