From 73a1a46de97c1b883dc6053af8c18f48675ddaa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 13 Aug 2009 16:30:21 +0000 Subject: [PATCH] * Made defines out of the kNetServerSignature and kMsgConfigureInterface constants - they are used in other apps as well, and defining them as "static const" causes undefined warnings in other source files. This also fixes the build. * Changed "interfaces::auto config" to auto_config, as that's more convenient to use in the settings files. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32321 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/bin/network/ifconfig/ifconfig.cpp | 2 +- src/preferences/network/EthernetSettingsView.cpp | 2 +- src/servers/net/NetServer.cpp | 7 ++----- src/servers/net/NetServer.h | 7 ++++--- src/servers/net/Settings.cpp | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/bin/network/ifconfig/ifconfig.cpp b/src/bin/network/ifconfig/ifconfig.cpp index 9fc72f47f5..6ae74eb30b 100644 --- a/src/bin/network/ifconfig/ifconfig.cpp +++ b/src/bin/network/ifconfig/ifconfig.cpp @@ -762,7 +762,7 @@ configure_interface(int socket, const char* name, char* const* args, message.AddString("device", name); BMessage address; address.AddString("family", "inet"); - address.AddBool("auto config", true); + address.AddBool("auto_config", true); message.AddMessage("address", &address); BMessenger networkServer(kNetServerSignature); diff --git a/src/preferences/network/EthernetSettingsView.cpp b/src/preferences/network/EthernetSettingsView.cpp index 89ce6ecdca..c3bda26881 100644 --- a/src/preferences/network/EthernetSettingsView.cpp +++ b/src/preferences/network/EthernetSettingsView.cpp @@ -449,7 +449,7 @@ EthernetSettingsView::_TriggerAutoConfig(const char* device) message.AddString("device", device); BMessage address; address.AddString("family", "inet"); - address.AddBool("auto config", true); + address.AddBool("auto_config", true); message.AddMessage("address", &address); BMessage reply; diff --git a/src/servers/net/NetServer.cpp b/src/servers/net/NetServer.cpp index 42c7380ec7..f3bf3f553a 100644 --- a/src/servers/net/NetServer.cpp +++ b/src/servers/net/NetServer.cpp @@ -81,9 +81,6 @@ struct address_family { }; -const char* kNetServerSignature = "application/x-vnd.haiku-net_server"; - - // AF_INET family static bool inet_parse_address(const char* string, sockaddr* address); static void inet_set_any_address(sockaddr* address); @@ -559,7 +556,7 @@ NetServer::_ConfigureInterface(int socket, BMessage& interface, // retrieve addresses bool autoConfig; - if (addressMessage.FindBool("auto config", &autoConfig) != B_OK) + if (addressMessage.FindBool("auto_config", &autoConfig) != B_OK) autoConfig = false; #if 0 if (autoConfig && fromMessage) { @@ -731,7 +728,7 @@ NetServer::_ConfigureDevice(int socket, const char* path) interface.AddString("device", path); BMessage address; address.AddString("family", "inet"); - address.AddBool("auto config", true); + address.AddBool("auto_config", true); interface.AddMessage("address", &address); return _ConfigureInterface(socket, interface); diff --git a/src/servers/net/NetServer.h b/src/servers/net/NetServer.h index b4ae9d773c..13526ff041 100644 --- a/src/servers/net/NetServer.h +++ b/src/servers/net/NetServer.h @@ -14,9 +14,10 @@ #include -extern const char* kNetServerSignature; - -static const uint32 kMsgConfigureInterface = 'COif'; +// NOTE: this header is used by other applications (such as ifconfig, +// and Network) because of these two defines +#define kNetServerSignature "application/x-vnd.haiku-net_server" +#define kMsgConfigureInterface 'COif' extern bool get_family_index(const char* name, int32& familyIndex); diff --git a/src/servers/net/Settings.cpp b/src/servers/net/Settings.cpp index 07af343b91..9c3eb7be4f 100644 --- a/src/servers/net/Settings.cpp +++ b/src/servers/net/Settings.cpp @@ -36,7 +36,7 @@ const static settings_template kInterfaceAddressTemplate[] = { {B_STRING_TYPE, "peer", NULL}, {B_STRING_TYPE, "broadcast", NULL}, {B_STRING_TYPE, "gateway", NULL}, - {B_BOOL_TYPE, "auto config", NULL}, + {B_BOOL_TYPE, "auto_config", NULL}, {0, NULL, NULL} };