[haiku-commits] r36044 - haiku/trunk/src/add-ons/kernel/file_systems/googlefs
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 6 Apr 2010 16:53:04 +0200 (CEST)
Author: mmu_man
Date: 2010-04-06 16:53:03 +0200 (Tue, 06 Apr 2010)
New Revision: 36044
Changeset: http://dev.haiku-os.org/changeset/36044/haiku
Modified:
haiku/trunk/src/add-ons/kernel/file_systems/googlefs/ksocket.h
Log:
The Haiku kernel now exports BSD socket calls directly.
Modified: haiku/trunk/src/add-ons/kernel/file_systems/googlefs/ksocket.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/googlefs/ksocket.h
2010-04-05 19:21:50 UTC (rev 36043)
+++ haiku/trunk/src/add-ons/kernel/file_systems/googlefs/ksocket.h
2010-04-06 14:53:03 UTC (rev 36044)
@@ -32,41 +32,26 @@
#elif defined(__HAIKU__)
-/* Haiku socket module */
-#include <os/drivers/socket_interface.h>
-
-extern struct socket_module_info *gSocket;
-#define ksocket (gSocket->socket)
-#define kbind (gSocket->bind)
-#define kconnect (gSocket->connect)
-#define kgetsockname (gSocket->getsockname)
-#define kgetpeername (gSocket->getpeername)
-#define kaccept (gSocket->accept)
-//#define kaccept(_fd, _addr, _sz) ({int thesock; thesock =
(gSocket->accept)(_fd, _addr, _sz); dprintf("kaccept(%d, , ) = %d\n", _fd,
thesock); thesock; })
-#define ksendmsg (gSocket->sendmsg)
-#define krecvmsg (gSocket->recvmsg)
-#define krecvfrom (gSocket->recvfrom)
-#define ksendto (gSocket->sendto)
-#define krecv (gSocket->recv)
-#define ksend (gSocket->send)
-#define klisten (gSocket->listen)
-#define kshutdown (gSocket->shutdown)
+#define ksocket socket
+#define kbind bind
+#define kconnect connect
+#define kgetsockname getsockname
+#define kgetpeername getpeername
+#define kaccept accept
+#define ksendmsg sendmsg
+#define krecvmsg recvmsg
+#define krecvfrom recvfrom
+#define ksendto sendto
+#define krecv recv
+#define ksend send
+#define klisten listen
+#define kshutdown shutdown
#define kclosesocket close
-#define kmessage(fmt, ...) dprintf("ksocket: " fmt "\n", ##__VA_ARGS__)
+#define ksocket_init() ({B_OK;})
+#define ksocket_cleanup() ({B_OK;})
+#define kmessage(fmt, ...) printf(fmt "\n", ##__VA_ARGS__)
+#define KSOCKET_MODULE_DECL /* nothing */
-extern status_t ksocket_init ();
-extern status_t ksocket_cleanup ();
-
-#define KSOCKET_MODULE_DECL \
-struct socket_module_info *gSocket; \
-status_t ksocket_init () { \
- return get_module(B_SOCKET_MODULE_NAME, (module_info **)&gSocket); \
-} \
- \
-status_t ksocket_cleanup () { \
- return put_module(B_SOCKET_MODULE_NAME); \
-}
-
#elif defined(BONE_VERSION)
/* BONE socket module */
Other related posts:
- » [haiku-commits] r36044 - haiku/trunk/src/add-ons/kernel/file_systems/googlefs - revol
