summaryrefslogtreecommitdiffstats
path: root/avahi-utils
diff options
context:
space:
mode:
Diffstat (limited to 'avahi-utils')
-rw-r--r--avahi-utils/Makefile.am2
-rw-r--r--avahi-utils/avahi-browse.c2
-rw-r--r--avahi-utils/avahi-publish.c15
-rw-r--r--avahi-utils/avahi-resolve.c2
-rw-r--r--avahi-utils/avahi-set-host-name.c2
-rw-r--r--avahi-utils/sigint.c20
-rw-r--r--avahi-utils/sigint.h8
-rw-r--r--avahi-utils/stdb.c28
-rw-r--r--avahi-utils/stdb.h8
9 files changed, 37 insertions, 50 deletions
diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 21993c3..1b0443c 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-utils/avahi-browse.c b/avahi-utils/avahi-browse.c
index 8cbd6d5..6e808a4 100644
--- a/avahi-utils/avahi-browse.c
+++ b/avahi-utils/avahi-browse.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-utils/avahi-publish.c b/avahi-utils/avahi-publish.c
index 9c9a93c..485de3a 100644
--- a/avahi-utils/avahi-publish.c
+++ b/avahi-utils/avahi-publish.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -51,7 +49,7 @@ typedef enum {
} Command;
typedef struct Config {
- int verbose, no_fail;
+ int verbose, no_fail, no_reverse;
Command command;
char *name, *stype, *domain, *host;
uint16_t port;
@@ -122,7 +120,7 @@ static int register_stuff(Config *config) {
if (config->command == COMMAND_PUBLISH_ADDRESS) {
- if (avahi_entry_group_add_address(entry_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, config->name, &config->address) < 0) {
+ if (avahi_entry_group_add_address(entry_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, config->no_reverse ? AVAHI_PUBLISH_NO_REVERSE : 0, config->name, &config->address) < 0) {
fprintf(stderr, _("Failed to add address: %s\n"), avahi_strerror(avahi_client_errno(client)));
return -1;
}
@@ -225,6 +223,7 @@ static void help(FILE *f, const char *argv0) {
" -d --domain=DOMAIN Domain to publish service in\n"
" -H --host=DOMAIN Host where service resides\n"
" --subtype=SUBTYPE An additional subtype to register this service with\n"
+ " -R --no-reverse Do not publish reverse entry with address\n"
" -f --no-fail Don't fail if the daemon is not available\n"),
argv0, strstr(argv0, "service") ? "[-s]" : "-s",
argv0, strstr(argv0, "address") ? "[-a]" : "-a");
@@ -246,6 +245,7 @@ static int parse_command_line(Config *c, const char *argv0, int argc, char *argv
{ "domain", required_argument, NULL, 'd' },
{ "host", required_argument, NULL, 'H' },
{ "subtype", required_argument, NULL, ARG_SUBTYPE},
+ { "no-reverse", no_argument, NULL, 'R' },
{ "no-fail", no_argument, NULL, 'f' },
{ NULL, 0, NULL, 0 }
};
@@ -253,12 +253,12 @@ static int parse_command_line(Config *c, const char *argv0, int argc, char *argv
assert(c);
c->command = strstr(argv0, "address") ? COMMAND_PUBLISH_ADDRESS : (strstr(argv0, "service") ? COMMAND_PUBLISH_SERVICE : COMMAND_UNSPEC);
- c->verbose = c->no_fail = 0;
+ c->verbose = c->no_fail = c->no_reverse = 0;
c->host = c->name = c->domain = c->stype = NULL;
c->port = 0;
c->txt = c->subtypes = NULL;
- while ((o = getopt_long(argc, argv, "hVsavd:H:f", long_options, NULL)) >= 0) {
+ while ((o = getopt_long(argc, argv, "hVsavRd:H:f", long_options, NULL)) >= 0) {
switch(o) {
case 'h':
@@ -276,6 +276,9 @@ static int parse_command_line(Config *c, const char *argv0, int argc, char *argv
case 'v':
c->verbose = 1;
break;
+ case 'R':
+ c->no_reverse = 1;
+ break;
case 'd':
avahi_free(c->domain);
c->domain = avahi_strdup(optarg);
diff --git a/avahi-utils/avahi-resolve.c b/avahi-utils/avahi-resolve.c
index 0077248..bf1730b 100644
--- a/avahi-utils/avahi-resolve.c
+++ b/avahi-utils/avahi-resolve.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-utils/avahi-set-host-name.c b/avahi-utils/avahi-set-host-name.c
index 737ca3b..34fbbeb 100644
--- a/avahi-utils/avahi-set-host-name.c
+++ b/avahi-utils/avahi-set-host-name.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-utils/sigint.c b/avahi-utils/sigint.c
index eb97f38..b726654 100644
--- a/avahi-utils/sigint.c
+++ b/avahi-utils/sigint.c
@@ -1,18 +1,16 @@
-/* $Id$ */
-
/***
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi 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 Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -41,7 +39,7 @@ static AvahiWatch *watch = NULL;
static int set_nonblock(int fd) {
int n;
-
+
assert(fd >= 0);
if ((n = fcntl(fd, F_GETFL)) < 0)
@@ -69,7 +67,7 @@ static void close_pipe_fds(void) {
static void watch_callback(AvahiWatch *w, int fd, AvahiWatchEvent event, AVAHI_GCC_UNUSED void *userdata) {
int s;
ssize_t l;
-
+
assert(w);
assert(fd == pipe_fds[0]);
assert(event == AVAHI_WATCH_IN);
@@ -84,7 +82,7 @@ static void watch_callback(AvahiWatch *w, int fd, AvahiWatchEvent event, AVAHI_G
int sigint_install(AvahiSimplePoll *spoll) {
struct sigaction sa;
const AvahiPoll *p;
-
+
assert(spoll);
assert(!simple_poll);
assert(pipe_fds[0] == -1 && pipe_fds[1] == -1);
@@ -106,7 +104,7 @@ int sigint_install(AvahiSimplePoll *spoll) {
close_pipe_fds();
return -1;
}
-
+
if (sigaction(SIGTERM, &sa, &old_sigterm_sa) < 0) {
sigaction(SIGINT, &old_sigint_sa, NULL);
fprintf(stderr, "sigaction() failed: %s\n", strerror(errno));
@@ -117,13 +115,13 @@ int sigint_install(AvahiSimplePoll *spoll) {
p = avahi_simple_poll_get(spoll);
watch = p->watch_new(p, pipe_fds[0], AVAHI_WATCH_IN, watch_callback, NULL);
assert(watch);
-
+
simple_poll = spoll;
return 0;
}
void sigint_uninstall(void) {
-
+
if (!simple_poll)
return;
diff --git a/avahi-utils/sigint.h b/avahi-utils/sigint.h
index 0bc5c34..ae66fd4 100644
--- a/avahi-utils/sigint.h
+++ b/avahi-utils/sigint.h
@@ -1,21 +1,19 @@
#ifndef foosigchfoo
#define foosigchfoo
-/* $Id$ */
-
/***
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi 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 Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
diff --git a/avahi-utils/stdb.c b/avahi-utils/stdb.c
index b7a5ed3..6602c97 100644
--- a/avahi-utils/stdb.c
+++ b/avahi-utils/stdb.c
@@ -1,18 +1,16 @@
-/* $Id$ */
-
/***
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi 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 Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -74,10 +72,10 @@ const char* stdb_lookup(const char *name) {
data.dptr = NULL;
data.dsize = 0;
-
+
if ((loc = setlocale(LC_MESSAGES, NULL))) {
char k[256];
-
+
snprintf(k, sizeof(k), "%s[%s]", name, loc);
key.dptr = k;
key.dsize = strlen(k);
@@ -91,7 +89,7 @@ const char* stdb_lookup(const char *name) {
if (!data.dptr) {
char l[32], *e;
snprintf(l, sizeof(l), "%s", loc);
-
+
if ((e = strchr(l, '@'))) {
*e = 0;
snprintf(k, sizeof(k), "%s[%s]", name, l);
@@ -139,9 +137,9 @@ const char* stdb_lookup(const char *name) {
avahi_free(buffer);
buffer = avahi_strndup(data.dptr, data.dsize);
free(data.dptr);
-
+
return buffer;
-
+
fail:
return name;
@@ -169,12 +167,12 @@ void stdb_shutdown(void) {
char *stdb_getent(void) {
datum key;
-
+
if (init() < 0)
return NULL;
for (;;) {
-
+
if (!enum_key) {
#ifdef HAVE_GDBM
key = gdbm_firstkey(gdbm_file);
@@ -185,7 +183,7 @@ char *stdb_getent(void) {
} else {
key.dptr = enum_key;
key.dsize = strlen(enum_key);
-
+
#ifdef HAVE_GDBM
key = gdbm_nextkey(gdbm_file, key);
#endif
@@ -196,10 +194,10 @@ char *stdb_getent(void) {
avahi_free(enum_key);
enum_key = NULL;
-
+
if (!key.dptr)
return NULL;
-
+
enum_key = avahi_strndup(key.dptr, key.dsize);
free(key.dptr);
diff --git a/avahi-utils/stdb.h b/avahi-utils/stdb.h
index 3f8ccc0..d1e1a91 100644
--- a/avahi-utils/stdb.h
+++ b/avahi-utils/stdb.h
@@ -1,21 +1,19 @@
#ifndef foostdbhfoo
#define foostdbhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi 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 Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
generated by cgit (git 2.34.1) at 2025-07-23 10:37:11 +0000