* Renamed NetFSServer to netfs_server and added .rdef for running it in the

background.
 * Renamed NetFSServerPrefs to netfs_server_prefs.
 * Fixed copyright years in authentication_server.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35169 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2010-01-19 16:57:59 +00:00
parent 63fad9a172
commit bf365f13aa
7 changed files with 118 additions and 92 deletions
@@ -15,7 +15,7 @@ resource app_version {
internal = 0, internal = 0,
short_info = "authentication_server", short_info = "authentication_server",
long_info = "authentication_server ©2004-2009 Haiku, Inc" long_info = "authentication_server ©2004-2010 Haiku, Inc"
}; };
resource vector_icon array { resource vector_icon array {
@@ -6,9 +6,9 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) headers shared ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
DEFINES += USER=1 ; DEFINES += USER=1 ;
DEFINES += DEBUG_APP="\\\"NetFSServerPrefs\\\"" ; DEFINES += DEBUG_APP="\\\"netfs_server_prefs\\\"" ;
Application NetFSServerPrefs Application netfs_server_prefs
: DebugSupport.cpp : DebugSupport.cpp
NetFSServerRosterDefs.cpp NetFSServerRosterDefs.cpp
@@ -20,8 +20,8 @@ static const uint32 kWritePermission
// usage // usage
static const char* kUsage = static const char* kUsage =
"Usage: NetFSServerPrefs -h | --help\n" "Usage: netfs_server_prefs -h | --help\n"
" NetFSServerPrefs <command>\n" " netfs_server_prefs <command>\n"
"options:\n" "options:\n"
" -h, --help - print this text\n" " -h, --help - print this text\n"
"\n" "\n"
@@ -411,7 +411,7 @@ no_more_args(int argc, int argi)
int int
main(int argc, char** argv) main(int argc, char** argv)
{ {
BApplication app("application/x-vnd.yellowbites.NetFSServerPrefs"); BApplication app("application/x-vnd.haiku-netfs_server_prefs");
// parse first argument // parse first argument
int argi = 1; int argi = 1;
@@ -16,72 +16,76 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems
userlandfs shared ] ; userlandfs shared ] ;
DEFINES += USER=1 ; DEFINES += USER=1 ;
DEFINES += DEBUG_APP="\\\"NetFSServer\\\"" ; DEFINES += DEBUG_APP="\\\"netfs_server\\\"" ;
Application NetFSServer Application netfs_server
: DebugSupport.cpp :
DebugSupport.cpp
driver_settings.c driver_settings.c
DriverSettings.cpp DriverSettings.cpp
String.cpp String.cpp
AbstractConnection.cpp AbstractConnection.cpp
AttrDirInfo.cpp AttrDirInfo.cpp
Blocker.cpp Blocker.cpp
BlockerPool.cpp BlockerPool.cpp
Channel.cpp Channel.cpp
Connection.cpp Connection.cpp
ConnectionFactory.cpp ConnectionFactory.cpp
EntryInfo.cpp EntryInfo.cpp
FSObject.cpp FSObject.cpp
InsecureChannel.cpp InsecureChannel.cpp
InsecureConnection.cpp InsecureConnection.cpp
NetAddress.cpp NetAddress.cpp
NetFSDefs.cpp NetFSDefs.cpp
NetFSServerRosterDefs.cpp NetFSServerRosterDefs.cpp
NodeInfo.cpp NodeInfo.cpp
PortChannel.cpp PortChannel.cpp
PortConnection.cpp PortConnection.cpp
Request.cpp Request.cpp
RequestChannel.cpp RequestChannel.cpp
RequestConnection.cpp RequestConnection.cpp
RequestDumper.cpp RequestDumper.cpp
RequestFactory.cpp RequestFactory.cpp
RequestFlattener.cpp RequestFlattener.cpp
RequestHandler.cpp RequestHandler.cpp
Requests.cpp Requests.cpp
RequestUnflattener.cpp RequestUnflattener.cpp
ServerInfo.cpp ServerInfo.cpp
ServerNodeID.cpp ServerNodeID.cpp
TaskManager.cpp TaskManager.cpp
ThreadLocal.cpp ThreadLocal.cpp
AttributeDirectory.cpp AttributeDirectory.cpp
ClientConnection.cpp ClientConnection.cpp
ClientVolume.cpp ClientVolume.cpp
ConnectionListener.cpp ConnectionListener.cpp
ConnectionListenerFactory.cpp ConnectionListenerFactory.cpp
Directory.cpp Directory.cpp
Entry.cpp Entry.cpp
EntryRef.cpp EntryRef.cpp
FDManager.cpp FDManager.cpp
GlobalBlockerPool.cpp GlobalBlockerPool.cpp
InsecureConnectionListener.cpp InsecureConnectionListener.cpp
Lockable.cpp Lockable.cpp
NetFSServer.cpp NetFSServer.cpp
Node.cpp Node.cpp
NodeHandle.cpp NodeHandle.cpp
NodeHandleMap.cpp NodeHandleMap.cpp
NodeMonitor.cpp NodeMonitor.cpp
NodeMonitoringEvent.cpp NodeMonitoringEvent.cpp
Path.cpp Path.cpp
PortConnectionListener.cpp PortConnectionListener.cpp
QueryDomain.cpp QueryDomain.cpp
RequestBufferReplacer.cpp RequestBufferReplacer.cpp
SecurityContext.cpp SecurityContext.cpp
StatisticsManager.cpp StatisticsManager.cpp
UserSecurityContext.cpp UserSecurityContext.cpp
Volume.cpp Volume.cpp
VolumeManager.cpp VolumeManager.cpp
: be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++) libshared.a :
be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++) libshared.a
:
netfs_server.rdef
; ;
@@ -41,11 +41,11 @@
#include "VolumeManager.h" #include "VolumeManager.h"
static const char* kSettingsDirName = "netfs"; static const char* kSettingsDirName = "netfs";
static const char* kSettingsFileName = "NetFSServer"; static const char* kSettingsFileName = "netfs_server";
// usage // usage
static const char* kUsage = static const char* kUsage =
"Usage: NetFSServer <options>\n" "Usage: netfs_server <options>\n"
"options:\n" "options:\n"
" --dont-broadcast - don't use broadcasting to announce the server's\n" " --dont-broadcast - don't use broadcasting to announce the server's\n"
" availability to clients\n" " availability to clients\n"
@@ -186,25 +186,26 @@ private:
// constructor // constructor
NetFSServer::NetFSServer(bool useBroadcasting) NetFSServer::NetFSServer(bool useBroadcasting)
: BApplication(kNetFSServerSignature), :
fSecurityContext(NULL), BApplication(kNetFSServerSignature),
fConnectionListenerFactory(), fSecurityContext(NULL),
fConnectionListener(NULL), fConnectionListenerFactory(),
fLock("netfs server"), fConnectionListener(NULL),
fClientConnections(), fLock("netfs server"),
fVolumeManager(NULL), fClientConnections(),
fClosedConnections(), fVolumeManager(NULL),
fClosedConnectionsSemaphore(-1), fClosedConnections(),
fConnectionListenerThread(-1), fClosedConnectionsSemaphore(-1),
fConnectionDeleter(-1), fConnectionListenerThread(-1),
fBroadcaster(-1), fConnectionDeleter(-1),
fBroadcastingSocket(-1), fBroadcaster(-1),
fBroadcasterSemaphore(-1), fBroadcastingSocket(-1),
fServerInfoConnectionListener(-1), fBroadcasterSemaphore(-1),
fServerInfoConnectionListenerSocket(-1), fServerInfoConnectionListener(-1),
fServerInfoUpdated(0), fServerInfoConnectionListenerSocket(-1),
fUseBroadcasting(useBroadcasting), fServerInfoUpdated(0),
fTerminating(false) fUseBroadcasting(useBroadcasting),
fTerminating(false)
{ {
} }
@@ -0,0 +1,21 @@
/*
* netfs_server.rdef
*/
resource app_signature "application/x-vnd.haiku-netfs_server";
resource app_flags B_EXCLUSIVE_LAUNCH|B_BACKGROUND_APP;
resource app_version {
major = 1,
middle = 0,
minor = 0,
variety = B_APPV_ALPHA,
internal = 0,
short_info = "netfs_server",
long_info = "netfs_server ©2004-2010 Haiku, Inc"
};
@@ -3,4 +3,4 @@
#include "NetFSServerRosterDefs.h" #include "NetFSServerRosterDefs.h"
const char* kNetFSServerSignature const char* kNetFSServerSignature
= "application/x-vnd.yellowbites.netfs-server"; = "application/x-vnd.haiku-netfs_server";