From 40e492bc4c33af3ba2c9e593c256a77d6632aa23 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Wed, 13 Nov 2002 07:57:19 +0000 Subject: [PATCH] Some net headers fixes git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1911 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/net/NetBuffer.h | 78 +++++++++++++++--------------- headers/os/net/NetDebug.h | 6 +-- headers/private/net/net_module.h | 15 ------ headers/private/net/userland_ipc.h | 9 ++++ 4 files changed, 49 insertions(+), 59 deletions(-) diff --git a/headers/os/net/NetBuffer.h b/headers/os/net/NetBuffer.h index a5bca06275..ec296ff786 100644 --- a/headers/os/net/NetBuffer.h +++ b/headers/os/net/NetBuffer.h @@ -41,53 +41,53 @@ class NLPacket; class BNetBuffer : public BArchivable { public: - BNetBuffer( size_t size = 0 ); - virtual ~BNetBuffer( void ); + BNetBuffer(size_t size = 0); + virtual ~BNetBuffer(); - status_t InitCheck( void ); + status_t InitCheck(); - BNetBuffer( BMessage* Archive ); - virtual status_t Archive( BMessage* into, bool deep = true ) const; - static BArchivable* Instantiate( BMessage* archive ); + BNetBuffer(BMessage *archive); + virtual status_t Archive(BMessage *into, bool deep = true) const; + static BArchivable *Instantiate(BMessage *archive); - BNetBuffer( const BNetBuffer& ); - BNetBuffer& operator=( const BNetBuffer& ); + BNetBuffer(const BNetBuffer &); + BNetBuffer& operator=(const BNetBuffer &); // Mutators. - status_t AppendInt8( int8 ); - status_t AppendUint8( uint8 ); - status_t AppendInt16( int16 ); - status_t AppendUint16( uint16 ); - status_t AppendInt32( int32 ); - status_t AppendUint32( uint32 ); - status_t AppendFloat( float ); - status_t AppendDouble( double ); - status_t AppendString( const char* ); - status_t AppendData( const void*, size_t ); - status_t AppendMessage( const BMessage& ); - status_t AppendInt64( int64 ); - status_t AppendUint64( uint64 ); + status_t AppendInt8(int8); + status_t AppendUint8(uint8); + status_t AppendInt16(int16); + status_t AppendUint16(uint16); + status_t AppendInt32(int32); + status_t AppendUint32(uint32); + status_t AppendFloat(float); + status_t AppendDouble(double); + status_t AppendString(const char *); + status_t AppendData(const void *, size_t); + status_t AppendMessage(const BMessage &); + status_t AppendInt64(int64); + status_t AppendUint64(uint64); - status_t RemoveInt8( int8& ); - status_t RemoveUint8( uint8& ); - status_t RemoveInt16( int16& ); - status_t RemoveUint16( uint16& ); - status_t RemoveInt32( int32& ); - status_t RemoveUint32( uint32& ); - status_t RemoveFloat( float& ); - status_t RemoveDouble( double& ); - status_t RemoveString( char*, size_t ); - status_t RemoveData( void*, size_t ); - status_t RemoveMessage( BMessage& ); - status_t RemoveInt64( int64& ); - status_t RemoveUint64( uint64& ); + status_t RemoveInt8(int8 &); + status_t RemoveUint8(uint8 &); + status_t RemoveInt16(int16 &); + status_t RemoveUint16(uint16 &); + status_t RemoveInt32(int32 &); + status_t RemoveUint32(uint32 &); + status_t RemoveFloat(float &); + status_t RemoveDouble(double &); + status_t RemoveString(char *, size_t); + status_t RemoveData(void *, size_t); + status_t RemoveMessage(BMessage &); + status_t RemoveInt64(int64 &); + status_t RemoveUint64(uint64 &); // Accessors. - unsigned char* Data( void ) const; - size_t Size( void ) const; - size_t BytesRemaining( void ) const; + unsigned char *Data() const; + size_t Size() const; + size_t BytesRemaining() const; - inline NLPacket *GetImpl( void ) const; + inline NLPacket *GetImpl() const; protected: // Attributes. @@ -117,5 +117,3 @@ inline NLPacket* BNetBuffer::GetImpl( void ) const #endif // <-- #ifndef _NETBUFFER_H - -/*=------------------------------------------------------------------- End -=*/ diff --git a/headers/os/net/NetDebug.h b/headers/os/net/NetDebug.h index dee4b9cd00..176b3a3a10 100644 --- a/headers/os/net/NetDebug.h +++ b/headers/os/net/NetDebug.h @@ -46,13 +46,11 @@ public: static bool IsEnabled(); // print a debugging message - static void Print( const char* msg ); + static void Print(const char *msg); // dump raw data in a nice hd-like format - static void Dump( const char* data, size_t size, const char* title ); + static void Dump(const char *data, size_t size, const char *title); }; #endif // <-- #ifndef _NETDEBUG_H - -/*=------------------------------------------------------------------- End -=*/ diff --git a/headers/private/net/net_module.h b/headers/private/net/net_module.h index 6b3592d246..655dcb1625 100644 --- a/headers/private/net/net_module.h +++ b/headers/private/net/net_module.h @@ -15,19 +15,7 @@ #include "net/if.h" #include "net/route.h" -#ifdef _KERNEL_MODE #include -#else -typedef struct module_info { - const char *name; - uint32 flags; - status_t (*std_ops)(int32, ...); -} module_info; - -#define B_MODULE_INIT 1 -#define B_MODULE_UNINIT 2 -#define B_KEEP_LOADED 0x00000001 -#endif struct kernel_net_module_info { module_info info; @@ -39,9 +27,6 @@ struct net_module { struct net_module *next; char *name; struct kernel_net_module_info *ptr; -#ifndef _KERNEL_MODE - image_id iid; -#endif int status; }; diff --git a/headers/private/net/userland_ipc.h b/headers/private/net/userland_ipc.h index 397aa0f98a..c3980481c9 100644 --- a/headers/private/net/userland_ipc.h +++ b/headers/private/net/userland_ipc.h @@ -11,6 +11,9 @@ #include #include "net_stack_driver.h" +#ifdef __cplusplus +extern "C" { +#endif #define NET_STACK_PORTNAME "net_server connection" @@ -47,7 +50,13 @@ typedef struct { uint32 numCommands,bufferSize; } net_connection; + extern status_t init_userland_ipc(void); extern void shutdown_userland_ipc(void); + +#ifdef __cplusplus +} // end of extern "C" +#endif + #endif /* USERLAND_IPC_H */