Don't built the standalone SDP server

3 files changed, 2 insertions, 264 deletions

diff --git a/sdpd/Makefile.am b/sdpd/Makefile.am
index a7efa56f..6ce2f85b 100644
--- a/sdpd/Makefile.am
+++ b/sdpd/Makefile.am
@@ -1,28 +1,11 @@
 
 noinst_LIBRARIES = libsdpserver.a
 
-libsdpserver_a_SOURCES = sdpd.h server.c cstate.c request.c service.c servicedb.c
-
-if SDPD
-sbin_PROGRAMS = sdpd
-
-sdpd_SOURCES = main.c
-
-sdpd_LDADD = libsdpserver.a \
-	$(top_builddir)/common/libhelper.a \
-	@GLIB_LIBS@ @BLUEZ_LIBS@
-endif
+libsdpserver_a_SOURCES = \
+		sdpd.h server.c cstate.c request.c service.c servicedb.c
 
 AM_CFLAGS = @BLUEZ_CFLAGS@ @GLIB_CFLAGS@
 
 INCLUDES = -I$(top_srcdir)/common
 
-if SDPD
-if MANPAGES
-man_MANS = sdpd.8
-endif
-endif
-
-EXTRA_DIST = sdpd.8
-
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/sdpd/main.c b/sdpd/main.c
deleted file mode 100644
index 51c66f0f..00000000
--- a/sdpd/main.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2001-2002  Nokia Corporation
- *  Copyright (C) 2002-2003  Maxim Krasnyansky <maxk@qualcomm.com>
- *  Copyright (C) 2002-2008  Marcel Holtmann <marcel@holtmann.org>
- *  Copyright (C) 2002-2003  Stephen Crane <steve.crane@rococosoft.com>
- *
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <signal.h>
-#include <sys/stat.h>
-
-#include <glib.h>
-
-#include "logging.h"
-#include "sdpd.h"
-
-static GMainLoop *event_loop;
-
-static void sig_term(int sig)
-{
-	g_main_loop_quit(event_loop);
-}
-
-static void sig_hup(int sig)
-{
-}
-
-static void sig_debug(int sig)
-{
-	toggle_debug();
-}
-
-static void usage(void)
-{
-	printf("sdpd - SDP daemon ver %s\n", VERSION);
-	printf("Usage: \n");
-	printf("\tsdpd [-n] [-d] [-m mtu] [-p]\n");
-}
-
-static struct option main_options[] = {
-	{ "help",	0, 0, 'h' },
-	{ "nodaemon",	0, 0, 'n' },
-	{ "mtu",	1, 0, 'm' },
-	{ "master",	0, 0, 'M' },
-	{ 0, 0, 0, 0}
-};
-
-int main(int argc, char *argv[])
-{
-	struct sigaction sa;
-	uint16_t mtu = 0;
-	uint32_t flags = SDP_SERVER_COMPAT;
-	int opt, daemonize = 1, debug = 0;
-
-	while ((opt = getopt_long(argc, argv, "ndm:M", main_options, NULL)) != -1) {
-		switch (opt) {
-		case 'n':
-			daemonize = 0;
-			break;
-
-		case 'd':
-			debug = 1;
-			break;
-
-		case 'm':
-			mtu = atoi(optarg);
-			break;
-
-		case 'M':
-			flags |= SDP_SERVER_MASTER;
-			break;
-
-		default:
-			usage();
-			exit(1);
-		}
-	}
-
-	if (daemonize && daemon(0, 0)) {
-		error("Server startup failed: %s (%d)", strerror(errno), errno);
-		exit(1);
-	}
-
-	umask(0077);
-
-	start_logging("sdpd", "Bluetooth SDP daemon");
-
-	memset(&sa, 0, sizeof(sa));
-	sa.sa_flags = SA_NOCLDSTOP;
-	sa.sa_handler = sig_term;
-	sigaction(SIGTERM, &sa, NULL);
-	sigaction(SIGINT,  &sa, NULL);
-	sa.sa_handler = sig_hup;
-	sigaction(SIGHUP, &sa, NULL);
-
-	sa.sa_handler = sig_debug;
-	sigaction(SIGUSR2, &sa, NULL);
-
-	sa.sa_handler = SIG_IGN;
-	sigaction(SIGCHLD, &sa, NULL);
-	sigaction(SIGPIPE, &sa, NULL);
-
-	if (debug) {
-		info("Enabling debug information");
-		enable_debug();
-	}
-
-	event_loop = g_main_loop_new(NULL, FALSE);
-
-	if (start_sdp_server(mtu, NULL, flags) < 0) {
-		g_main_loop_unref(event_loop);
-		exit(1);
-	}
-
-	g_main_loop_run(event_loop);
-
-	stop_sdp_server();
-
-	g_main_loop_unref(event_loop);
-
-	info("Exit");
-
-	stop_logging();
-
-	return 0;
-}
diff --git a/sdpd/sdpd.8 b/sdpd/sdpd.8
deleted file mode 100644
index e23c6ffc..00000000
--- a/sdpd/sdpd.8
+++ /dev/null
@@ -1,92 +0,0 @@
-.\" $Header$
-.\"
-.\"	transcript compatibility for postscript use.
-.\"
-.\"	synopsis:  .P! <file.ps>
-.\"
-.de P!
-.fl
-\!!1 setgray
-.fl
-\\&.\"
-.fl
-\!!0 setgray
-.fl			\" force out current output buffer
-\!!save /psv exch def currentpoint translate 0 0 moveto
-\!!/showpage{}def
-.fl			\" prolog
-.sy sed -e 's/^/!/' \\$1\" bring in postscript file
-\!!psv restore
-.
-.de pF
-.ie     \\*(f1 .ds f1 \\n(.f
-.el .ie \\*(f2 .ds f2 \\n(.f
-.el .ie \\*(f3 .ds f3 \\n(.f
-.el .ie \\*(f4 .ds f4 \\n(.f
-.el .tm ? font overflow
-.ft \\$1
-..
-.de fP
-.ie     !\\*(f4 \{\
-.	ft \\*(f4
-.	ds f4\"
-'	br \}
-.el .ie !\\*(f3 \{\
-.	ft \\*(f3
-.	ds f3\"
-'	br \}
-.el .ie !\\*(f2 \{\
-.	ft \\*(f2
-.	ds f2\"
-'	br \}
-.el .ie !\\*(f1 \{\
-.	ft \\*(f1
-.	ds f1\"
-'	br \}
-.el .tm ? font underflow
-..
-.ds f1\"
-.ds f2\"
-.ds f3\"
-.ds f4\"
-'\" t 
-.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n  
-.TH "sdpd" "8" 
-.SH "NAME" 
-sdpd \(em Bluetooth SDP daemon 
-.SH "SYNOPSIS" 
-.PP 
-\fBsdpd\fR [\fIoptions\fR]  
-.SH "DESCRIPTION" 
-.PP 
-\fBsdpd\fR allows Bluetooth devices 
-connected to the host to advertise via SDP the Bluetooth services 
-available. 
- 
-.SH "OPTIONS" 
-.IP "\fB-n\fP" 10 
-Don't detach from the controlling terminal. 
-.IP "\fB-d\fP" 10
-Enable debugging output.
-.IP "\fB-m <mtu>\fP" 10
-Set maximum MTU to use on the L2CAP channel.
- 
-.SH "BUGS" 
-.PP 
-None yet known. 
-.SH "AUTHOR" 
-.PP 
-Maxim Krasnyansky <maxk@qualcomm.com>,  
-Stephen Crane <steve.crane@rococosoft.com>. Man page written 
-by Edd Dumbill <ejad@debian.org>. 
- 
-.PP 
-Based on work done by Guruprasad Krishnamurthy 
-<guruprasad.krishnamurthy@nokia.com>, Dmitry Kasatkin 
-<dmitry.kasatkin@nokia.com> and Manel Guerrero Zapata 
-<manel.guerrero-zapata@nokia.com>. 
- 
-.SH "SEE ALSO" 
-.PP 
-sdptool(1)
-.\" created by instant / docbook-to-man, Thu 15 Jan 2004, 21:01