diff options
| -rw-r--r-- | avahi-autoipd/main.c | 4 | ||||
| -rw-r--r-- | avahi-ui/.gitignore | 2 | ||||
| -rw-r--r-- | avahi-ui/Makefile.am | 12 | ||||
| -rw-r--r-- | avahi-ui/bssh.desktop.in.in (renamed from avahi-ui/bssh.desktop.in) | 0 | ||||
| -rw-r--r-- | avahi-ui/bvnc.desktop.in.in (renamed from avahi-ui/bvnc.desktop.in) | 0 | ||||
| -rw-r--r-- | service-type-database/service-types | 3 |
6 files changed, 17 insertions, 4 deletions
diff --git a/avahi-autoipd/main.c b/avahi-autoipd/main.c index 01ccc79..ef529b9 100644 --- a/avahi-autoipd/main.c +++ b/avahi-autoipd/main.c @@ -1144,9 +1144,13 @@ static int loop(int iface, uint32_t addr) { for (i = 0; i < ETHER_ADDRLEN; i++) a += hw_address[i]*i; + a = (a % 0xFE00) + 0x0100; + addr = htonl(IPV4LL_NETWORK | (uint32_t) a); } + assert(is_ll_address(addr)); + set_state(st, 1, addr); daemon_log(LOG_INFO, "Starting with address %s", inet_ntop(AF_INET, &addr, buf, sizeof(buf))); diff --git a/avahi-ui/.gitignore b/avahi-ui/.gitignore index 9d9493a..b942010 100644 --- a/avahi-ui/.gitignore +++ b/avahi-ui/.gitignore @@ -2,6 +2,8 @@ bssh bvnc bssh.desktop bvnc.desktop +bssh.desktop.in +bvnc.desktop.in *.o *.lo *.la diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am index 2d687ed..910dc6b 100644 --- a/avahi-ui/Makefile.am +++ b/avahi-ui/Makefile.am @@ -24,8 +24,10 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' desktopdir = $(datadir)/applications desktop_DATA = +desktop_DATA_in = $(desktop_DATA_in_in:.in.in=.in) +desktop_DATA_in_in = bssh.desktop.in.in bvnc.desktop.in.in -EXTRA_DIST = bssh.desktop.in bvnc.desktop.in +EXTRA_DIST = $(desktop_DATA_in_in) if HAVE_GTK @@ -70,14 +72,16 @@ install-exec-local: $(LN_S) bssh bvnc && \ $(LN_S) bssh bshell -bssh.desktop: bssh.desktop.in +bssh.desktop.in: bssh.desktop.in.in sed -e 's,@bindir\@,$(bindir),g' $< > $@ -bvnc.desktop: bvnc.desktop.in +bvnc.desktop.in: bvnc.desktop.in.in sed -e 's,@bindir\@,$(bindir),g' $< > $@ endif # HAVE_GLIB endif endif -CLEANFILES = $(desktop_DATA) +@INTLTOOL_DESKTOP_RULE@ + +CLEANFILES = $(desktop_DATA) $(desktop_DATA_in) diff --git a/avahi-ui/bssh.desktop.in b/avahi-ui/bssh.desktop.in.in index 69f56b6..69f56b6 100644 --- a/avahi-ui/bssh.desktop.in +++ b/avahi-ui/bssh.desktop.in.in diff --git a/avahi-ui/bvnc.desktop.in b/avahi-ui/bvnc.desktop.in.in index 799c7d2..799c7d2 100644 --- a/avahi-ui/bvnc.desktop.in +++ b/avahi-ui/bvnc.desktop.in.in diff --git a/service-type-database/service-types b/service-type-database/service-types index 7456a6e..97e6858 100644 --- a/service-type-database/service-types +++ b/service-type-database/service-types @@ -149,6 +149,9 @@ _pulse-source._tcp:PulseAudio Sound Source _mpd._tcp:Music Player Daemon +# DAAP share provided by iTunes on behalf of an iPod Touch +_touch-able._tcp:iPod Touch Music Library + _vlc-http._tcp:VLC Streaming |