[haiku-commits] r39597 - in haiku/trunk: headers/private/net src/bin/network/ifconfig src/kits/network/libnetapi src/servers/net
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 23 Nov 2010 22:44:38 +0100 (CET)
Author: axeld
Date: 2010-11-23 22:44:37 +0100 (Tue, 23 Nov 2010)
New Revision: 39597
Changeset: http://dev.haiku-os.org/changeset/39597
Added:
haiku/trunk/headers/private/net/NetServer.h
Modified:
haiku/trunk/src/bin/network/ifconfig/Jamfile
haiku/trunk/src/kits/network/libnetapi/Jamfile
haiku/trunk/src/kits/network/libnetapi/NetworkInterface.cpp
haiku/trunk/src/servers/net/NetServer.h
Log:
* Moved the shared part of NetServer.h into a new private header.
Copied: haiku/trunk/headers/private/net/NetServer.h (from rev 39595,
haiku/trunk/src/servers/net/NetServer.h)
===================================================================
--- haiku/trunk/headers/private/net/NetServer.h (rev 0)
+++ haiku/trunk/headers/private/net/NetServer.h 2010-11-23 21:44:37 UTC (rev
39597)
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2006-2010, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * Axel Dörfler, axeld@xxxxxxxxxxxxxxxx
+ */
+#ifndef _NET_SERVER_H
+#define _NET_SERVER_H
+
+
+#define kNetServerSignature "application/x-vnd.haiku-net_server"
+
+#define kMsgConfigureInterface 'COif'
+#define kMsgConfigureResolver 'COrs'
+#define kMsgJoinNetwork 'JNnw'
+#define kMsgLeaveNetwork 'LVnw'
+
+
+#endif // _NET_SERVER_H
Modified: haiku/trunk/src/bin/network/ifconfig/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/ifconfig/Jamfile 2010-11-23 21:25:09 UTC
(rev 39596)
+++ haiku/trunk/src/bin/network/ifconfig/Jamfile 2010-11-23 21:44:37 UTC
(rev 39597)
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src bin network ifconfig ;
-UseHeaders [ FDirName $(HAIKU_TOP) src servers net ] : true ;
+UsePrivateHeaders net ;
BinCommand ifconfig :
ifconfig.cpp
Modified: haiku/trunk/src/kits/network/libnetapi/Jamfile
===================================================================
--- haiku/trunk/src/kits/network/libnetapi/Jamfile 2010-11-23 21:25:09 UTC
(rev 39596)
+++ haiku/trunk/src/kits/network/libnetapi/Jamfile 2010-11-23 21:44:37 UTC
(rev 39597)
@@ -5,7 +5,6 @@
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
: true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src servers net ] : true ;
SharedLibrary libbnetapi.so :
init.cpp
Modified: haiku/trunk/src/kits/network/libnetapi/NetworkInterface.cpp
===================================================================
--- haiku/trunk/src/kits/network/libnetapi/NetworkInterface.cpp 2010-11-23
21:25:09 UTC (rev 39596)
+++ haiku/trunk/src/kits/network/libnetapi/NetworkInterface.cpp 2010-11-23
21:44:37 UTC (rev 39597)
@@ -12,7 +12,6 @@
#include <AutoDeleter.h>
#include <Messenger.h>
-
#include <NetServer.h>
Modified: haiku/trunk/src/servers/net/NetServer.h
===================================================================
--- haiku/trunk/src/servers/net/NetServer.h 2010-11-23 21:25:09 UTC (rev
39596)
+++ haiku/trunk/src/servers/net/NetServer.h 2010-11-23 21:44:37 UTC (rev
39597)
@@ -11,22 +11,12 @@
#include <SupportDefs.h>
-#include <net/if.h>
+#include <NetServer.h>
class BNetworkAddress;
-// TODO: move this into a private shared header
-// NOTE: this header is used by other applications (such as ifconfig,
-// and Network) because of these defines
-#define kNetServerSignature "application/x-vnd.haiku-net_server"
-#define kMsgConfigureInterface 'COif'
-#define kMsgConfigureResolver 'COrs'
-#define kMsgJoinNetwork 'JNnw'
-#define kMsgLeaveNetwork 'LVnw'
-
-
int get_address_family(const char* argument);
bool parse_address(int32& family, const char* argument,
BNetworkAddress& address);
Other related posts:
- » [haiku-commits] r39597 - in haiku/trunk: headers/private/net src/bin/network/ifconfig src/kits/network/libnetapi src/servers/net - axeld
