From c0196ca744142869fe81e609f156c610eebdcb9b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 25 Jun 2006 13:34:15 +0000 Subject: add PulseAudio service types git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1228 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- service-type-database/service-types | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'service-type-database') diff --git a/service-type-database/service-types b/service-type-database/service-types index 24f4d6a..2602b3f 100644 --- a/service-type-database/service-types +++ b/service-type-database/service-types @@ -109,3 +109,8 @@ _dpap._tcp:Digital Photo Sharing _skype._tcp:Skype VoIP _airport._tcp:Apple AirPort + +_pulse-server._tcp:PulseAudio Sound Server +_pulse-sink._tcp:PulseAudio Sound Sink +_pulse-source._tcp:PulseAudio Sound Source + -- cgit From b200e9bab1ec8a398e07d4e3dc7698aa8b84bc6a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 6 Jul 2006 02:02:47 +0000 Subject: * add two more service types to database (closes #47) git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1231 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- service-type-database/service-types | 2 ++ 1 file changed, 2 insertions(+) (limited to 'service-type-database') diff --git a/service-type-database/service-types b/service-type-database/service-types index 2602b3f..adfe5c7 100644 --- a/service-type-database/service-types +++ b/service-type-database/service-types @@ -114,3 +114,5 @@ _pulse-server._tcp:PulseAudio Sound Server _pulse-sink._tcp:PulseAudio Sound Sink _pulse-source._tcp:PulseAudio Sound Source +_mpd._tcp:Music Player Daemon +_smb._tcp:Microsoft Windows Network -- cgit From b7d566fc3ec60c0fbbca22af273bc67fdc1372fa Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 6 Aug 2006 11:54:31 +0000 Subject: Allow storing the service type database as Solaris DBM file, alternatively to gdbm. The latter is still recommended. (Patch from Padraig O'Briain) git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1245 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- service-type-database/Makefile.am | 19 ++++++++++++++++++- service-type-database/build-db.in | 4 ++-- 2 files changed, 20 insertions(+), 3 deletions(-) (limited to 'service-type-database') diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am index 3250e94..1692a0b 100644 --- a/service-type-database/Makefile.am +++ b/service-type-database/Makefile.am @@ -28,7 +28,8 @@ noinst_SCRIPTS=build-db pkgdata_DATA+=service-types.db build-db: build-db.in - sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@ + sed -e 's,@PYTHON\@,$(PYTHON),g' \ + -e 's,@DBM\@,gdbm,g' $< > $@ chmod +x $@ service-types.db: service-types build-db @@ -36,5 +37,21 @@ service-types.db: service-types build-db CLEANFILES = service-types.db build-db +endif +if HAVE_DBM + +noinst_SCRIPTS=build-db +pkgdata_DATA+=service-types.db.* + +build-db: build-db.in + sed -e 's,@PYTHON\@,$(PYTHON),g' \ + -e 's,@DBM\@,dbm,g' $< > $@ + chmod +x $@ + +service-types.db: service-types build-db + $(PYTHON) build-db $(srcdir)/$< $@ + +CLEANFILES = service-types.db* build-db + endif endif diff --git a/service-type-database/build-db.in b/service-type-database/build-db.in index 21d057d..44f6068 100755 --- a/service-type-database/build-db.in +++ b/service-type-database/build-db.in @@ -19,7 +19,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. -import gdbm, sys +import @DBM@, sys if len(sys.argv) > 1: infn = sys.argv[1] @@ -31,7 +31,7 @@ if len(sys.argv) > 2: else: outfn = infn + ".db" -db = gdbm.open(outfn, "n") +db = @DBM@.open(outfn, "n") for ln in file(infn, "r"): ln = ln.strip(" \r\n\t") -- cgit From 4287a521ead9fca175c5f01594288d87433c7f77 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 31 Aug 2006 15:14:22 +0000 Subject: fix service type database creation on solaris git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1293 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- service-type-database/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'service-type-database') diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am index 1692a0b..d25f1a2 100644 --- a/service-type-database/Makefile.am +++ b/service-type-database/Makefile.am @@ -41,13 +41,15 @@ endif if HAVE_DBM noinst_SCRIPTS=build-db -pkgdata_DATA+=service-types.db.* +pkgdata_DATA+=service-types.db.pag service-types.db.dir build-db: build-db.in sed -e 's,@PYTHON\@,$(PYTHON),g' \ -e 's,@DBM\@,dbm,g' $< > $@ chmod +x $@ +service-types.db.pag: service-types.db +service-types.db.dir: service-types.db service-types.db: service-types build-db $(PYTHON) build-db $(srcdir)/$< $@ -- cgit From 461b588593cdc69f09901d2aa22b5f5f7021e706 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 12 Sep 2006 13:22:56 +0000 Subject: add pgp key server service type to database git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1321 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- service-type-database/service-types | 2 ++ 1 file changed, 2 insertions(+) (limited to 'service-type-database') diff --git a/service-type-database/service-types b/service-type-database/service-types index adfe5c7..e3db1a6 100644 --- a/service-type-database/service-types +++ b/service-type-database/service-types @@ -116,3 +116,5 @@ _pulse-source._tcp:PulseAudio Sound Source _mpd._tcp:Music Player Daemon _smb._tcp:Microsoft Windows Network + +_pgpkey-hkp._tcp:GnuPG/PGP HKP Key Server -- cgit From 0bd9a88889c5d4c2ad0bd150e7584cc3f99d1116 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 12 Sep 2006 13:49:37 +0000 Subject: add a few additional service types to database git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1322 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- service-type-database/service-types | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'service-type-database') diff --git a/service-type-database/service-types b/service-type-database/service-types index e3db1a6..b96385b 100644 --- a/service-type-database/service-types +++ b/service-type-database/service-types @@ -118,3 +118,19 @@ _mpd._tcp:Music Player Daemon _smb._tcp:Microsoft Windows Network _pgpkey-hkp._tcp:GnuPG/PGP HKP Key Server + +_ldap._tcp:LDAP Directory Server + +_iax._udp:Asterisk Exchange + +_nfs._tcp:Network File System + +_ntp._udp:NTP Time Server + +_raop._tcp:AirTunes Remote Audio + +_rtsp._tcp:RTSP Realtime Streaming Server +_rtp._tcp:RTP Realtime Streaming Server + +_svn._tcp:Subversion Revision Control + -- cgit From 6702120361ffb2efdf33d94c520643c51ef4a920 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 12 Sep 2006 13:58:17 +0000 Subject: minor rtp name fix git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1323 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- service-type-database/service-types | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'service-type-database') diff --git a/service-type-database/service-types b/service-type-database/service-types index b96385b..e501072 100644 --- a/service-type-database/service-types +++ b/service-type-database/service-types @@ -130,7 +130,7 @@ _ntp._udp:NTP Time Server _raop._tcp:AirTunes Remote Audio _rtsp._tcp:RTSP Realtime Streaming Server -_rtp._tcp:RTP Realtime Streaming Server +_rtp._udp:RTP Realtime Streaming Server _svn._tcp:Subversion Revision Control -- cgit From e1f8567419b1f64992ec0cb62acb9baf67efc862 Mon Sep 17 00:00:00 2001 From: Trent Lloyd Date: Sun, 21 Jan 2007 10:28:59 +0000 Subject: * Add OLPC Presence service to the service-type-database git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1376 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- service-type-database/service-types | 1 + 1 file changed, 1 insertion(+) (limited to 'service-type-database') diff --git a/service-type-database/service-types b/service-type-database/service-types index e501072..2597f0f 100644 --- a/service-type-database/service-types +++ b/service-type-database/service-types @@ -134,3 +134,4 @@ _rtp._udp:RTP Realtime Streaming Server _svn._tcp:Subversion Revision Control +_presence_olpc._tcp:OLPC Presence -- cgit From 55a3fa30f9c3b4efcf8cf92e8ec17e4e05a3081e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 4 Feb 2007 11:39:06 +0000 Subject: fix build of the service-type-database if srcdir != builddir (Closes #100) git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1380 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- service-type-database/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'service-type-database') diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am index d25f1a2..4e0c9f8 100644 --- a/service-type-database/Makefile.am +++ b/service-type-database/Makefile.am @@ -33,7 +33,8 @@ build-db: build-db.in chmod +x $@ service-types.db: service-types build-db - $(PYTHON) build-db $(srcdir)/$< $@ + $(PYTHON) build-db $< $@.coming + mv $@.coming $@ CLEANFILES = service-types.db build-db @@ -51,7 +52,8 @@ build-db: build-db.in service-types.db.pag: service-types.db service-types.db.dir: service-types.db service-types.db: service-types build-db - $(PYTHON) build-db $(srcdir)/$< $@ + $(PYTHON) build-db $< $@.coming + mv $@.coming $@ CLEANFILES = service-types.db* build-db -- cgit From 886fb074c77deb458ec387a385fde71f7c80dc13 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 8 Feb 2007 11:33:36 +0000 Subject: Fix service type database building on Solaris (Patch from Padraig O'Briain) git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1394 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- service-type-database/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'service-type-database') diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am index 4e0c9f8..c41dc70 100644 --- a/service-type-database/Makefile.am +++ b/service-type-database/Makefile.am @@ -50,10 +50,12 @@ build-db: build-db.in chmod +x $@ service-types.db.pag: service-types.db + mv service-types.db.coming.pag service-types.db.pag service-types.db.dir: service-types.db + mv service-types.db.coming.dir service-types.db.dir service-types.db: service-types build-db $(PYTHON) build-db $< $@.coming - mv $@.coming $@ + if test -f "$@.coming"; then mv $@.coming $@; fi CLEANFILES = service-types.db* build-db -- cgit From 67fbf0449d3558209e5758811de4506f689badb8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 12 Apr 2007 20:48:28 +0000 Subject: add apt to services types, pacth from "uws". (closes #116) git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1406 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- service-type-database/service-types | 3 +++ 1 file changed, 3 insertions(+) (limited to 'service-type-database') diff --git a/service-type-database/service-types b/service-type-database/service-types index 2597f0f..45b4b18 100644 --- a/service-type-database/service-types +++ b/service-type-database/service-types @@ -135,3 +135,6 @@ _rtp._udp:RTP Realtime Streaming Server _svn._tcp:Subversion Revision Control _presence_olpc._tcp:OLPC Presence + +_apt._tcp:APT Package Repository + -- cgit From 439372fb4361b45da1cb8a292f3f67187c7b79a5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 12 Apr 2007 21:35:59 +0000 Subject: rework service database, pacth from uws (closes #117) git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1412 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- service-type-database/service-types | 130 +++++++++++++++++++++++------------- 1 file changed, 83 insertions(+), 47 deletions(-) (limited to 'service-type-database') diff --git a/service-type-database/service-types b/service-type-database/service-types index 45b4b18..6ede09d 100644 --- a/service-type-database/service-types +++ b/service-type-database/service-types @@ -30,32 +30,56 @@ ### documentation. If you're looking for the correct service type to ### use for your application please refer to the URL mentioned above. + +# Devices + +_workstation._tcp:Workstation +_workstation._tcp[de]:Arbeitsplatzrechner + + +# Web + _http._tcp:Web Site _http._tcp[de]:Web-Angebot _https._tcp:Secure Web Site _https._tcp[de]:Sicheres Web-Angebot +_rss._tcp:Web Syndication RSS + + +# Network + +_domain._udp:DNS Server +_domain._udp[de]: DNS-Dienst + +_ntp._udp:NTP Time Server + +_smb._tcp:Microsoft Windows Network + +_airport._tcp:Apple AirPort + + +# File and data access + _ftp._tcp:FTP File Transfer -_ftp._tcp[de]:FTP Dateifreigabe +_ftp._tcp[de]:FTP-Dateifreigabe -_h323._tcp:H.323 Telephony -_h323._tcp[de]:H.323 Telefonie +_webdav._tcp:WebDAV File Share -_sip._udp:SIP Telephony -_sip._udp[de]:SIP Telefonie +_webdavs._tcp:Secure WebDAV File Share -_ssh._tcp:SSH Remote Terminal -_ssh._tcp[de]:SSH Fernzugriff +_afpovertcp._tcp:Apple File Sharing -_distcc._tcp:Distributed Compiler -_distcc._tcp[de]:Verteilter Compiler +_nfs._tcp:Network File System -_daap._tcp:iTunes Audio Access -_daap._tcp[de]:iTunes Audio-Zugriff +_apt._tcp:APT Package Repository -_domain._udp:DNS Server -_domain._udp[de]: DNS Dienst + +# Remote access + +_ssh._tcp:SSH Remote Terminal +_ssh._tcp[de]:SSH-Fernzugriff _imap._tcp:IMAP Mail Access @@ -67,74 +91,86 @@ _sftp-ssh._tcp:SFTP File Transfer _telnet._tcp:Telnet Remote Terminal -_presence._tcp:iChat Presence +_timbuktu._tcp:Timbuktu Remote Desktop Control -_webdav._tcp:WebDAV File Share -_webdavs._tcp:Secure WebDAV File Share - -_workstation._tcp:Workstation -_workstation._tcp[de]:Arbeitsplatzrechner +# Printing _printer._tcp:UNIX Printer -_afpovertcp._tcp:Apple File Sharing - _pdl-datastream._tcp:PDL Printer _ipp._tcp:Internet Printer -_rss._tcp:Web Syndication RSS + +# Multimedia + +_daap._tcp:iTunes Audio Access +_daap._tcp[de]:iTunes Audio-Zugriff _dacp._tcp:iTunes Remote Control _realplayfavs._tcp:RealPlayer Shared Favorites -_timbuktu._tcp:Timbuktu Remote Desktop Control +_raop._tcp:AirTunes Remote Audio -_see._tcp:SubEthaEdit Collaborative Text Editor +_rtsp._tcp:RTSP Realtime Streaming Server +_rtp._udp:RTP Realtime Streaming Server -_postgresql._tcp:PostgreSQL Server +_dpap._tcp:Digital Photo Sharing -_ksysguard._tcp:KDE System Guard +_pulse-server._tcp:PulseAudio Sound Server +_pulse-sink._tcp:PulseAudio Sound Sink +_pulse-source._tcp:PulseAudio Sound Source -_omni-bookmark._tcp:OmniWeb Bookmark Sharing +_mpd._tcp:Music Player Daemon -_MacOSXDupSuppress._tcp:MacOS X Duplicate Machine Suppression -_lobby._tcp:Gobby Collaborative Editor Session +# Communication, presence, working together -_dpap._tcp:Digital Photo Sharing +_presence._tcp:iChat Presence -_skype._tcp:Skype VoIP +_sip._udp:SIP Telephony +_sip._udp[de]:SIP-Telefonie -_airport._tcp:Apple AirPort +_h323._tcp:H.323 Telephony +_h323._tcp[de]:H.323-Telefonie -_pulse-server._tcp:PulseAudio Sound Server -_pulse-sink._tcp:PulseAudio Sound Sink -_pulse-source._tcp:PulseAudio Sound Source +_presence_olpc._tcp:OLPC Presence -_mpd._tcp:Music Player Daemon -_smb._tcp:Microsoft Windows Network +_iax._udp:Asterisk Exchange -_pgpkey-hkp._tcp:GnuPG/PGP HKP Key Server +_skype._tcp:Skype VoIP -_ldap._tcp:LDAP Directory Server +_see._tcp:SubEthaEdit Collaborative Text Editor -_iax._udp:Asterisk Exchange +_lobby._tcp:Gobby Collaborative Editor Session -_nfs._tcp:Network File System -_ntp._udp:NTP Time Server +# Databases -_raop._tcp:AirTunes Remote Audio +_postgresql._tcp:PostgreSQL Server -_rtsp._tcp:RTSP Realtime Streaming Server -_rtp._udp:RTP Realtime Streaming Server + +# Development _svn._tcp:Subversion Revision Control -_presence_olpc._tcp:OLPC Presence +_distcc._tcp:Distributed Compiler +_distcc._tcp[de]:Verteilter Compiler -_apt._tcp:APT Package Repository +# Vendor specific + +_MacOSXDupSuppress._tcp:MacOS X Duplicate Machine Suppression + +_ksysguard._tcp:KDE System Guard + +_omni-bookmark._tcp:OmniWeb Bookmark Sharing + + +# Other + +_pgpkey-hkp._tcp:GnuPG/PGP HKP Key Server + +_ldap._tcp:LDAP Directory Server -- cgit