Thu Oct 16 13:36:06 2008 UTC ()

appease 64bit gcc


(pooka)

diff -r1.2 -r1.3 src/sys/rump/net/lib/libsockin/sockin.c

--- src/sys/rump/net/lib/libsockin/sockin.c 2008/10/15 11:43:38	1.2
+++ src/sys/rump/net/lib/libsockin/sockin.c 2008/10/16 13:36:06	1.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sockin.c,v 1.2 2008/10/15 11:43:38 pooka Exp $	*/
+/*	$NetBSD: sockin.c,v 1.3 2008/10/16 13:36:06 pooka Exp $	*/
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -88,27 +88,27 @@ struct domain sockindomain = {
 	.dom_ifdetach = NULL,
 	.dom_ifqueues = { NULL },
 	.dom_link = { NULL },
 	.dom_mowner = MOWNER_INIT("",""),
 	.dom_rtcache = { NULL },
 	.dom_sockaddr_cmp = NULL
 };
 /* only for testing */
 #if 0
 #define SOCKIN_NOTHREAD
 #endif
-#define SO2S(so) ((int)(so->so_internal))
+#define SO2S(so) ((intptr_t)(so->so_internal))
 #define SOCKIN_SBSIZE 65536
 static void
 sockin_process(struct socket *so)
+{
 	struct sockaddr_in from;
 	struct iovec io;
 	struct msghdr rmsg;
 	struct mbuf *m;
 	ssize_t n;
 	size_t plen;
 	int error;
 @@ -261,43 +261,43 @@ sockin_usrreq(struct socket *so, int req
 		su = kmem_alloc(sizeof(*su), KM_NOSLEEP);
 		if (!su) {
 			error = ENOMEM;
 			break;
+		}
 		news = rumpuser_net_socket(PF_INET, so->so_proto->pr_type,
 , &error);
 		if (news == -1) {
 			kmem_free(su, sizeof(*su));
 			break;
+		}
-		so->so_internal = (void *)news;
+		so->so_internal = (void *)(intptr_t)news;
 		su->su_so = so;
 		mutex_enter(&su_mtx);
 		LIST_INSERT_HEAD(&su_ent, su, su_entries);
 		nsock++;
 		rebuild = true;
 		mutex_exit(&su_mtx);
 		break;
+	}
 	case PRU_CONNECT:
 		/* don't bother to connect udp sockets, always sendmsg */
 		if (so->so_proto->pr_type == SOCK_DGRAM)
 			break;
-		rv = rumpuser_net_connect((int)so->so_internal,
+		rv = rumpuser_net_connect(SO2S(so),
 		    mtod(nam, struct sockaddr *), sizeof(struct sockaddr_in),
 		    &error);
 		if (rv == 0)
 		soisconnected(so);
 		break;
 	case PRU_SEND:
+	{
 		struct sockaddr *saddr;
 		struct msghdr mhdr;
 		struct iovec iov[16];
 		struct mbuf *m2;
 		size_t tot;
 @@ -306,27 +306,27 @@ sockin_usrreq(struct socket *so, int req
 		memset(&mhdr, 0, sizeof(mhdr));
 		tot = 0;
 		for (i = 0, m2 = m; m2; m2 = m2->m_next, i++) {
 			if (i > 16)
 				panic("lazy bum");
 			iov[i].iov_base = m2->m_data;
 			iov[i].iov_len = m2->m_len;
 			tot += m2->m_len;
+		}
 		mhdr.msg_iov = iov;
 		mhdr.msg_iovlen = i;
-		s = (int)so->so_internal;
+		s = SO2S(so);
 		if (so->so_proto->pr_type == SOCK_DGRAM) {
 			saddr = mtod(nam, struct sockaddr *);
 			mhdr.msg_name = saddr;
 			mhdr.msg_namelen = saddr->sa_len;
+		}
 		rumpuser_net_sendmsg(s, &mhdr, 0, &error);
 		m_freem(m);
 		m_freem(control);
 #ifdef SOCKIN_NOTHREAD
 		/* this assumes too many things to list.. buthey, testing */