From b7b2ad11c6c6dc96c8a5ec0ae122eb066de96aef Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sun, 19 Oct 2008 00:25:15 +0200 Subject: [PATCH] obexd: Add option for testing Phonebook Access --- obexd/src/main.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/obexd/src/main.c b/obexd/src/main.c index 91ed2cdca..3a7937c4d 100644 --- a/obexd/src/main.c +++ b/obexd/src/main.c @@ -161,6 +161,7 @@ static gchar *option_devnode = NULL; static gboolean option_autoaccept = FALSE; static gboolean option_opp = FALSE; static gboolean option_ftp = FALSE; +static gboolean option_pbap = FALSE; static GOptionEntry options[] = { { "nodaemon", 'n', G_OPTION_FLAG_REVERSE, @@ -180,6 +181,8 @@ static GOptionEntry options[] = { "Enable Object Push server" }, { "ftp", 'f', 0, G_OPTION_ARG_NONE, &option_ftp, "Enable File Transfer server" }, + { "pbap", 'f', 0, G_OPTION_ARG_NONE, &option_pbap, + "Enable Phonebook Access server" }, { NULL }, }; @@ -217,7 +220,8 @@ int main(int argc, char *argv[]) } else log_option |= LOG_PERROR; - if (option_opp == FALSE && option_ftp == FALSE) { + if (option_opp == FALSE && option_ftp == FALSE && + option_pbap == FALSE) { fprintf(stderr, "No server selected (use either " "--opp or --ftp or both)\n"); exit(EXIT_FAILURE); @@ -246,8 +250,6 @@ int main(int argc, char *argv[]) plugin_init(); - test_phonebook(); - if (option_root == NULL) option_root = g_strdup(DEFAULT_ROOT_PATH); @@ -262,6 +264,9 @@ int main(int argc, char *argv[]) server_start(OBEX_FTP, option_root, option_autoaccept, option_capability, option_devnode); + if (option_pbap == TRUE) + test_phonebook(); + memset(&sa, 0, sizeof(sa)); sa.sa_handler = sig_term; sigaction(SIGINT, &sa, NULL); -- 2.47.3