diff options
Diffstat (limited to 'libavahi-core')
38 files changed, 857 insertions, 56 deletions
diff --git a/libavahi-core/Makefile b/libavahi-core/Makefile deleted file mode 100644 index ff3977e..0000000 --- a/libavahi-core/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -#CC=gcc-2.95 -CFLAGS=-g -O1 -Wall -W -pipe $(shell pkg-config --cflags glib-2.0) -Wno-unused -LIBS=$(shell pkg-config --libs glib-2.0) - -all: strlst-test prioq-test domain-test dns-test flexmdns - -flexmdns: timeeventq.o main.o iface.o netlink.o server.o address.o util.o prioq.o cache.o rr.o dns.o socket.o psched.o announce.o subscribe.o strlst.o - $(CC) -o $@ $^ $(LIBS) - -#test-llist: test-llist.o -# $(CC) -o $@ $^ $(LIBS) - -prioq-test: prioq-test.o prioq.o - $(CC) -o $@ $^ $(LIBS) - -strlst-test: strlst-test.o strlst.o - $(CC) -o $@ $^ $(LIBS) - -domain-test: domain-test.o util.o - $(CC) -o $@ $^ $(LIBS) - -dns-test: dns-test.o util.o dns.o rr.o strlst.o - $(CC) -o $@ $^ $(LIBS) - -*.o: *.h - -clean: - rm -f *.o flexmdns prioq-test strlst-test domain-test dns-test diff --git a/libavahi-core/Makefile.am b/libavahi-core/Makefile.am new file mode 100644 index 0000000..ed54bb6 --- /dev/null +++ b/libavahi-core/Makefile.am @@ -0,0 +1,88 @@ +# $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 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 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 +# USA. + +AM_CFLAGS=-I$(top_srcdir) -D_GNU_SOURCE + +# GLIB 2.0 +AM_CFLAGS+=$(GLIB20_CFLAGS) +AM_LDADD=$(GLIB20_LIBS) + +# This cool debug trap works on i386/gcc only +AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' + +lib_LTLIBRARIES = \ + libavahi-core.la + +noinst_PROGRAMS = \ + dns-test \ + domain-test \ + prioq-test \ + strlst-test \ + avahi-test + +libavahi_core_la_SOURCES = \ + timeeventq.c timeeventq.h\ + iface.c iface.h \ + netlink.c netlink.h \ + server.c server.h \ + address.c address.h \ + util.c util.h \ + prioq.c prioq.h \ + cache.c cache.h\ + rr.c rr.h \ + dns.c dns.h \ + socket.c socket.h \ + psched.c psched.h \ + announce.c announce.h \ + subscribe.c subscribe.h \ + strlst.c strlst.h + +prioq_test_SOURCES = \ + prioq-test.c \ + prioq.c prioq.h +prioq_test_CFLAGS = $(AM_CFLAGS) +prioq_test_LDADD = $(AM_LDADD) + +strlst_test_SOURCES = \ + strlst-test.c \ + strlst.c strlst.h +strlst_test_CFLAGS = $(AM_CFLAGS) +strlst_test_LDADD = $(AM_LDADD) + +domain_test_SOURCES = \ + domain-test.c \ + util.c util.h +domain_test_CFLAGS = $(AM_CFLAGS) +domain_test_LDADD = $(AM_LDADD) + +dns_test_SOURCES = \ + dns-test.c \ + util.c util.h \ + dns.c dns.h \ + rr.c rr.h \ + strlst.c strlst.h +dns_test_CFLAGS = $(AM_CFLAGS) +dns_test_LDADD = $(AM_LDADD) + +avahi_test_SOURCES = \ + main.c +avahi_test_CFLAGS = $(AM_CFLAGS) +avahi_test_LDADD = $(AM_LDADD) libavahi-core.la + + diff --git a/libavahi-core/address.h b/libavahi-core/address.h index 2eea75d..b88aba2 100644 --- a/libavahi-core/address.h +++ b/libavahi-core/address.h @@ -1,9 +1,29 @@ #ifndef fooaddresshfoo #define fooaddresshfoo -#include <glib.h> +/* $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 + USA. +***/ #include <sys/socket.h> +#include <glib.h> typedef struct { guint32 address; @@ -19,7 +39,7 @@ typedef struct { union { AvahiIPv6Address ipv6; AvahiIPv4Address ipv4; - guint8 data[0]; + guint8 data[1]; } data; } AvahiAddress; diff --git a/libavahi-core/announce.c b/libavahi-core/announce.c index 538ba2e..3673ca2 100644 --- a/libavahi-core/announce.c +++ b/libavahi-core/announce.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include "announce.h" #include "util.h" diff --git a/libavahi-core/announce.h b/libavahi-core/announce.h index cd96977..71b2f03 100644 --- a/libavahi-core/announce.h +++ b/libavahi-core/announce.h @@ -1,6 +1,27 @@ #ifndef fooannouncehfoo #define fooannouncehfoo +/* $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 + USA. +***/ + #include <glib.h> typedef struct _AvahiAnnouncement AvahiAnnouncement; diff --git a/libavahi-core/avahi.h b/libavahi-core/avahi.h index 1c59faf..bbb7873 100644 --- a/libavahi-core/avahi.h +++ b/libavahi-core/avahi.h @@ -1,5 +1,26 @@ -#ifndef fooAvahihfoo -#define fooAvahihfoo +#ifndef fooavahihfoo +#define fooavahihfoo + +/* $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 + USA. +***/ #include <stdio.h> #include <glib.h> diff --git a/libavahi-core/cache.c b/libavahi-core/cache.c index c2d680e..28d0d88 100644 --- a/libavahi-core/cache.c +++ b/libavahi-core/cache.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include <string.h> #include "util.h" @@ -110,8 +131,6 @@ static gpointer lookup_record_callback(AvahiCache *c, AvahiKey *pattern, AvahiCa } AvahiCacheEntry *avahi_cache_lookup_record(AvahiCache *c, AvahiRecord *r) { - AvahiCacheEntry *e; - g_assert(c); g_assert(r); @@ -316,6 +335,9 @@ static void func(gpointer key, gpointer data, gpointer userdata) { AvahiKey *k = key; gchar *t; + g_assert(k); + g_assert(e); + t = avahi_record_to_string(e->record); fprintf((FILE*) userdata, "%s\n", t); g_free(t); diff --git a/libavahi-core/cache.h b/libavahi-core/cache.h index de0ec9f..d64b3ee 100644 --- a/libavahi-core/cache.h +++ b/libavahi-core/cache.h @@ -1,6 +1,27 @@ #ifndef foocachehfoo #define foocachehfoo +/* $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 + USA. +***/ + #include <glib.h> struct _AvahiCache; diff --git a/libavahi-core/dns-test.c b/libavahi-core/dns-test.c index d8c7b53..0d4500a 100644 --- a/libavahi-core/dns-test.c +++ b/libavahi-core/dns-test.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include "dns.h" #include "util.h" diff --git a/libavahi-core/dns.c b/libavahi-core/dns.c index e485ed8..99c6f73 100644 --- a/libavahi-core/dns.c +++ b/libavahi-core/dns.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include <netinet/in.h> #include <stdlib.h> @@ -116,7 +137,6 @@ guint8* avahi_dns_packet_append_name(AvahiDnsPacket *p, const gchar *name) { saved_ptr = avahi_dns_packet_extend(p, 0); while (*name) { - guint n; guint8* prev; const gchar *pname; gchar label[64]; @@ -463,7 +483,6 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca guint16 type, class; guint32 ttl; guint16 rdlength; - gconstpointer data; AvahiRecord *r = NULL; gconstpointer start; diff --git a/libavahi-core/dns.h b/libavahi-core/dns.h index 13d9278..61a9cb6 100644 --- a/libavahi-core/dns.h +++ b/libavahi-core/dns.h @@ -1,6 +1,27 @@ #ifndef foodnshfoo #define foodnshfoo +/* $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 + USA. +***/ + #include <glib.h> #include "rr.h" diff --git a/libavahi-core/domain-test.c b/libavahi-core/domain-test.c index f3deeac..9a4a85a 100644 --- a/libavahi-core/domain-test.c +++ b/libavahi-core/domain-test.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include "util.h" int main(int argc, char *argv[]) { diff --git a/libavahi-core/iface.c b/libavahi-core/iface.c index 519a65b..2095e42 100644 --- a/libavahi-core/iface.c +++ b/libavahi-core/iface.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include <string.h> #include <sys/socket.h> #include <asm/types.h> @@ -263,7 +284,6 @@ static void callback(AvahiNetlink *nl, struct nlmsghdr *n, gpointer userdata) { } else if (n->nlmsg_type == RTM_DELLINK) { struct ifinfomsg *ifinfomsg = NLMSG_DATA(n); AvahiHwInterface *hw; - AvahiInterface *i; if (ifinfomsg->ifi_family != AF_UNSPEC) return; diff --git a/libavahi-core/iface.h b/libavahi-core/iface.h index cab4949..74136aa 100644 --- a/libavahi-core/iface.h +++ b/libavahi-core/iface.h @@ -1,6 +1,27 @@ #ifndef fooifacehfoo #define fooifacehfoo +/* $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 + USA. +***/ + #include <glib.h> typedef struct _AvahiInterfaceMonitor AvahiInterfaceMonitor; diff --git a/libavahi-core/llist.h b/libavahi-core/llist.h index 16a16b6..7c28f31 100644 --- a/libavahi-core/llist.h +++ b/libavahi-core/llist.h @@ -1,6 +1,27 @@ #ifndef foollistfoo #define foollistfoo +/* $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 + USA. +***/ + #include <glib.h> /* Some macros for maintaining doubly linked lists */ diff --git a/libavahi-core/main.c b/libavahi-core/main.c index 9699329..260c6aa 100644 --- a/libavahi-core/main.c +++ b/libavahi-core/main.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/libavahi-core/netlink.c b/libavahi-core/netlink.c index 1289749..bd81829 100644 --- a/libavahi-core/netlink.c +++ b/libavahi-core/netlink.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include <unistd.h> #include <errno.h> #include <string.h> diff --git a/libavahi-core/netlink.h b/libavahi-core/netlink.h index 8066aae..f6be54a 100644 --- a/libavahi-core/netlink.h +++ b/libavahi-core/netlink.h @@ -1,6 +1,27 @@ #ifndef foonetlinkhfoo #define foonetlinkhfoo +/* $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 + USA. +***/ + #include <sys/socket.h> #include <asm/types.h> #include <linux/netlink.h> diff --git a/libavahi-core/prioq-test.c b/libavahi-core/prioq-test.c index 53a8383..160458d 100644 --- a/libavahi-core/prioq-test.c +++ b/libavahi-core/prioq-test.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include <time.h> #include <stdlib.h> #include <stdio.h> @@ -53,7 +74,7 @@ static void rec(AvahiPrioQueueNode *n) { int main(int argc, char *argv[]) { AvahiPrioQueue *q, *q2; - gint i, prev; + gint i; q = avahi_prio_queue_new(compare_int); q2 = avahi_prio_queue_new(compare_ptr); diff --git a/libavahi-core/prioq.c b/libavahi-core/prioq.c index 2eedf27..ad5948e 100644 --- a/libavahi-core/prioq.c +++ b/libavahi-core/prioq.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include "prioq.h" AvahiPrioQueue* avahi_prio_queue_new(gint (*compare) (gconstpointer a, gconstpointer b)) { diff --git a/libavahi-core/prioq.h b/libavahi-core/prioq.h index 6b5babb..6651071 100644 --- a/libavahi-core/prioq.h +++ b/libavahi-core/prioq.h @@ -1,6 +1,27 @@ #ifndef fooprioqhfoo #define fooprioqhfoo +/* $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 + USA. +***/ + #include <glib.h> struct _AvahiPrioQueue; diff --git a/libavahi-core/psched.c b/libavahi-core/psched.c index faa2fa9..03b065b 100644 --- a/libavahi-core/psched.c +++ b/libavahi-core/psched.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include <string.h> #include "util.h" @@ -68,7 +89,6 @@ void avahi_packet_scheduler_free(AvahiPacketScheduler *s) { AvahiQueryJob *qj; AvahiResponseJob *rj; AvahiProbeJob *pj; - AvahiTimeEvent *e; g_assert(s); @@ -361,7 +381,6 @@ static AvahiResponseJob* response_job_new(AvahiPacketScheduler *s, AvahiRecord * void avahi_packet_scheduler_post_response(AvahiPacketScheduler *s, const AvahiAddress *a, AvahiRecord *record, gboolean flush_cache, gboolean immediately) { AvahiResponseJob *rj; GTimeVal tv; - gchar *t; g_assert(s); g_assert(record); @@ -636,7 +655,6 @@ static void probe_elapse(AvahiTimeEvent *e, gpointer data) { AvahiPacketScheduler *s; AvahiDnsPacket *p; guint n; - guint8 *d; g_assert(pj); s = pj->scheduler; diff --git a/libavahi-core/psched.h b/libavahi-core/psched.h index 8f5e77c..72f8ef0 100644 --- a/libavahi-core/psched.h +++ b/libavahi-core/psched.h @@ -1,6 +1,27 @@ #ifndef foopschedhfoo #define foopschedhfoo +/* $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 + USA. +***/ + typedef struct _AvahiQueryJob AvahiQueryJob; typedef struct _AvahiResponseJob AvahiResponseJob; typedef struct _AvahiPacketScheduler AvahiPacketScheduler; diff --git a/libavahi-core/rr.c b/libavahi-core/rr.c index f4102dd..ca339b2 100644 --- a/libavahi-core/rr.c +++ b/libavahi-core/rr.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include <string.h> #include <stdio.h> #include <sys/types.h> diff --git a/libavahi-core/rr.h b/libavahi-core/rr.h index 6f1a8cb..2efb850 100644 --- a/libavahi-core/rr.h +++ b/libavahi-core/rr.h @@ -1,6 +1,27 @@ #ifndef foorrhfoo #define foorrhfoo +/* $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 + USA. +***/ + #include <glib.h> #include "strlst.h" diff --git a/libavahi-core/server.c b/libavahi-core/server.c index b17b142..bc9b9ca 100644 --- a/libavahi-core/server.c +++ b/libavahi-core/server.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include <sys/socket.h> #include <arpa/inet.h> #include <string.h> @@ -459,9 +480,7 @@ static gboolean dispatch_func(GSource *source, GSourceFunc callback, gpointer us } static void add_default_entries(AvahiServer *s) { - gint length = 0; struct utsname utsname; - gchar *hinfo; AvahiAddress a; AvahiRecord *r; @@ -484,7 +503,7 @@ static void add_default_entries(AvahiServer *s) { } AvahiServer *avahi_server_new(GMainContext *c) { - gchar *hn, *e; + gchar *hn; AvahiServer *s; static GSourceFuncs source_funcs = { @@ -984,8 +1003,6 @@ void avahi_entry_group_free(AvahiEntryGroup *g) { } void avahi_entry_group_commit(AvahiEntryGroup *g) { - AvahiEntry *e; - g_assert(g); g_assert(!g->dead); diff --git a/libavahi-core/server.h b/libavahi-core/server.h index 9f7ef51..efe8ed9 100644 --- a/libavahi-core/server.h +++ b/libavahi-core/server.h @@ -1,5 +1,26 @@ -#ifndef fooAvahiserverhfoo -#define fooAvahiserverhfoo +#ifndef fooserverhfoo +#define fooserverhfoo + +/* $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 + USA. +***/ #include "avahi.h" #include "iface.h" diff --git a/libavahi-core/socket.c b/libavahi-core/socket.c index 1ef8131..59357ab 100644 --- a/libavahi-core/socket.c +++ b/libavahi-core/socket.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include <inttypes.h> #include <errno.h> #include <string.h> @@ -113,7 +134,7 @@ int avahi_mdns_mcast_leave_ipv6 (int index, int fd) } gint avahi_open_socket_ipv4(void) { - struct sockaddr_in sa, local; + struct sockaddr_in local; int fd = -1, ttl, yes; if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { @@ -295,7 +316,6 @@ gint avahi_send_dns_packet_ipv4(gint fd, gint interface, AvahiDnsPacket *p) { struct cmsghdr *cmsg; struct in_pktinfo *pkti; uint8_t cmsg_data[sizeof(struct cmsghdr) + sizeof(struct in_pktinfo)]; - int i, n; g_assert(fd >= 0); g_assert(p); @@ -335,7 +355,6 @@ gint avahi_send_dns_packet_ipv6(gint fd, gint interface, AvahiDnsPacket *p) { struct cmsghdr *cmsg; struct in6_pktinfo *pkti; uint8_t cmsg_data[sizeof(struct cmsghdr) + sizeof(struct in6_pktinfo)]; - int i, n; g_assert(fd >= 0); g_assert(p); diff --git a/libavahi-core/socket.h b/libavahi-core/socket.h index 2baa122..4f6c5a3 100644 --- a/libavahi-core/socket.h +++ b/libavahi-core/socket.h @@ -1,14 +1,33 @@ #ifndef foosockethfoo #define foosockethfoo +/* $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 + USA. +***/ + #include <netinet/in.h> #include "dns.h" #define AVAHI_MDNS_PORT 5353 - - gint avahi_open_socket_ipv4(void); gint avahi_open_socket_ipv6(void); diff --git a/libavahi-core/strlst-test.c b/libavahi-core/strlst-test.c index 5e28ce2..6a9bbf6 100644 --- a/libavahi-core/strlst-test.c +++ b/libavahi-core/strlst-test.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include <glib.h> #include <stdio.h> @@ -13,7 +34,7 @@ int main(int argc, char *argv[]) { a = avahi_string_list_add(a, "foo"); a = avahi_string_list_add(a, "bar"); a = avahi_string_list_add(a, "quux"); - a = avahi_string_list_add_arbitrary(a, "null\0null", 9); + a = avahi_string_list_add_arbitrary(a, (guint8*) "null\0null", 9); a = avahi_string_list_add(a, "end"); t = avahi_string_list_to_string(a); diff --git a/libavahi-core/strlst.c b/libavahi-core/strlst.c index f2d76e4..94ff4db 100644 --- a/libavahi-core/strlst.c +++ b/libavahi-core/strlst.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include <string.h> #include <stdarg.h> @@ -87,7 +108,7 @@ gchar* avahi_string_list_to_string(AvahiStringList *l) { *(e++) = ' '; *(e++) = '"'; - strncpy(e, n->text, n->size); + strncpy(e, (gchar*) n->text, n->size); e[n->size] = 0; e = strchr(e, 0); *(e++) = '"'; diff --git a/libavahi-core/strlst.h b/libavahi-core/strlst.h index 22cdc88..42377c0 100644 --- a/libavahi-core/strlst.h +++ b/libavahi-core/strlst.h @@ -1,6 +1,27 @@ #ifndef footxtlisthfoo #define footxtlisthfoo +/* $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 + USA. +***/ + #include <glib.h> typedef struct _AvahiStringList AvahiStringList; diff --git a/libavahi-core/subscribe.c b/libavahi-core/subscribe.c index 902e966..df8ee05 100644 --- a/libavahi-core/subscribe.c +++ b/libavahi-core/subscribe.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include "subscribe.h" #include "util.h" @@ -116,7 +137,6 @@ void avahi_subscription_free(AvahiSubscription *s) { void avahi_subscription_notify(AvahiServer *server, AvahiInterface *i, AvahiRecord *record, AvahiSubscriptionEvent event) { AvahiSubscription *s; - AvahiKey *pattern; g_assert(server); g_assert(record); diff --git a/libavahi-core/subscribe.h b/libavahi-core/subscribe.h index 2cb1528..307393e 100644 --- a/libavahi-core/subscribe.h +++ b/libavahi-core/subscribe.h @@ -1,6 +1,27 @@ #ifndef foosubscribehfoo #define foosubscribehfoo +/* $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 + USA. +***/ + #include "llist.h" #include "avahi.h" #include "subscribe.h" diff --git a/libavahi-core/timeeventq.c b/libavahi-core/timeeventq.c index fc84157..8ac1108 100644 --- a/libavahi-core/timeeventq.c +++ b/libavahi-core/timeeventq.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include "timeeventq.h" #include "util.h" diff --git a/libavahi-core/timeeventq.h b/libavahi-core/timeeventq.h index 69ff860..26ced90 100644 --- a/libavahi-core/timeeventq.h +++ b/libavahi-core/timeeventq.h @@ -1,6 +1,27 @@ #ifndef footimeeventqhfoo #define footimeeventqhfoo +/* $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 + USA. +***/ + typedef struct _AvahiTimeEventQueue AvahiTimeEventQueue; typedef struct _AvahiTimeEvent AvahiTimeEvent; diff --git a/libavahi-core/util.c b/libavahi-core/util.c index 270a48f..77afb78 100644 --- a/libavahi-core/util.c +++ b/libavahi-core/util.c @@ -1,3 +1,24 @@ +/* $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 + USA. +***/ + #include <string.h> #include <unistd.h> #include <fcntl.h> diff --git a/libavahi-core/util.h b/libavahi-core/util.h index 7755ee2..1186cc2 100644 --- a/libavahi-core/util.h +++ b/libavahi-core/util.h @@ -1,6 +1,27 @@ #ifndef fooutilhfoo #define fooutilhfoo +/* $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 + USA. +***/ + #include <glib.h> gchar *avahi_normalize_name(const gchar *s); /* g_free() the result! */ |