From 67b0d605554cc5d1836c6e112eb465d53e213330 Mon Sep 17 00:00:00 2001 From: Sebastien Estienne Date: Sun, 28 Aug 2005 22:09:02 +0000 Subject: * initial import git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@3 3be567f1-68ff-0310-b24a-ad7cc433fd2f --- AUTHORS | 2 + INSTALL | 1 + LICENSE | 340 +++++++++++++++++++++++++ Makefile.am | 8 + README | 13 + bootstrap.sh | 48 ++++ common/Makefile.am | 2 + common/python.m4 | 62 +++++ configure.ac | 28 ++ icons/Makefile.am | 9 + icons/_ftp._tcp.png | Bin 0 -> 1283 bytes icons/_http._tcp.png | Bin 0 -> 1580 bytes icons/_ipp._tcp.png | Bin 0 -> 1015 bytes icons/_ssh._tcp.png | Bin 0 -> 1077 bytes icons/_workstation._tcp.png | Bin 0 -> 887 bytes icons/service-discovery-applet-mini.png | Bin 0 -> 1615 bytes icons/service-discovery-applet.png | Bin 0 -> 4314 bytes scripts/Makefile.am | 7 + scripts/_ftp._tcp.sh | 16 ++ scripts/_http._tcp.sh | 16 ++ scripts/_ssh._tcp.sh | 29 +++ servers/GNOME_ServiceDiscoveryApplet.server.in | 30 +++ servers/Makefile.am | 12 + src/Makefile.am | 17 ++ src/service-discovery-applet.in | 219 ++++++++++++++++ 25 files changed, 859 insertions(+) create mode 100644 AUTHORS create mode 100644 INSTALL create mode 100644 LICENSE create mode 100644 Makefile.am create mode 100644 README create mode 100755 bootstrap.sh create mode 100644 common/Makefile.am create mode 100644 common/python.m4 create mode 100644 configure.ac create mode 100644 icons/Makefile.am create mode 100644 icons/_ftp._tcp.png create mode 100644 icons/_http._tcp.png create mode 100644 icons/_ipp._tcp.png create mode 100644 icons/_ssh._tcp.png create mode 100644 icons/_workstation._tcp.png create mode 100644 icons/service-discovery-applet-mini.png create mode 100644 icons/service-discovery-applet.png create mode 100644 scripts/Makefile.am create mode 100755 scripts/_ftp._tcp.sh create mode 100755 scripts/_http._tcp.sh create mode 100755 scripts/_ssh._tcp.sh create mode 100644 servers/GNOME_ServiceDiscoveryApplet.server.in create mode 100644 servers/Makefile.am create mode 100644 src/Makefile.am create mode 100755 src/service-discovery-applet.in diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..1190c4b --- /dev/null +++ b/AUTHORS @@ -0,0 +1,2 @@ +Sebastien Estienne +Based on code from Lennart Poettering diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..d476121 --- /dev/null +++ b/INSTALL @@ -0,0 +1 @@ +./configure --prefix=/usr && make && make install diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..5b6e7c6 --- /dev/null +++ b/LICENSE @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..b3ef3b1 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,8 @@ +SUBDIRS = \ + common \ + src \ + icons \ + scripts \ + servers + +EXTRA_DIST = README INSTALL AUTHORS diff --git a/README b/README new file mode 100644 index 0000000..696ce3d --- /dev/null +++ b/README @@ -0,0 +1,13 @@ +You should may have to log out, or restart gnome-panel before being able to use your new applet. + +You should test that the applet is functionning with the following command: +$ /usr/bin/service-discovery-applet -window +before trying to put it in your panel + +To add support for more service type, edit $(prefix)/bin/service-discovery-applet, and look the following variable: "type_browsed" + +To add actions when you click on a specified service, add a file in $(prefix)/share/service-discovery-applet/scripts, you must name it type.sh (eg: _ssh._tcp.sh), look at the included scripts to know how to access ADDRESS, PORT and TXT records. + +To add icons for services in the applet, just drop a png named TYPE.png (eg: _ssh._tcp.png) in $(prefix)/share/service-discovery-applet/icons + +All of this will be configurable from the GUI in the upcoming releases. diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100755 index 0000000..5ef6ae7 --- /dev/null +++ b/bootstrap.sh @@ -0,0 +1,48 @@ +#!/bin/sh + +# This file is part of service-discovery-applet (sd-applet). +# +# sd-applet 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. +# +# sd-applet 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 sd-applet; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +VERSION=1.9 + +run_versioned() { + local P + type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1" + + shift 2 + "$P" "$@" +} + +set -ex + +if [ "x$1" = "xam" ] ; then + run_versioned automake "$VERSION" -a -c --foreign + ./config.status +else + rm -rf autom4te.cache + rm -f config.cache + + run_versioned aclocal "$VERSION" -I common + libtoolize -c --force + autoheader + run_versioned automake "$VERSION" -a -c --foreign + autoconf -Wall + + ./configure "$@" + + make clean +fi diff --git a/common/Makefile.am b/common/Makefile.am new file mode 100644 index 0000000..1a1b950 --- /dev/null +++ b/common/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ + python.m4 diff --git a/common/python.m4 b/common/python.m4 new file mode 100644 index 0000000..e1c5266 --- /dev/null +++ b/common/python.m4 @@ -0,0 +1,62 @@ +## this one is commonly used with AM_PATH_PYTHONDIR ... +dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) +dnl Check if a module containing a given symbol is visible to python. +AC_DEFUN([AM_CHECK_PYMOD], +[AC_REQUIRE([AM_PATH_PYTHON]) +py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` +AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) +AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ +ifelse([$2],[], [prog=" +import sys +try: + import $1 +except ImportError: + sys.exit(1) +except: + sys.exit(0) +sys.exit(0)"], [prog=" +import $1 +$1.$2"]) +if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC + then + eval "py_cv_mod_$py_mod_var=yes" + else + eval "py_cv_mod_$py_mod_var=no" + fi +]) +py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` +if test "x$py_val" != xno; then + AC_MSG_RESULT(yes) + ifelse([$3], [],, [$3 +])dnl +else + AC_MSG_RESULT(no) + ifelse([$4], [],, [$4 +])dnl +fi +]) + +dnl a macro to check for ability to create python extensions +dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) +dnl function also defines PYTHON_INCLUDES +AC_DEFUN([AM_CHECK_PYTHON_HEADERS], +[AC_REQUIRE([AM_PATH_PYTHON]) +AC_MSG_CHECKING(for headers required to compile python extensions) +dnl deduce PYTHON_INCLUDES +py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" +fi +AC_SUBST(PYTHON_INCLUDES) +dnl check if the headers exist: +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +AC_TRY_CPP([#include ],dnl +[AC_MSG_RESULT(found) +$1],dnl +[AC_MSG_RESULT(not found) +$2]) +CPPFLAGS="$save_CPPFLAGS" +]) diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..8ca6659 --- /dev/null +++ b/configure.ac @@ -0,0 +1,28 @@ +AC_PREREQ(2.57) +AC_INIT([service-discovery-applet], [0.1], [sebastien (dot) estienne (at) gmail (dot) com]) +AC_CONFIG_SRCDIR([src/service-discovery-applet.in]) +AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) + +AM_MAINTAINER_MODE + +AM_PATH_PYTHON([2.4]) +AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module pygtk)]) +AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)]) +AM_CHECK_PYMOD(avahi,,,[AC_MSG_ERROR(Could not find Python module avahi)]) + +SCRIPTSDIR="${datadir}/${PACKAGE}/scripts/" +AC_SUBST(SCRIPTSDIR) +ICONSDIR="${datadir}/${PACKAGE}/icons/" +AC_SUBST(ICONSDIR) + + +AC_CONFIG_FILES([ + Makefile + common/Makefile + src/Makefile + icons/Makefile + scripts/Makefile + servers/Makefile +]) +AC_OUTPUT diff --git a/icons/Makefile.am b/icons/Makefile.am new file mode 100644 index 0000000..3ee98ee --- /dev/null +++ b/icons/Makefile.am @@ -0,0 +1,9 @@ +iconsdir = $(ICONSDIR) +icons_DATA = \ + _http._tcp.png \ + _ftp._tcp.png \ + _ssh._tcp.png \ + service-discovery-applet.png \ + service-discovery-applet-mini.png + +EXTRA_DIST = $(icons_DATA) diff --git a/icons/_ftp._tcp.png b/icons/_ftp._tcp.png new file mode 100644 index 0000000..05dbdd2 Binary files /dev/null and b/icons/_ftp._tcp.png differ diff --git a/icons/_http._tcp.png b/icons/_http._tcp.png new file mode 100644 index 0000000..a16d002 Binary files /dev/null and b/icons/_http._tcp.png differ diff --git a/icons/_ipp._tcp.png b/icons/_ipp._tcp.png new file mode 100644 index 0000000..dd814d6 Binary files /dev/null and b/icons/_ipp._tcp.png differ diff --git a/icons/_ssh._tcp.png b/icons/_ssh._tcp.png new file mode 100644 index 0000000..2fe2d14 Binary files /dev/null and b/icons/_ssh._tcp.png differ diff --git a/icons/_workstation._tcp.png b/icons/_workstation._tcp.png new file mode 100644 index 0000000..da2896e Binary files /dev/null and b/icons/_workstation._tcp.png differ diff --git a/icons/service-discovery-applet-mini.png b/icons/service-discovery-applet-mini.png new file mode 100644 index 0000000..bbda895 Binary files /dev/null and b/icons/service-discovery-applet-mini.png differ diff --git a/icons/service-discovery-applet.png b/icons/service-discovery-applet.png new file mode 100644 index 0000000..2876b96 Binary files /dev/null and b/icons/service-discovery-applet.png differ diff --git a/scripts/Makefile.am b/scripts/Makefile.am new file mode 100644 index 0000000..abf39ed --- /dev/null +++ b/scripts/Makefile.am @@ -0,0 +1,7 @@ +scriptsdir = $(SCRIPTSDIR) +scripts_SCRIPTS = \ + _http._tcp.sh \ + _ftp._tcp.sh \ + _ssh._tcp.sh + +EXTRA_DIST = $(scripts_SCRIPTS) diff --git a/scripts/_ftp._tcp.sh b/scripts/_ftp._tcp.sh new file mode 100755 index 0000000..4ff8006 --- /dev/null +++ b/scripts/_ftp._tcp.sh @@ -0,0 +1,16 @@ +#!/bin/sh +TYPE=`basename $0` +NAME=$1 +HOSTNAME=$2 +ADDRESS=$3 +PORT=$4 +TXTS=$5 + +for TXT in $TXTS +do + eval TXT_$TXT +done + +HANDLER=`echo $TYPE | cut -f 1 -d "." | cut -f 2 -d "_"` + +gnome-open "$HANDLER://$ADDRESS:$PORT/$TXT_path" diff --git a/scripts/_http._tcp.sh b/scripts/_http._tcp.sh new file mode 100755 index 0000000..4ff8006 --- /dev/null +++ b/scripts/_http._tcp.sh @@ -0,0 +1,16 @@ +#!/bin/sh +TYPE=`basename $0` +NAME=$1 +HOSTNAME=$2 +ADDRESS=$3 +PORT=$4 +TXTS=$5 + +for TXT in $TXTS +do + eval TXT_$TXT +done + +HANDLER=`echo $TYPE | cut -f 1 -d "." | cut -f 2 -d "_"` + +gnome-open "$HANDLER://$ADDRESS:$PORT/$TXT_path" diff --git a/scripts/_ssh._tcp.sh b/scripts/_ssh._tcp.sh new file mode 100755 index 0000000..892d354 --- /dev/null +++ b/scripts/_ssh._tcp.sh @@ -0,0 +1,29 @@ +#!/bin/sh +NAME=$1 +HOSTNAME=$2 +ADDRESS=$3 +PORT=$4 +TXTS=$5 + +for TXT in $TXTS +do + eval TXT_$TXT +done + +if [ ! -z "$TXT_u" ] +then + USER_NAME="-l $TXT_u" +else + USER_NAME=`zenity --entry --text "Login :"` + if [ ! -z "$USER_NAME" ] + then + USER_NAME="-l $USER_NAME" + fi +fi + +if [ ! -z $PORT ] +then + PORT="-p $PORT" +fi + +gnome-terminal --tab -t "$NAME" -e "ssh $USER_NAME $PORT $ADDRESS" diff --git a/servers/GNOME_ServiceDiscoveryApplet.server.in b/servers/GNOME_ServiceDiscoveryApplet.server.in new file mode 100644 index 0000000..5db309a --- /dev/null +++ b/servers/GNOME_ServiceDiscoveryApplet.server.in @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/servers/Makefile.am b/servers/Makefile.am new file mode 100644 index 0000000..55986c0 --- /dev/null +++ b/servers/Makefile.am @@ -0,0 +1,12 @@ +serversdir = $(libdir)/bonobo/servers/ +servers_DATA = GNOME_ServiceDiscoveryApplet.server + +GNOME_ServiceDiscoveryApplet.server: GNOME_ServiceDiscoveryApplet.server.in + sed \ + -e 's,@bindir\@,$(bindir),g' \ + -e 's,@iconsdir\@,$(ICONSDIR),g' \ + $< > $@ + +EXTRA_DIST = GNOME_ServiceDiscoveryApplet.server.in + +CLEANFILES = $(servers_DATA) diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..3e6695a --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,17 @@ +pythonscripts = \ + service-discovery-applet + +EXTRA_DIST = \ + service-discovery-applet.in + +bin_SCRIPTS = $(pythonscripts) + +service-discovery-applet: service-discovery-applet.in + sed \ + -e 's,@PYTHON\@,$(PYTHON),g' \ + -e 's,@iconsdir\@,$(ICONSDIR),g' \ + -e 's,@scriptsdir\@,$(SCRIPTSDIR),g' \ + $< > $@ + chmod +x $@ + +CLEANFILES = $(pythonscripts) diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in new file mode 100755 index 0000000..171f8c0 --- /dev/null +++ b/src/service-discovery-applet.in @@ -0,0 +1,219 @@ +#!@PYTHON@ + +# This file is part of service-discovery-applet (sd-applet). +# +# sd-applet 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. +# +# sd-applet 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 sd-applet; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# todo +# * memleaks ? +# * dict([el.split('=',1) for el in l ]) + +import os +import sys +import pygtk +pygtk.require('2.0') + +try: + import avahi, gobject, dbus +except ImportError: + print "Sorry, to use this tool you need to install Avahi, pygtk and python-dbus." + sys.exit(1) + +try: + import dbus.glib +except ImportError, e: + pass + +import gtk +import gnomeapplet +import gnome + +domain = None + +type_browsed = ('_ssh._tcp', '_http._tcp','_ftp._tcp') + +service_browsers = {} +service_menu = gtk.Menu() +zc_types = {} +zc_services = {} +zc_pretty_name = {'_ssh._tcp' : 'SSH Servers', + '_http._tcp' : 'Web Servers', + '_ftp._tcp' : 'Ftp Servers', + '_workstation._tcp': 'Workstations' + } + + + +def siocgifname(interface): + global server + + if interface <= 0: + return "any" + else: + return server.GetNetworkInterfaceNameByIndex(interface) + +def service_resolved(interface, protocol, name, type, domain, host, aprotocol, address, port, txt): + print "Service data for service '%s' of type '%s' in domain '%s' on %s.%i:" % (name, type, domain, siocgifname(interface), protocol) + print "\tHost %s (%s), port %i, TXT data: %s" % (host, address, port, avahi.txt_array_to_string_array(txt)) + cmd = '@scriptsdir@/%s.sh "%s" %s %s %i "%s"' % (type, name, host, address, port," ".join(avahi.txt_array_to_string_array(txt))) + os.system(cmd) +# if type == "_http._tcp": +# +# url = "http://%s:%i" % (address,port) +# gnome.url_show(url) +# else: +# os.system(cmd) + # FIXME: text if the script exist + +def print_error(err): + print "Error:", str(err) + +def menuitem_response(widget, interface, protocol, name, type, domain): + server.ResolveService(interface, protocol, name, type, domain, avahi.PROTO_UNSPEC, reply_handler=service_resolved, error_handler=print_error) + +def new_service(interface, protocol, name, type, domain): + global server, service_menu, zc_types, zc_pretty_name, zc_services + + print "Found service '%s' of type '%s' in domain '%s' on %s.%i." % (name, type, domain, siocgifname(interface), protocol) + + if zc_types.has_key(type) == False: + menuitem = gtk.ImageMenuItem() + if zc_pretty_name.has_key(type): + menuitem.add(gtk.Label(zc_pretty_name[type])) + img = gtk.Image() + iconfile = "@iconsdir@/%s.png" % (type) + img.set_from_file(iconfile) + menuitem.set_image(img) + else: + menuitem.add(gtk.Label(type)) + + service_menu.add(menuitem) + zc_types[type] = gtk.Menu() + menuitem.set_submenu(zc_types[type]) + menuitem.show_all() + + menuitem = gtk.MenuItem(name) + zc_types[type].add(menuitem) + zc_services[(interface, protocol, name, type, domain)] = menuitem + menuitem.connect("activate", menuitem_response,interface, protocol, name, type, domain) + menuitem.show_all() + + # Asynchronous resolving + #server.ResolveService(interface, protocol, name, type, domain, avahi.PROTO_UNSPEC, reply_handler=service_resolved, error_handler=print_error) + +def remove_service(interface, protocol, name, type, domain): + global zc_services + + print "Service '%s' of type '%s' in domain '%s' on %s.%i disappeared." % (name, type, domain, siocgifname(interface), protocol) + + zc_types[type].remove(zc_services[(interface, protocol, name, type, domain)]) + + if zc_types[type].get_children() == []: + service_menu.remove(zc_types[type].get_attach_widget()) + del zc_types[type] + +def new_service_type(interface, protocol, type, domain): + global server, service_browsers + + # Are we already browsing this domain for this type? + if service_browsers.has_key((interface, protocol, type, domain)): + return + + print "Browsing for services of type '%s' in domain '%s' on %s.%i ..." % (type, domain, siocgifname(interface), protocol) + + b = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.ServiceBrowserNew(interface, protocol, type, domain)), avahi.DBUS_INTERFACE_SERVICE_BROWSER) + b.connect_to_signal('ItemNew', new_service) + b.connect_to_signal('ItemRemove', remove_service) + + service_browsers[(interface, protocol, type, domain)] = b + +def browse_domain(interface, protocol, domain): + global server + + # Are we already browsing this domain? + for type in type_browsed: + new_service_type(interface, protocol, type, domain) + +def new_domain(interface, protocol, domain): + # We browse for .local anyway... + if domain != "local": + browse_domain(interface, protocol, domain) + + +bus = dbus.SystemBus() +server = dbus.Interface(bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER) + +if domain is None: + # Explicitly browse .local + browse_domain(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "local") + + # Browse for other browsable domains + db = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.DomainBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "", avahi.DOMAIN_BROWSER_BROWSE)), avahi.DBUS_INTERFACE_DOMAIN_BROWSER) + db.connect_to_signal('ItemNew', new_domain) + +else: + # Just browse the domain the user wants us to browse + browse_domain(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, domain) + +def on_menubar_click(widget, event): + # allow Middle- and Right-Mouse-Button to go through to the applet window + if event.button != 1: + widget.emit_stop_by_name("button-press-event") + + return False + + +def ServiceDiscoveryApplet_factory(applet, iid): + global menuZC + print "Creating new applet instance" + menubar = gtk.MenuBar() + menubar.connect("button-press-event", on_menubar_click) + + menuZC = gtk.ImageMenuItem() + menuZC.add(gtk.Label('ZeroConf')) + img = gtk.Image() + img.set_from_file("@iconsdir@/service-discovery-applet-mini.png") + menuZC.set_image(img) + menuZC.set_right_justified(True) + menubar.add(menuZC) + menuZC.set_submenu(service_menu); + menuZC.show_all() + + + applet.add(menubar) + applet.show_all() + return True + + + +print "Starting factory" +if __name__ == '__main__': + if len(sys.argv) == 2 and sys.argv[1] == "-window": + main_window = gtk.Window(gtk.WINDOW_TOPLEVEL) + main_window.set_title("Service discovery applet") + main_window.connect("destroy", gtk.main_quit) + app = gnomeapplet.Applet() + ServiceDiscoveryApplet_factory(app, None) + app.reparent(main_window) + main_window.show_all() + gtk.main() + sys.exit() + else: + gnomeapplet.bonobo_factory("OAFIID:GNOME_ServiceDiscoveryApplet_Factory", + gnomeapplet.Applet.__gtype__, + "Service discovery applet", "0", ServiceDiscoveryApplet_factory) + +print "Factory ended" -- cgit