diff --git a/wmifs/BUGS b/wmifs/BUGS new file mode 100644 index 0000000..c6ee010 --- /dev/null +++ b/wmifs/BUGS @@ -0,0 +1,76 @@ +Known 'features and easter eggs' in WMiFS, +(or in non M$ talk, BUGS). + +WMiFS-1.3b +------------------------------------------------------------- + * First initial BETA release, WMiFS is now a separate + package, due to the mayor rewrite, there probably + will be some ;-) + + +WMPPP/WMiFS 1.2p1 +-------------------------------------------------------------- + + * WMPPP: The -t parameter dumps core on some systems, + we're looking into this. + * WMPPP: SEGV when running it as user (reported once) + we can't reproduce it here, but we're looking + into this. + * WMPPP: "ifdown:" gets executed when pressing V button, + (reported once), we also can't reproduce this + one, but we're looking into this. + * WMPPP: ppp0 is still hardcoded (sigh), will be fixed. + * WMiFS: SEGV with the dummy interface, we're looking + into this (needs to be ignored like lo). + * WMiFS: Manages to get X CPU usage way to high on + some systems somehow (reported myself) :) + + * Special thanks to Marcelo + for providing some real usefull patches for WMPPP, + they will be in the next update for sure! + + +WMPPP/WMiFS 1.2 +-------------------------------------------------------------- + + * The pixmap 'shift' in AfterStep's Wharf seems + not to be our fault, but a bug in Wharf! + + Please notify the authors of AfterStep about + this if you like to see this fixed, Wharf can't + handle pixmaps that are larger than 60x60 pixels + very well :( + + * Most code is yet again quite rewritten, but we + think all previous annoyances are gone now ;-) + +Note: The configuration GUI is no longer supported, +everything is done with user definable .rc files +now, so we've scrapped it from the BUG list + + +WMPPP/WMiFS 1.1 +-------------------------------------------------------------- + + * most of the below bugs are dealth with + and/or made obsolete with 1.1. + * None 'known' bugs for 1.1 so far ;-) + +WMPPP 1.0 +-------------------------------------------------------------- + + * wmppp-start has to be in /etc/ppp + * wmppp-stop has to be in /etc/ppp + * only ppp0 will be read + * the leds won't be reliable with + more than 1 ppp connection + * there is an iconwin, and win variable. + I have no clue why only win shouldn't + be enough. Will check it out later. + * The afterstep wharf seems to shift the + pixmap a bit. Don't know how and why. + It works perfectly with WindowManager :) + * the configuration GUI doesn't return + configured values from /etc/ppp/options + yet, when you start the configuration + GUI it presents the default parameters. diff --git a/wmifs/CHANGES b/wmifs/CHANGES new file mode 100644 index 0000000..cdf6b30 --- /dev/null +++ b/wmifs/CHANGES @@ -0,0 +1,148 @@ +Version Description +-------------------------------------------------------------- +1.3b * Released 980513 + + * Splitted up WMPPP and WMiFS into separate programs. + + * WMiFS now uses our 'newstyle' shared dockapps code, + it's quite rewritten again. + + * WMiFS now reads /proc/dev/net instead of /proc/net/route. + + * Changed the RC file parsing and handling again. + + * Now ignores DUMMY interface too :) + + * Fixed the 'Zombie' bug :) + + * Better 'execvp' code :) + + * Vastly reduced X CPU usage :) + + +1.2p1 * Released 980502 + + * Updated the docs, sorry, we forgot to update some + of them, due to some last minute changes in the code + the docs where incorrect on some parts (systemrc). + + * Updated the Makefile because the systemrc files + went to the wrong location (due to above changes). + + * Updated the WMPPP rc files, again, due to some last + minute changes in the code, WMPPP's rc files where + no longer working properly. + + +1.2 * Released 980429 + + * Completely revamped the WMPPP & WMiFS GUI :) + + * Added 'forceleft, forcemiddle and forceright' + options in WMiFS for 'real' multiuser systems, + when 'force*' is detected in /etc/wmifsrc the + user settings in ~/.wmifsrc are overridden + (usefull for sites where users may not fiddle + with pppd's options :) + + * WMPPP: Ditto, added 'force' facility here too + + * WMPPP: now correctly redisplays time when killed + and restarted + + * WMPPP: timer now starts to run when the actual + connection is made + + * WMPPP: added BAUD CONNECT value display + + * WMPPP: added 'getmodemspeed', a SUID proggie to + read the CONNECT value from /var/log/messages + + * WMPPP: dropped the config GUI and added an + .wmppprc file instead > motivation to do so: + this way, WMPPP is much more platform and + distribution independant :) + + * WMPPP: enhanced the status LED, yellow means + dialing, green means online, red means error + + * WMPPP: added -display commandline option + + * WMPPP: added -t commandline option, default + the timer will display HH:MM, -t will display + MM:SS and switch to HH:MM after 60 minutes + + * WMiFS: added support for all interfaces in + /proc/net/, now all interfaces are supported :) + + * WMiFS: added -display commandline option + + * WMiFS: added -w commandline option, this will + draw the graph in our new 'waveform' look :) + + * WMiFS: fixed the coredump problems that occured + on some systems with or without .wmifsrc file + typo's, errors, etc. in the .wmifsrc file are + now also being ignored/rejected, the worst + thing that can happen now is that the scripts + do not execute (i.e. luser error) ;-) + + * WMiFS: when monitoring a ppp interface, bytes + are used to draw the graph, otherwise packets + + * WMiFS: made the RX/TX/Status LED box identical + to the one in WMPPP, the right LED is the status + LED, green means interface is working, red means + error (interface down, NIC broken, etc.) + + +1.1 - Released 980407 + - Added WMiFS, the no button more stats version + - All ppp/eth load graphs are now autoscaling + - Autosensing of all active ppp/eth interfaces + - 99 hours --> 00 hours is now okay + - Now detects already running WMPPP(s) + - WMIFS has 'mousebutton' script launch support + - Now reads pppsocket instead of /proc/dev/net + - WMIFS reads ~/.wmifsrc (optional) + +1.0 - Released 980315 + - Total rewrite of WMPPP-1.0pre2 + - WMPPP dock.app again redesigned + improved timer display readability + Some code cleanups + +1.0pre7 - Not released, developers release + Started writing documentation + Enhanced Makefile + Bugfixes + +1.0pre6 - Not released, developers release + Redesigned WMPPP's dock.app GUI + Added failsave Yes/No disconnect + requester + Some code cleaning + Configuration GUI is ready + +1.0pre5 - Not released, developers release + Bugfixes + Enhanced configuration GUI + +1.0pre4 - Not released, developers release + Bugfixes + Enhanced configuration GUI + +1.0pre3 - Not released, developers release + - WMPPP dialup frontend is now a + dock.app with online timer. + + +1.0pre2 - Released 980115 + First initial public release + Bugfixes and some cosmetic stuff + +0.5b - Not released, developers release + Bugfixes and cosmetic changes + +0.3b - Not released, developers release + First working WMPPP version diff --git a/wmifs/COPYING b/wmifs/COPYING new file mode 100644 index 0000000..a43ea21 --- /dev/null +++ b/wmifs/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, 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 + + Appendix: 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) 19yy + + 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., 675 Mass Ave, Cambridge, MA 02139, 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) 19yy 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/wmifs/HINTS b/wmifs/HINTS new file mode 100644 index 0000000..be93386 --- /dev/null +++ b/wmifs/HINTS @@ -0,0 +1,105 @@ +Hints for WMIFS + +Generic +-------------------------------------------------------------- +WMiFS supports commandline options, 'wmifs -h' prints help +about them. + +WMiFS has a special -i option, this way you can force +WMiFS to monitor a particular interface like: + +wmifs -i eth0 & +wmifs -i ppp0 & +wmifs -i lo & + +Without the -i option (wmifs &) WMiFS automagicly +grabs the default interface and will display the +name and statistics of that interface. + +You can cycle in realtime through all available +active interfaces by simply clicking with the left +mousebutton on the interface name gadget in the +upperleft corner of WMiFS... + +Note: The 'lo' interface is an exception, 'lo' ONLY +works when invoked from the commandline (wmifs -i lo), +lo was mainly build in for testing purposes ;-) + + +WindowMaker +-------------------------------------------------------------- +WindowMaker users simply drag and drop the WMiFS dock.app on +the WindowMaker Dock (preferred) or on the Fiend, and then +press the rightmouse button on the outer edges of WMiFS and +then enable 'Autolaunch' from the Dock/Fiend popup menu. + + +Afterstep +-------------------------------------------------------------- +Afterstep users put the following in their .steprc +"Wharf wmifs - MaxSwallow "wmifs" wmifs -i eth0 -w &". + +Note: the small pixmap placement bug is in Wharf, please + notify the AfterStep developers if you want to see + this fixed! + + +Other WindowManagers +-------------------------------------------------------------- +For other windowmanagers, WMiFS runs nicely as 64x64 pixel +shaped icon on your desktop. + +p.s. FVWM can swallow it too, so we've heard ;-) + + +Dragging WMiFS +-------------------------------------------------------------- +Be sure to drag WMIFS on it's outer edges, it's a bit +picky due to the large gfx pixmap it keeps ;-) + + +Setting up the WMiFS RC file +-------------------------------------------------------------- +WMIFS can (optionally) launch your ppp scripts with a simple +left mouse click on the interface statistics display. + +You may define your settings in ~/.wmifsrc like: + +left: /home/foobar/MyPPP-connect-script +middle: /home/foobar/MyPPP-disconnect-script +right: /home/foobar/MyPPP-reconnect-script + +Note: If you run a site where users may not fiddle with the + PPP scripts, read INSTALL > Info For Site Admins! + + +Creating PPP dialup scripts +-------------------------------------------------------------- +Because a very good PPP HowTo already exists, +it's quite pointless for us to explain to you +how you should and can make them... + +Read the PPP HowTo, and you'll see that it's +very easy to create your own PPP scripts ;-) + + +Permissions to allow non-root WMPPP connections +-------------------------------------------------------------- +WMiFS will connect just fine when run as root, but if you want +to run WMiFS as a non-root user, there are a few files and +programs to make permissions changes to. + +WMiFS needs access to the device file your modem is on, so if +you use COM1, then the modem device file you use is /dev/cua0. +Change the permissions so that it is world read/writable: + + chmod 666 /dev/cua0 + +The pppd daemon also makes calls to the kernel which require root +permissions. The pppd daemon must be owned by root, and then have +it's set-user-id bit turned on. This way, the pppd daemon will +always run as SUID root. Change the owner and SUID bit like: + + chown root.root pppd + chmod +s pppd + diff --git a/wmifs/INSTALL b/wmifs/INSTALL new file mode 100644 index 0000000..e023a76 --- /dev/null +++ b/wmifs/INSTALL @@ -0,0 +1,99 @@ +Installation instructions for WMiFS. + + +NOTE! +-------------------------------------------------------------- +Installing this program requires root privileges, ask your +local system/network administrator kindly if she/he wants +to install this software for you ;-) + + +Requirements +---------------------------------------------------------- +- root access + + To be able to complete the installation you'll need + to make changes in the system's /etc directory, + the installation copies the GLOBAL config file + there, don't worry, nothing will be overwritten ;-) + + +Installation +-------------------------------------------------------------- +1) % tar -zxvf wmifs-1.3b.tar.gz +2)* % cd wmifs.app/wmifs +3) % make +4) % su root +5) # make install +6)* # vi ~/.wmifsrc and/or /etc/wmifsrc + set up the paths to your pppd + start, stop & restart scripts +7) % wmifs & (or wmifs -h for brief help). + +2)* If you're on a libc5 system, copy or move wmifs-libc5.c + over wmifs.c (i.e. cp wmifs-libc5.c wmifs.c) and proceed + with step 3) + +6)* This is optional, WMiFS also works fine without them, + it's entirely up to you ;-) + + + +Extra Install Info For Site Administrators! +-------------------------------------------------------------- +For site administrators who don't want their users messing +up pppd's configuration files, WMiFS now supports an +/etc/wmifsrc.fixed file. + +The installation will install the normal user and global +wmifsrc files in $HOME and /etc, NOT the fixed one! + +WMiFS scan for 3 files at startup, in the following order: + + 1. /etc/wmifsrc + 2. $HOME/.wmifsrc + 3. /etc/wmifsrc.fixed + +If no .wmifsrc file is found in the users home directory, +WMiFS will use the global one (/etc/wmifsrc, if present +and valid). + +When WMiFS finds a /etc/wmifs.fixed file, all settings +that WMiFS detected in /etc/wmifsrc and/or $HOME/.wmifsrc +will be discarted i.e. OVERRIDDEN! + +If you want your users to be able to dialout, but you +don't want them to mess around, simply move or copy +the default /etc/wmifsrc to /etc/wmifsrc.fixed :) + +Note: When NO wmifsrc files are found at all, WMiFS will +work, but quite obvious, WMiFS won't launch any scripts. +Make sure there are valid and FULL pathnames in the wmifsrc +file(s) if you want WMiFS to launch your pppd scripts ;-) + + +Usage +------------------------------------------------------------- +WMiFS support the following commandline options: + + -h helpscreen + -display X server display where wmppp should + appear (default = 0:0) + -i interface name, note: 'lo' can ONLY + be specified with '-i lo' ;-) + (default = default interface as it + appears in /proc/net/route) + -w draw the statistics graph in waveform + like mode, try it! (default = normal) + -v print wmifs version number + + +General Notes +-------------------------------------------------------------- +Note 1: If "make install" fails on your system, please edit + the Makefile to set the paths according to your setup. + "make install" defaults to /usr/local/bin, $HOME & /etc. + +Note 2: Please DO read the HINTS, this file contains some + very usefull tips about WMiFS. + diff --git a/wmifs/README b/wmifs/README new file mode 100644 index 0000000..4d8d3e6 --- /dev/null +++ b/wmifs/README @@ -0,0 +1,72 @@ +WMiFS-1.3b - The public BETA release +-------------------------------------------------------------- +Authors...: Martijn Pieterse (pieterse@xs4all.nl) + Antoine Nulle (warp@xs4all.nl) + +Note......: WMiFS has it's own mailbox, as our pop3 accounts + are already way too crowded :) + Please mail bugreports, comments, suggestions, + requests and flames to: + + dockapps@windowmaker.mezaway.org + + The official WMiFS support website address: + + http://windowmaker.mezaway.org + +Credits...: Bobby Mezaway (bobby@mezaway.org) for generously + hosting our website! + + +Description +-------------------------------------------------------------- +WMiFS is a complete network monitoring dock.app, it's mainly +designed for usage in WindowMaker's dock and gives you some +nice & nifty features like: + + * Autosensing of *ALL* active network interfaces; + * Integrated autoscaling (per interface) transfer + statistics, tested upto 100Mbit; + * Displays a 'normal' xload style graph or our new + 'waveform' like load graph; + * Realtime cycling through active interfaces by simply + clicking on the eth0/ppp0 (interface) gadget; + * Integrated RX/TX interface activity LEDs; + * Integrated interface status LED; + * Commandline options to force monitoring a particular + interface, even 'lo' is supported (-h for help); + * User-definable scripts for left/middle/right mouse + buttons which are read from ~/.wmifsrc (optional); + * Fixed rc file option, usefull for sites where users + are not allowed to mess with pppd; + +WMiFS is developped on DEC Alpha machines running RedHat-5.0/Linux, +but, WMiFS has also been intensively tested on x86 and 68K RedHat/ +Linux machines ;-) + + +Files +-------------------------------------------------------------- +README This file. +INSTALL Installation instructions. +HINTS Hints about what you can do with WMiFS. +BUGS Things you don't want to know ;-) +CHANGES Description of changes. +TODO Things we've already planned for WMiFS. +COPYING GNU General Public License Version 2. + + +Bugs +-------------------------------------------------------------- +If you discover any bugs in this software, please send a +bugreport to dockapps@windowmaker.mezaway.org and describe +the problem as detailed as you can. + + +Copyright +-------------------------------------------------------------- +WMiFS.app is copyright (c) 1997, 1998 by Martijn Pieterse and +Antoine Nulle and licensed through the GNU General Public License. +Read the COPYING file for the complete GNU license. + + diff --git a/wmifs/TODO b/wmifs/TODO new file mode 100644 index 0000000..4486fd1 --- /dev/null +++ b/wmifs/TODO @@ -0,0 +1,12 @@ +TODO list for WMiFS. +-------------------------------------------------------------- + * Commandline option for LED colors; + * Optional LCD GUI, either compile or runtime; + * Make the status LED also display collisions; + +Your feedback! If you have nice suggestions, ideas, whatever, +that aren't on this list, feel free to mail them to: + + dockapps@windowmaker.mezaway.org + +If you don't let us know... how are we suppose to know? ;-) \ No newline at end of file diff --git a/wmifs/wmgeneral/list.c b/wmifs/wmgeneral/list.c new file mode 100644 index 0000000..f804b2c --- /dev/null +++ b/wmifs/wmgeneral/list.c @@ -0,0 +1,169 @@ +/* Generic single linked list to keep various information + Copyright (C) 1993, 1994 Free Software Foundation, Inc. + + +Author: Kresten Krab Thorup + +Many modifications by Alfredo K. Kojima + + +This file is part of GNU CC. + +GNU CC 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, or (at your option) +any later version. + +GNU CC 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 GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +/* As a special exception, if you link this library with files compiled with + GCC to produce an executable, this does not cause the resulting executable + to be covered by the GNU General Public License. This exception does not + however invalidate any other reasons why the executable file might be + covered by the GNU General Public License. */ + +#include "list.h" +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#include + +/* Return a cons cell produced from (head . tail) */ + +INLINE LinkedList* +list_cons(void* head, LinkedList* tail) +{ + LinkedList* cell; + + cell = (LinkedList*)malloc(sizeof(LinkedList)); + cell->head = head; + cell->tail = tail; + return cell; +} + +/* Return the length of a list, list_length(NULL) returns zero */ + +INLINE int +list_length(LinkedList* list) +{ + int i = 0; + while(list) + { + i += 1; + list = list->tail; + } + return i; +} + +/* Return the Nth element of LIST, where N count from zero. If N + larger than the list length, NULL is returned */ + +INLINE void* +list_nth(int index, LinkedList* list) +{ + while(index-- != 0) + { + if(list->tail) + list = list->tail; + else + return 0; + } + return list->head; +} + +/* Remove the element at the head by replacing it by its successor */ + +INLINE void +list_remove_head(LinkedList** list) +{ + if (!*list) return; + if ((*list)->tail) + { + LinkedList* tail = (*list)->tail; /* fetch next */ + *(*list) = *tail; /* copy next to list head */ + free(tail); /* free next */ + } + else /* only one element in list */ + { + free(*list); + (*list) = 0; + } +} + + +/* Remove the element with `car' set to ELEMENT */ +/* +INLINE void +list_remove_elem(LinkedList** list, void* elem) +{ + while (*list) + { + if ((*list)->head == elem) + list_remove_head(list); + *list = (*list ? (*list)->tail : NULL); + } +}*/ + +INLINE LinkedList * +list_remove_elem(LinkedList* list, void* elem) +{ + LinkedList *tmp; + + if (list) { + if (list->head == elem) { + tmp = list->tail; + free(list); + return tmp; + } + list->tail = list_remove_elem(list->tail, elem); + return list; + } + return NULL; +} + + +/* Return element that has ELEM as car */ + +INLINE LinkedList* +list_find(LinkedList* list, void* elem) +{ + while(list) + { + if (list->head == elem) + return list; + list = list->tail; + } + return NULL; +} + +/* Free list (backwards recursive) */ + +INLINE void +list_free(LinkedList* list) +{ + if(list) + { + list_free(list->tail); + free(list); + } +} + +/* Map FUNCTION over all elements in LIST */ + +INLINE void +list_mapcar(LinkedList* list, void(*function)(void*)) +{ + while(list) + { + (*function)(list->head); + list = list->tail; + } +} diff --git a/wmifs/wmgeneral/list.h b/wmifs/wmgeneral/list.h new file mode 100644 index 0000000..af0f22c --- /dev/null +++ b/wmifs/wmgeneral/list.h @@ -0,0 +1,59 @@ +/* Generic single linked list to keep various information + Copyright (C) 1993, 1994 Free Software Foundation, Inc. + +Author: Kresten Krab Thorup + +This file is part of GNU CC. + +GNU CC 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, or (at your option) +any later version. + +GNU CC 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 GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +/* As a special exception, if you link this library with files compiled with + GCC to produce an executable, this does not cause the resulting executable + to be covered by the GNU General Public License. This exception does not + however invalidate any other reasons why the executable file might be + covered by the GNU General Public License. */ + +#ifndef __LIST_H_ +#define __LIST_H_ + +#if defined(__GNUC__) && !defined(__STRICT_ANSI__) +# define INLINE inline +#else +# define INLINE +#endif + +typedef struct LinkedList { + void *head; + struct LinkedList *tail; +} LinkedList; + +INLINE LinkedList* list_cons(void* head, LinkedList* tail); + +INLINE int list_length(LinkedList* list); + +INLINE void* list_nth(int index, LinkedList* list); + +INLINE void list_remove_head(LinkedList** list); + +INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem); + +INLINE void list_mapcar(LinkedList* list, void(*function)(void*)); + +INLINE LinkedList*list_find(LinkedList* list, void* elem); + +INLINE void list_free(LinkedList* list); + +#endif diff --git a/wmifs/wmgeneral/misc.c b/wmifs/wmgeneral/misc.c new file mode 100644 index 0000000..34281e2 --- /dev/null +++ b/wmifs/wmgeneral/misc.c @@ -0,0 +1,164 @@ +/* dock.c- built-in Dock module for WindowMaker + * + * WindowMaker window manager + * + * Copyright (c) 1997 Alfredo K. Kojima + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include "list.h" +#include "misc.h" + +/* + *---------------------------------------------------------------------- + * parse_command-- + * Divides a command line into a argv/argc pair. + *---------------------------------------------------------------------- + */ +#define PRC_ALPHA 0 +#define PRC_BLANK 1 +#define PRC_ESCAPE 2 +#define PRC_DQUOTE 3 +#define PRC_EOS 4 +#define PRC_SQUOTE 5 + +typedef struct { + short nstate; + short output; +} DFA; + + +static DFA mtable[9][6] = { + {{3,1},{0,0},{4,0},{1,0},{8,0},{6,0}}, + {{1,1},{1,1},{2,0},{3,0},{5,0},{1,1}}, + {{1,1},{1,1},{1,1},{1,1},{5,0},{1,1}}, + {{3,1},{5,0},{4,0},{1,0},{5,0},{6,0}}, + {{3,1},{3,1},{3,1},{3,1},{5,0},{3,1}}, + {{-1,-1},{0,0},{0,0},{0,0},{0,0},{0,0}}, /* final state */ + {{6,1},{6,1},{7,0},{6,1},{5,0},{3,0}}, + {{6,1},{6,1},{6,1},{6,1},{5,0},{6,1}}, + {{-1,-1},{0,0},{0,0},{0,0},{0,0},{0,0}}, /* final state */ +}; + +char* +next_token(char *word, char **next) +{ + char *ptr; + char *ret, *t; + int state, ctype; + + t = ret = malloc(strlen(word)+1); + ptr = word; + + state = 0; + *t = 0; + while (1) { + if (*ptr==0) + ctype = PRC_EOS; + else if (*ptr=='\\') + ctype = PRC_ESCAPE; + else if (*ptr=='"') + ctype = PRC_DQUOTE; + else if (*ptr=='\'') + ctype = PRC_SQUOTE; + else if (*ptr==' ' || *ptr=='\t') + ctype = PRC_BLANK; + else + ctype = PRC_ALPHA; + + if (mtable[state][ctype].output) { + *t = *ptr; t++; + *t = 0; + } + state = mtable[state][ctype].nstate; + ptr++; + if (mtable[state][0].output<0) { + break; + } + } + + if (*ret==0) + t = NULL; + else + t = strdup(ret); + + free(ret); + + if (ctype==PRC_EOS) + *next = NULL; + else + *next = ptr; + + return t; +} + + +extern void +parse_command(char *command, char ***argv, int *argc) +{ + LinkedList *list = NULL; + char *token, *line; + int count, i; + + line = command; + do { + token = next_token(line, &line); + if (token) { + list = list_cons(token, list); + } + } while (token!=NULL && line!=NULL); + + count = list_length(list); + *argv = malloc(sizeof(char*)*count); + i = count; + while (list!=NULL) { + (*argv)[--i] = list->head; + list_remove_head(&list); + } + *argc = count; +} + +extern pid_t +execCommand(char *command) +{ + pid_t pid; + char **argv; + int argc; + + parse_command(command, &argv, &argc); + + if (argv==NULL) { + return 0; + } + + if ((pid=fork())==0) { + char **args; + int i; + + args = malloc(sizeof(char*)*(argc+1)); + if (!args) + exit(10); + for (i=0; i + +extern void parse_command(char *, char ***, int *); + +extern pid_t execCommand(char *); +#endif /* __MISC_H */ diff --git a/wmifs/wmgeneral/wmgeneral.c b/wmifs/wmgeneral/wmgeneral.c new file mode 100644 index 0000000..a4f13c1 --- /dev/null +++ b/wmifs/wmgeneral/wmgeneral.c @@ -0,0 +1,366 @@ +/* + Best viewed with vim5, using ts=4 + + wmgeneral was taken from wmppp. + + It has a lot of routines which most of the wm* programs use. + + ------------------------------------------------------------ + + Author: Martijn Pieterse (pieterse@xs4all.nl) + + --- + CHANGES: + --- + 02/05/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * changed the read_rc_file to parse_rcfile, as suggester by Marcelo E. Magallon + * debugged the parse_rc file. + 30/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Ripped similar code from all the wm* programs, + and put them in a single file. + +*/ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "wmgeneral.h" + + /*****************/ + /* X11 Variables */ +/*****************/ + +Window Root; +int screen; +int x_fd; +int d_depth; +XSizeHints mysizehints; +XWMHints mywmhints; +Pixel back_pix, fore_pix; +char *Geometry = ""; +Window iconwin, win; +GC NormalGC; +XpmIcon wmgen; +Pixmap pixmask; + + /*****************/ + /* Mouse Regions */ +/*****************/ + +typedef struct { + int enable; + int top; + int bottom; + int left; + int right; +} MOUSE_REGION; + +#define MAX_MOUSE_REGION (8) +MOUSE_REGION mouse_region[MAX_MOUSE_REGION]; + + /***********************/ + /* Function Prototypes */ +/***********************/ + +static void GetXPM(XpmIcon *, char **); +static Pixel GetColor(char *); +void RedrawWindow(void); +void AddMouseRegion(int, int, int, int, int); +int CheckMouseRegion(int, int); + +/*******************************************************************************\ +|* read_rc_file *| +\*******************************************************************************/ + +void parse_rcfile(const char *filename, rckeys *keys) { + + char *p; + char temp[128]; + char *tokens = " :\t\n"; + FILE *fp; + int i,key; + + fp = fopen(filename, "r"); + if (fp) { + while (fgets(temp, 128, fp)) { + key = 0; + while (key >= 0 && keys[key].label) { + if ((p = strstr(temp, keys[key].label))) { + p += strlen(keys[key].label); + p += strspn(p, tokens); + if ((i = strcspn(p, "#\n"))) p[i] = 0; + free(*keys[key].var); + *keys[key].var = strdup(p); + key = -1; + } else key++; + } + } + fclose(fp); + } +} + + +/*******************************************************************************\ +|* GetXPM *| +\*******************************************************************************/ + +static void GetXPM(XpmIcon *wmgen, char *pixmap_bytes[]) { + + XWindowAttributes attributes; + int err; + + /* For the colormap */ + XGetWindowAttributes(display, Root, &attributes); + + wmgen->attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions); + + err = XpmCreatePixmapFromData(display, Root, pixmap_bytes, &(wmgen->pixmap), + &(wmgen->mask), &(wmgen->attributes)); + + if (err != XpmSuccess) { + fprintf(stderr, "Not enough free colorcells.\n"); + exit(1); + } +} + +/*******************************************************************************\ +|* GetColor *| +\*******************************************************************************/ + +static Pixel GetColor(char *name) { + + XColor color; + XWindowAttributes attributes; + + XGetWindowAttributes(display, Root, &attributes); + + color.pixel = 0; + if (!XParseColor(display, attributes.colormap, name, &color)) { + fprintf(stderr, "wm.app: can't parse %s.\n", name); + } else if (!XAllocColor(display, attributes.colormap, &color)) { + fprintf(stderr, "wm.app: can't allocate %s.\n", name); + } + return color.pixel; +} + +/*******************************************************************************\ +|* flush_expose *| +\*******************************************************************************/ + +static int flush_expose(Window w) { + + XEvent dummy; + int i=0; + + while (XCheckTypedWindowEvent(display, w, Expose, &dummy)) + i++; + + return i; +} + +/*******************************************************************************\ +|* RedrawWindow *| +\*******************************************************************************/ + +void RedrawWindow(void) { + + flush_expose(iconwin); + XCopyArea(display, wmgen.pixmap, iconwin, NormalGC, + 0,0, wmgen.attributes.width, wmgen.attributes.height, 0,0); + flush_expose(win); + XCopyArea(display, wmgen.pixmap, win, NormalGC, + 0,0, wmgen.attributes.width, wmgen.attributes.height, 0,0); +} + +/*******************************************************************************\ +|* RedrawWindowXY *| +\*******************************************************************************/ + +void RedrawWindowXY(int x, int y) { + + flush_expose(iconwin); + XCopyArea(display, wmgen.pixmap, iconwin, NormalGC, + x,y, wmgen.attributes.width, wmgen.attributes.height, 0,0); + flush_expose(win); + XCopyArea(display, wmgen.pixmap, win, NormalGC, + x,y, wmgen.attributes.width, wmgen.attributes.height, 0,0); +} + +/*******************************************************************************\ +|* AddMouseRegion *| +\*******************************************************************************/ + +void AddMouseRegion(int index, int left, int top, int right, int bottom) { + + if (index < MAX_MOUSE_REGION) { + mouse_region[index].enable = 1; + mouse_region[index].top = top; + mouse_region[index].left = left; + mouse_region[index].bottom = bottom; + mouse_region[index].right = right; + } +} + +/*******************************************************************************\ +|* CheckMouseRegion *| +\*******************************************************************************/ + +int CheckMouseRegion(int x, int y) { + + int i; + int found; + + found = 0; + + for (i=0; i= mouse_region[i].left && + y <= mouse_region[i].bottom && + y >= mouse_region[i].top) + found = 1; + } + if (!found) return -1; + return (i-1); +} + +/*******************************************************************************\ +|* copyXPMArea *| +\*******************************************************************************/ + +void copyXPMArea(int x, int y, int sx, int sy, int dx, int dy) { + + XCopyArea(display, wmgen.pixmap, wmgen.pixmap, NormalGC, x, y, sx, sy, dx, dy); + +} + +/*******************************************************************************\ +|* copyXBMArea *| +\*******************************************************************************/ + +void copyXBMArea(int x, int y, int sx, int sy, int dx, int dy) { + + XCopyArea(display, wmgen.mask, wmgen.pixmap, NormalGC, x, y, sx, sy, dx, dy); +} + + +/*******************************************************************************\ +|* setMaskXY *| +\*******************************************************************************/ + +void setMaskXY(int x, int y) { + + XShapeCombineMask(display, win, ShapeBounding, x, y, pixmask, ShapeSet); + XShapeCombineMask(display, iconwin, ShapeBounding, x, y, pixmask, ShapeSet); +} + +/*******************************************************************************\ +|* openXwindow *| +\*******************************************************************************/ +void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bits, int pixmask_width, int pixmask_height) { + + unsigned int borderwidth = 1; + XClassHint classHint; + char *display_name = NULL; + char *wname = argv[0]; + XTextProperty name; + + XGCValues gcv; + unsigned long gcm; + + + int dummy=0; + int i; + + for (i=1; argv[i]; i++) { + if (!strcmp(argv[i], "-display")) + display_name = argv[i+1]; + } + + if (!(display = XOpenDisplay(display_name))) { + fprintf(stderr, "%s: can't open display %s\n", + wname, XDisplayName(display_name)); + exit(1); + } + screen = DefaultScreen(display); + Root = RootWindow(display, screen); + d_depth = DefaultDepth(display, screen); + x_fd = XConnectionNumber(display); + + /* Convert XPM to XImage */ + GetXPM(&wmgen, pixmap_bytes); + + /* Create a window to hold the stuff */ + mysizehints.flags = USSize | USPosition; + mysizehints.x = 0; + mysizehints.y = 0; + + back_pix = GetColor("white"); + fore_pix = GetColor("black"); + + XWMGeometry(display, screen, Geometry, NULL, borderwidth, &mysizehints, + &mysizehints.x, &mysizehints.y,&mysizehints.width,&mysizehints.height, &dummy); + + mysizehints.width = 64; + mysizehints.height = 64; + + win = XCreateSimpleWindow(display, Root, mysizehints.x, mysizehints.y, + mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix); + + iconwin = XCreateSimpleWindow(display, win, mysizehints.x, mysizehints.y, + mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix); + + /* Activate hints */ + XSetWMNormalHints(display, win, &mysizehints); + classHint.res_name = wname; + classHint.res_class = wname; + XSetClassHint(display, win, &classHint); + + XSelectInput(display, win, ButtonPressMask | ExposureMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask); + XSelectInput(display, iconwin, ButtonPressMask | ExposureMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask); + + if (XStringListToTextProperty(&wname, 1, &name) == 0) { + fprintf(stderr, "%s: can't allocate window name\n", wname); + exit(1); + } + + XSetWMName(display, win, &name); + + /* Create GC for drawing */ + + gcm = GCForeground | GCBackground | GCGraphicsExposures; + gcv.foreground = fore_pix; + gcv.background = back_pix; + gcv.graphics_exposures = 0; + NormalGC = XCreateGC(display, Root, gcm, &gcv); + + /* ONLYSHAPE ON */ + + pixmask = XCreateBitmapFromData(display, win, pixmask_bits, pixmask_width, pixmask_height); + + XShapeCombineMask(display, win, ShapeBounding, 0, 0, pixmask, ShapeSet); + XShapeCombineMask(display, iconwin, ShapeBounding, 0, 0, pixmask, ShapeSet); + + /* ONLYSHAPE OFF */ + + mywmhints.initial_state = WithdrawnState; + mywmhints.icon_window = iconwin; + mywmhints.icon_x = mysizehints.x; + mywmhints.icon_y = mysizehints.y; + mywmhints.window_group = win; + mywmhints.flags = StateHint | IconWindowHint | IconPositionHint | WindowGroupHint; + + XSetWMHints(display, win, &mywmhints); + + XSetCommand(display, win, argv, argc); + XMapWindow(display, win); + +} diff --git a/wmifs/wmgeneral/wmgeneral.h b/wmifs/wmgeneral/wmgeneral.h new file mode 100644 index 0000000..55b37dd --- /dev/null +++ b/wmifs/wmgeneral/wmgeneral.h @@ -0,0 +1,50 @@ +#ifndef WMGENERAL_H_INCLUDED +#define WMGENERAL_H_INCLUDED + + /***********/ + /* Defines */ +/***********/ + +#define MAX_MOUSE_REGION (8) + + /************/ + /* Typedefs */ +/************/ + +typedef struct _rckeys rckeys; + +struct _rckeys { + const char *label; + char **var; +}; + +typedef struct { + Pixmap pixmap; + Pixmap mask; + XpmAttributes attributes; +} XpmIcon; + + /*******************/ + /* Global variable */ +/*******************/ + +Display *display; + + /***********************/ + /* Function Prototypes */ +/***********************/ + +void AddMouseRegion(int index, int left, int top, int right, int bottom); +int CheckMouseRegion(int x, int y); + +void openXwindow(int argc, char *argv[], char **, char *, int, int); +void RedrawWindow(void); +void RedrawWindowXY(int x, int y); + +void copyXPMArea(int, int, int, int, int, int); +void copyXBMArea(int, int, int, int, int, int); +void setMaskXY(int, int); + +void parse_rcfile(const char *, rckeys *); + +#endif diff --git a/wmifs/wmifs/Makefile b/wmifs/wmifs/Makefile new file mode 100755 index 0000000..4316b3e --- /dev/null +++ b/wmifs/wmifs/Makefile @@ -0,0 +1,33 @@ +LIBDIR = -L/usr/X11R6/lib +LIBS = -lXpm -lXext -lX11 +OBJS = wmifs.o \ + ../wmgeneral/wmgeneral.o \ + ../wmgeneral/misc.o \ + ../wmgeneral/list.o + + +.c.o: + cc -c -O2 -Wall $< -o $*.o + +wmifs: $(OBJS) + cc -o wmifs $^ -lXext $(LIBDIR) $(LIBS) + +all:: wmifs + +clean:: + for i in $(OBJS) ; do \ + rm $$i ; \ + done + rm wmifs + +install:: + cp -f wmifs /usr/local/bin/ + chmod 755 /usr/local/bin/wmifs + chown root:root /usr/local/bin/wmifs + cp sample.wmifsrc /etc/wmifsrc + chown root:root /etc/wmifsrc + chmod 644 /etc/wmifsrc + cp -f sample.wmifsrc $(HOME)/.wmifsrc + echo "WMiFS-1.3beta installation finished..." + echo " " + echo "have fun! ;-)" diff --git a/wmifs/wmifs/sample.wmifsrc b/wmifs/wmifs/sample.wmifsrc new file mode 100644 index 0000000..35155ac --- /dev/null +++ b/wmifs/wmifs/sample.wmifsrc @@ -0,0 +1,3 @@ +left: /foo/bar/your-wmifs-start-script-here +middle: /foo/bar/your-wmifs-stop-script-here +right: /foo/bar/your-wmifs-restart-script-here diff --git a/wmifs/wmifs/wmifs-libc5.c b/wmifs/wmifs/wmifs-libc5.c new file mode 100644 index 0000000..aac5d19 --- /dev/null +++ b/wmifs/wmifs/wmifs-libc5.c @@ -0,0 +1,934 @@ +/* + Best viewed with vim5, using ts=4 + + This code was mainly put together by looking at the + following programs: + + asclock + A neat piece of equip, used to display the date + and time on the screen. + Comes with every AfterStep installation. + + Source used: + How do I create a not so solid window? + How do I open a window? + How do I use pixmaps? + + pppstats + A program that prints the amount of data that + is transferred over a ppp-line. + + Source used: + How do I read the ppp device? + ------------------------------------------------------------ + + Author: Martijn Pieterse (pieterse@xs4all.nl) + + This program was hacked together between the 7th of March + and the 14th of March 1998. + + This program might be Y2K resistant. We shall see. :) + + This program is distributed under the GPL license. + (as were asclock and pppstats) + + Known Features: (or in non M$ talk, BUGS) + * only ppp0 will be read + use wmifs if you want to read more than one ppp connection + not sure about this. + * the leds won't be reliable with + more than 1 ppp connection + * there is an iconwin, and win variable. + I have no clue why only win shouldn't + be enough. Will check it out later. + * The afterstep what seems the shift the + pixmap a bit. Don't know how and why. + It works in the WindowManager. + + Things to do: + Split up main() + + ---- + Thanks + ---- + + Most of the ideas, and jumpstarting it: + + #linuxnl, without this irc-channel wmppp would've never seen the light! + + CCC (Constructive Code Criticism): + + Marcelo E. Magallon + Thanks a LOT! It takes a while to get me convinced... :) + + + Minor bugs and ideas: + + Marc De Scheemaecker / David Mihm / Chris Soghoian / + Alessandro Usseglio Viretta / Dan Pascu + + and ofcourse numerous ppl who send us bug reports. + (numerous? hmm.. todo: rephrase this :) ) + + + ---- + Changes: + --- + 12/05/1998 (Antoine Nulle), warp@xs4all.nl) + * Made wmifs.c libc5 compatible version + 04/05/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Changed the "middle of the waveform" line color + * Moved the RedrawWindow out of the main loop. + Lightens the system load + 02/05/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Torn wmppp and wmifs apart. + This is gonna be wmifs + * Added parse_rcfile + * Added waitpid, to get rid of the zombies, spotteb by Alessandro Usseglio Viretta + 30/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Used the DrawStats routine from wmifs in wmppp + * I decided to add a list in this source file + with name of ppl who helped me build this code better. + * I finally removed the /proc/net/route dependancy + All of the connections are taken from /proc/net/dev. + /proc/net/route is still used for checking if it is on-line. + 27/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * WMIFS: stats scrolled, while red led burning + * WMPPP: changed positions of line speed + 25/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Changed the checknetdevs routine, a lot! + 23/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Added line speed detection. via seperate exec. (this has to be suid root!) + Speed has to be no more than 99999 + * Added speed and forcespeed in ~/.wmppprc and /etc/wmppprc + * wmifs: added on-line detection scheme, update the bitmap coordinates + * wmppp: the x-button now allways disconnects. + 22/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Added /etc/wmppprc support, including "forced" mode. + * Added /etc/wmifsrc support, including "forced" mode. + 21/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Moved the stats one pixel down. + * Added status led in wmifs. + * Changed RX/TX leds of wmifs to resemble wmppp + * Added the "dot" between eth.0 ppp.0 etc. + * Changed to wmifs stats to match wmppp stats (only pppX changed) + * Made sure that when specified -t 1, it stayed that way, even + when longer than 100 minutes online + * With -t 1, jump from 59:59 to 01:00 instead of 99:59 to 01:40 + 16/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Added "all" devices in wmifs + * Added "lo" support only if aked via -i + * Added on-line time detection (using /var/run/ppp0.pid) + * Added time-out for the orange led. (one minute) + 15/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Another wmppp-master.xpm. + Line speed detection being the main problem here.. :( + * Moved START_COMMAND / STOP_COMMAND to ~/.wmppprc + Return 0, everything went ok. + Return 10, the command did not work. + Please note, these functions are ran in the background. + * Removed the ability to configure + * When "v" is clicked, an orange led will appear. + if the connect script fails (return value == 10) + it will become dark again. Else the on-line detection will + pick it up, and "green" it. + 14/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Added "-timer" + * Added "-display" support + * Changed pixmap to a no-name pixmap. + + Changed LED positions + + Changed Timer position + + Changed Stats Size + 05/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Added ~/.wmifsrc support. + * Put some code in DrawStats + * Check devices when pressing "device change" + 03/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Added code for wmifs + 28/03/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * forgot what i did.. :) + 27/03/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Added on-line detection + Scan through /proc/net/route and check everye line + for "ppp". + * A bit of code clean-up. +*/ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +#include "../wmgeneral/wmgeneral.h" +#include "../wmgeneral/misc.h" + +#include "wmifs-master.xpm" +#include "wmifs-mask.xbm" + + /***********/ + /* Defines */ +/***********/ + +/* Fill in the hardcoded actions */ +#define LEFT_ACTION (NULL) +#define MIDDLE_ACTION (NULL) +#define RIGHT_ACTION (NULL) + +/* Defines voor alle coordinate */ + +#define LED_NET_RX (4) +#define LED_NET_TX (5) +#define LED_NET_POWER (6) + +#define WMIFS_VERSION "1.2.1" + + /**********************/ + /* External Variables */ +/**********************/ + +extern char **environ; + + /********************/ + /* Global Variables */ +/********************/ + +char *ProgName; +char *active_interface = NULL; +int TimerDivisor=60; +int WaveForm=0; + + /*****************/ + /* PPP variables */ +/*****************/ + +#define PPP_UNIT 0 +int ppp_h = -1; + +#define PPP_STATS_HIS 54 + + /***********************/ + /* Function Prototypes */ +/***********************/ + +void usage(void); +void printversion(void); +void DrawTime(int, int); +void DrawStats(int *, int, int, int, int); + +void SetOnLED(int); +void SetErrLED(int); +void SetWaitLED(int); +void SetOffLED(int); + +void ButtonUp(int); +void ButtonDown(int); + +void wmifs_routine(int, char **); + +void get_ppp_stats(struct ppp_stats *cur); + + + /********/ + /* Main */ +/********/ + +void main(int argc, char *argv[]) { + + int i; + + + /* Parse Command Line */ + + ProgName = argv[0]; + if (strlen(ProgName) >= 5) + ProgName += (strlen(ProgName) - 5); + + for (i=1; i Button */ + AddMouseRegion(0, 5, 5, 35, 15); + AddMouseRegion(1, 5, 20, 58, 58); + + starttime = time(0); + nexttime = starttime + 5; + + for (i=0; i= nexttime) { + nexttime+=5; + + for (i=0; i= 0) { + switch (but_stat) { + case 0 : + /* re-read the table */ + strcpy(temp, stat_devices[stat_current].name); + stat_online = checknetdevs(); + stat_current = 0; + for (i=0; i= '0' && name[strlen(name)-1] <= '9') { + copyXPMArea(61, 64, 4, 9, k, 5); + k+=4; + } + c = toupper(name[i]); + if (c >= 'A' && c <= 'Z') { + c -= 'A'; + copyXPMArea(c * 6, 74, 6, 9, k, 5); + k += 6; + } else { + c -= '0'; + copyXPMArea(c * 6, 64, 6, 9, k, 5); + k += 6; + } + } + +} + +/*******************************************************************************\ +|* get_statistics *| +\*******************************************************************************/ + +int get_statistics(char *devname, long *ip, long *op, long *is, long *os) { + + FILE *fp; + char temp[128]; + char *p; + char *tokens = " |:\n"; + int input, output; + int i; + int found; + struct ppp_stats ppp_cur, ppp_old; + static int ppp_opened = 0; + + + if (!strncmp(devname, "ppp", 3)) { + if (!ppp_opened) { + /* Open the ppp device. */ + memset(&ppp_cur, 0, sizeof(ppp_cur)); + if ((ppp_h = socket(AF_INET, SOCK_DGRAM, 0)) < 0) + return -1; + get_ppp_stats(&ppp_cur); + ppp_old = ppp_cur; + ppp_opened = 1; + } + + get_ppp_stats(&ppp_cur); + + *op = ppp_cur.p.ppp_opackets; + *ip = ppp_cur.p.ppp_ipackets; + + *is = ppp_cur.p.ppp_ibytes; + *os = ppp_cur.p.ppp_obytes; + + return 0; + } + + /* Read from /proc/net/dev the stats! */ + fp = fopen("/proc/net/dev", "r"); + fgets(temp, 128, fp); + fgets(temp, 128, fp); + + input = -1; + output = -1; + i = 0; + found = -1; + + p = strtok(temp, tokens); + do { + if (!(strcmp(p, "packets"))) { + if (input == -1) input = i; + else output = i; + } + i++; + p = strtok(NULL, tokens); + } while (input == -1 || output == -1); + + while (fgets(temp, 128, fp)) { + if (strstr(temp, devname)) { + found = 0; + p = strtok(temp, tokens); + i = 0; + do { + if (i == input) { + *ip = *is = atoi(p); + input = -1; + } + if (i == output) { + *op = *os = atoi(p); + output = -1; + } + i++; + p = strtok(NULL, tokens); + } while (input != -1 || output != -1); + } + } + fclose(fp); + + return found; +} + +/*******************************************************************************\ +|* stillonline *| +\*******************************************************************************/ + +int stillonline(char *ifs) { + + FILE *fp; + char temp[128]; + int i; + + i = 0; + fp = fopen("/proc/net/route", "r"); + if (fp) { + while (fgets(temp, 128, fp)) { + if (strstr(temp, ifs)) { + i = 1; /* Line is alive */ + } + } + fclose(fp); + } + return i; +} + +/*******************************************************************************\ +|* checknetdevs *| +\*******************************************************************************/ + +int checknetdevs(void) { + + FILE *fd; + char temp[128]; + char *p; + int i=0,j; + int k; + int devsfound=0; + char *tokens = " :\t\n"; + char foundbuffer[MAX_STAT_DEVICES][8]; + + for (i=0; i pixels_per_byte) + pixels_per_byte = p[0] + p[1]; + p += 2; + } + + pixels_per_byte /= size; + p = his; + + for (k=0; k\n"); + fprintf(stderr, "\t-h\tthis help screen\n"); + fprintf(stderr, "\t-i \tdefault (as it appears in /proc/net/route)\n"); + fprintf(stderr, "\t-v\tprint the version number\n"); + fprintf(stderr, "\t-w\twaveform load\n"); + fprintf(stderr, "\n"); +} + +/*******************************************************************************\ +|* printversion *| +\*******************************************************************************/ + +void printversion(void) { + + fprintf(stderr, "%s\n", WMIFS_VERSION); +} + +/*******************************************************************************\ +|* get_ppp_stats *| +\*******************************************************************************/ + +void get_ppp_stats(struct ppp_stats *cur) { + + struct ifpppstatsreq req; + + memset(&req, 0, sizeof(req)); + + req.stats_ptr = (caddr_t) &req.stats; + + sprintf(req.ifr__name, "ppp%d", PPP_UNIT); + + if (ioctl(ppp_h, SIOCGPPPSTATS, &req) < 0) { + fprintf(stderr, "heyho!\n"); + } + + *cur = req.stats; +} + +#define LED_SZE_X (4) +#define LED_SZE_Y (4) + +#define LED_ON_NET_X (87) +#define LED_ON_NET_Y (66) +#define LED_OFF_NET_X (93) +#define LED_OFF_NET_Y (66) +#define LED_ERR_NET_X (81) +#define LED_ERR_NET_Y (66) +#define LED_ON_SW_NET_X (49) +#define LED_ON_SW_NET_Y (85) +#define LED_OFF_SW_NET_X (44) +#define LED_OFF_SW_NET_Y (85) + +#define LED_PWR_X (53) +#define LED_PWR_Y (7) +#define LED_SND_X (47) +#define LED_SND_Y (7) +#define LED_RCV_X (41) +#define LED_RCV_Y (7) + +#define LED_SW_X (38) +#define LED_SW_Y (14) + +/*******************************************************************************\ +|* SetOnLED *| +\*******************************************************************************/ +void SetOnLED(int led) { + + switch (led) { + + case LED_NET_RX: + copyXPMArea(LED_ON_NET_X, LED_ON_NET_Y, LED_SZE_X, LED_SZE_Y, LED_RCV_X, LED_RCV_Y); + break; + case LED_NET_TX: + copyXPMArea(LED_ON_NET_X, LED_ON_NET_Y, LED_SZE_X, LED_SZE_Y, LED_SND_X, LED_SND_Y); + break; + case LED_NET_POWER: + copyXPMArea(LED_ON_NET_X, LED_ON_NET_Y, LED_SZE_X, LED_SZE_Y, LED_PWR_X, LED_PWR_Y); + break; + } +} + +/*******************************************************************************\ +|* SetOffLED *| +\*******************************************************************************/ +void SetOffLED(int led) { + + switch (led) { + + case LED_NET_RX: + copyXPMArea(LED_OFF_NET_X, LED_OFF_NET_Y, LED_SZE_X, LED_SZE_Y, LED_RCV_X, LED_RCV_Y); + break; + case LED_NET_TX: + copyXPMArea(LED_OFF_NET_X, LED_OFF_NET_Y, LED_SZE_X, LED_SZE_Y, LED_SND_X, LED_SND_Y); + break; + case LED_NET_POWER: + copyXPMArea(LED_OFF_NET_X, LED_OFF_NET_Y, LED_SZE_X, LED_SZE_Y, LED_PWR_X, LED_PWR_Y); + break; + } +} + +/*******************************************************************************\ +|* SetErrLED *| +\*******************************************************************************/ +void SetErrLED(int led) { + + switch (led) { + case LED_NET_POWER: + copyXPMArea(LED_ERR_NET_X, LED_ERR_NET_Y, LED_SZE_X, LED_SZE_Y, LED_PWR_X, LED_PWR_Y); + break; + } +} diff --git a/wmifs/wmifs/wmifs-mask.xbm b/wmifs/wmifs/wmifs-mask.xbm new file mode 100644 index 0000000..8599f49 --- /dev/null +++ b/wmifs/wmifs/wmifs-mask.xbm @@ -0,0 +1,71 @@ +#define wmifs_mask_width 64 +#define wmifs_mask_height 64 +static char wmifs_mask_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + + 0xf0, 0xff, 0xff, 0xff, 0x9f, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0x9f, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0x9f, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0x9f, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0x9f, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0x9f, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0x9f, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0x9f, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0x9f, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0x9f, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0x9f, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0x9f, 0xff, 0xff, 0x0f, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/wmifs/wmifs/wmifs-master.xpm b/wmifs/wmifs/wmifs-master.xpm new file mode 100644 index 0000000..720a159 --- /dev/null +++ b/wmifs/wmifs/wmifs-master.xpm @@ -0,0 +1,115 @@ +/* XPM */ +static char * wmifs_master_xpm[] = { +"160 100 12 1", +" c #00000000FFFF", +". c #208120812081", +"X c #000000000000", +"o c #C71BC30BC71B", +"O c #28A23CF338E3", +"+ c #2081B2CAAEBA", +"@ c #000049244103", +"# c #18618A288617", +"$ c #B6DA04101861", +"% c #0000EBAD0000", +"& c #F7DEF3CEFFFF", +"* c #71C6E38D71C6", +" . ", +" . ", +" . ", +" . ", +" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX . ", +" X...............................o X...................o . ", +" X...............................o X...................o . ", +" X...............................o X..OO....OO....OO...o . ", +" X...............................o X.OOOO..OOOO..OOOO..o . ", +" X...............................o X.OOOO..OOOO..OOOO..o . ", +" X...............................o X..OO....OO....OO...o . ", +" X...............................o X...................o . ", +" X...............................o X...................o . ", +" X...............................o X...................o . ", +" X...............................o X...................o . ", +" ooooooooooooooooooooooooooooooooo ooooooooooooooooooooo . ", +" . ", +" . ", +" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" X......................................................o . ", +" oooooooooooooooooooooooooooooooooooooooooooooooooooooooo . ", +" . ", +" . ", +" . ", +" . ", +"............................................................................... ", +"..+++...@@@#.#+++#.#+++#.#@@@#.#+++#.#+++#.#+++#.#+++#.#+++#................... ", +".+...+.@...+.@...+.@...+.+...+.+...@.+...@.@...+.+...+.+...+............+...... .$$. .%%. .OO. ", +".+...+.@...+.@...+.@...+.+...+.+...@.+...@.@...+.+...+.+...+.......+....+...... $&$$ %&%% OOOO ", +".#@@@#..@@@#.#+++#..+++#.#+++#.#+++#.#+++#..@@@#.#+++#.#+++#..#+...#...+....... $$$$ %%%% OOOO .+#* ", +".+...+.@...+.+...@.@...+.@...+.@...+.+...+.@...+.+...+.@...+...........+....... .$$. .%%. .OO. ", +".+...+.@...+.+...@.@...+.@...+.@...+.+...+.@...+.+...+.@...+.......+..+........ ", +"..+++...@@@#.#+++#.#+++#..@@@#.#+++#.#+++#..@@@#.#+++#.#+++#.......#..+........ ", +"............................................................................... ", +" ", +"................................................................................................................................................................", +".@+++@.#+++...+++#.#+++..#+++#.#+++#.#+++#.#@@@#..@@@#..@@@#.#@@@#.#@@@..+@@@+.#+++..#+++#.#+++#.#+++#.#+++#.#+++#.#+++#.#@@@#.#@@@#.#@@@#.#@@@#.#@@@#.#+++#....", +".+...+.+...+.+...@.+...+.+...@.+...@.+...@.+...+.@...+.@...+.+...+.+...@.++.++.+...+.+...+.+...+.+...+.+...+.+...@.@.+.@.+...+.+...+.+...+.+...+.+...+.@...+....", +".+...+.+...+.+...@.+...+.+...@.+...@.+...@.+...+.@...+.@...+.+...+.+...@.+.+.+.+...+.+...+.+...+.+...+.+...+.+...@.@.+.@.+...+.+...+.+...+..+.+..+...+.@..+@....", +".#+++#.#+++..#@@@..#@@@#.#+++..#+++..#@#+#.#+++#..@@@#..@@@#.#+++..#@@@..#@@@#.#@@@#.#@@@#.#+++#.#+@@#.#+++..#+++#..@#@..#@@@#.#@@@#.#@@@#...+...#+++#..@+@.....", +".+...+.+...+.+...@.+...+.+...@.+...@.+...+.+...+.@...+.@...+.+...+.+...@.+...+.+...+.+...+.+...@.+.+.+.+...+.@...+.@.+.@.+...+.+...+.+.+.+..+.+..@...+.@+..@....", +".+...+.+...+.+...@.+...+.+...@.+...@.+...+.+...+.@...+.@...+.+...+.+...@.+...+.+...+.+...+.+...@.+..++.+...+.@...+.@.+.@.+...+.+...+.++.++.+...+.@...+.+...@....", +".#@@@#.#+++...+++#.#+++..#+++#.#@@@..#+++#.#@@@#..@@@#.#+++#.#@@@#.#+++#.#@@@#.#@@@#.#+++#.#@@@..#+++#.#@@@#.#+++#..@#@..#++++..+++..#@@@#.#@@@#.#+++#.#+++#....", +"................................................................................................................................................................", +" ", +" X...............................o X...................o . ", +" ............................... ", +" ............................... ", +" ............................... ", +" ............................... ", +" ............................... ", +" ............................... ", +" ............................... ", +" ............................... ", +" ............................... ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/wmifs/wmifs/wmifs.c b/wmifs/wmifs/wmifs.c new file mode 100644 index 0000000..ebdf12b --- /dev/null +++ b/wmifs/wmifs/wmifs.c @@ -0,0 +1,932 @@ +/* + Best viewed with vim5, using ts=4 + + This code was mainly put together by looking at the + following programs: + + asclock + A neat piece of equip, used to display the date + and time on the screen. + Comes with every AfterStep installation. + + Source used: + How do I create a not so solid window? + How do I open a window? + How do I use pixmaps? + + pppstats + A program that prints the amount of data that + is transferred over a ppp-line. + + Source used: + How do I read the ppp device? + ------------------------------------------------------------ + + Author: Martijn Pieterse (pieterse@xs4all.nl) + + This program was hacked together between the 7th of March + and the 14th of March 1998. + + This program might be Y2K resistant. We shall see. :) + + This program is distributed under the GPL license. + (as were asclock and pppstats) + + Known Features: (or in non M$ talk, BUGS) + * only ppp0 will be read + use wmifs if you want to read more than one ppp connection + not sure about this. + * the leds won't be reliable with + more than 1 ppp connection + * there is an iconwin, and win variable. + I have no clue why only win shouldn't + be enough. Will check it out later. + * The afterstep what seems the shift the + pixmap a bit. Don't know how and why. + It works in the WindowManager. + + Things to do: + Split up main() + + ---- + Thanks + ---- + + Most of the ideas, and jumpstarting it: + + #linuxnl, without this irc-channel wmppp would've never seen the light! + + CCC (Constructive Code Criticism): + + Marcelo E. Magallon + Thanks a LOT! It takes a while to get me convinced... :) + + + Minor bugs and ideas: + + Marc De Scheemaecker / David Mihm / Chris Soghoian / + Alessandro Usseglio Viretta + + and ofcourse numerous ppl who send us bug reports. + (numerous? hmm.. todo: rephrase this :) ) + + + ---- + Changes: + --- + 04/05/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Changed the "middle of the waveform" line color + * Moved the RedrawWindow out of the main loop. + Lightens the system load + 02/05/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Torn wmppp and wmifs apart. + This is gonna be wmifs + * Added parse_rcfile + * Added waitpid, to get rid of the zombies, spotteb by Alessandro Usseglio Viretta + 30/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Used the DrawStats routine from wmifs in wmppp + * I decided to add a list in this source file + with name of ppl who helped me build this code better. + * I finally removed the /proc/net/route dependancy + All of the connections are taken from /proc/net/dev. + /proc/net/route is still used for checking if it is on-line. + 27/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * WMIFS: stats scrolled, while red led burning + * WMPPP: changed positions of line speed + 25/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Changed the checknetdevs routine, a lot! + 23/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Added line speed detection. via seperate exec. (this has to be suid root!) + Speed has to be no more than 99999 + * Added speed and forcespeed in ~/.wmppprc and /etc/wmppprc + * wmifs: added on-line detection scheme, update the bitmap coordinates + * wmppp: the x-button now allways disconnects. + 22/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Added /etc/wmppprc support, including "forced" mode. + * Added /etc/wmifsrc support, including "forced" mode. + 21/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Moved the stats one pixel down. + * Added status led in wmifs. + * Changed RX/TX leds of wmifs to resemble wmppp + * Added the "dot" between eth.0 ppp.0 etc. + * Changed to wmifs stats to match wmppp stats (only pppX changed) + * Made sure that when specified -t 1, it stayed that way, even + when longer than 100 minutes online + * With -t 1, jump from 59:59 to 01:00 instead of 99:59 to 01:40 + 16/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Added "all" devices in wmifs + * Added "lo" support only if aked via -i + * Added on-line time detection (using /var/run/ppp0.pid) + * Added time-out for the orange led. (one minute) + 15/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Another wmppp-master.xpm. + Line speed detection being the main problem here.. :( + * Moved START_COMMAND / STOP_COMMAND to ~/.wmppprc + Return 0, everything went ok. + Return 10, the command did not work. + Please note, these functions are ran in the background. + * Removed the ability to configure + * When "v" is clicked, an orange led will appear. + if the connect script fails (return value == 10) + it will become dark again. Else the on-line detection will + pick it up, and "green" it. + 14/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Added "-timer" + * Added "-display" support + * Changed pixmap to a no-name pixmap. + + Changed LED positions + + Changed Timer position + + Changed Stats Size + 05/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Added ~/.wmifsrc support. + * Put some code in DrawStats + * Check devices when pressing "device change" + 03/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Added code for wmifs + 28/03/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * forgot what i did.. :) + 27/03/1998 (Martijn Pieterse, pieterse@xs4all.nl) + * Added on-line detection + Scan through /proc/net/route and check everye line + for "ppp". + * A bit of code clean-up. +*/ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +#include "../wmgeneral/wmgeneral.h" +#include "../wmgeneral/misc.h" + +#include "wmifs-master.xpm" +#include "wmifs-mask.xbm" + + /***********/ + /* Defines */ +/***********/ + +/* Fill in the hardcoded actions */ +#define LEFT_ACTION (NULL) +#define MIDDLE_ACTION (NULL) +#define RIGHT_ACTION (NULL) + +/* Defines voor alle coordinate */ + +#define LED_NET_RX (4) +#define LED_NET_TX (5) +#define LED_NET_POWER (6) + +#define WMIFS_VERSION "1.2.1" + + /**********************/ + /* External Variables */ +/**********************/ + +extern char **environ; + + /********************/ + /* Global Variables */ +/********************/ + +char *ProgName; +char *active_interface = NULL; +int TimerDivisor=60; +int WaveForm=0; + + /*****************/ + /* PPP variables */ +/*****************/ + +#define PPP_UNIT 0 +int ppp_h = -1; + +#define PPP_STATS_HIS 54 + + /***********************/ + /* Function Prototypes */ +/***********************/ + +void usage(void); +void printversion(void); +void DrawTime(int, int); +void DrawStats(int *, int, int, int, int); + +void SetOnLED(int); +void SetErrLED(int); +void SetWaitLED(int); +void SetOffLED(int); + +void ButtonUp(int); +void ButtonDown(int); + +void wmifs_routine(int, char **); + +void get_ppp_stats(struct ppp_stats *cur); + + + /********/ + /* Main */ +/********/ + +void main(int argc, char *argv[]) { + + int i; + + + /* Parse Command Line */ + + ProgName = argv[0]; + if (strlen(ProgName) >= 5) + ProgName += (strlen(ProgName) - 5); + + for (i=1; i Button */ + AddMouseRegion(0, 5, 5, 35, 15); + AddMouseRegion(1, 5, 20, 58, 58); + + starttime = time(0); + nexttime = starttime + 5; + + for (i=0; i= nexttime) { + nexttime+=5; + + for (i=0; i= 0) { + switch (but_stat) { + case 0 : + /* re-read the table */ + strcpy(temp, stat_devices[stat_current].name); + stat_online = checknetdevs(); + stat_current = 0; + for (i=0; i= '0' && name[strlen(name)-1] <= '9') { + copyXPMArea(61, 64, 4, 9, k, 5); + k+=4; + } + c = toupper(name[i]); + if (c >= 'A' && c <= 'Z') { + c -= 'A'; + copyXPMArea(c * 6, 74, 6, 9, k, 5); + k += 6; + } else { + c -= '0'; + copyXPMArea(c * 6, 64, 6, 9, k, 5); + k += 6; + } + } + +} + +/*******************************************************************************\ +|* get_statistics *| +\*******************************************************************************/ + +int get_statistics(char *devname, long *ip, long *op, long *is, long *os) { + + FILE *fp; + char temp[128]; + char *p; + char *tokens = " |:\n"; + int input, output; + int i; + int found; + struct ppp_stats ppp_cur, ppp_old; + static int ppp_opened = 0; + + + if (!strncmp(devname, "ppp", 3)) { + if (!ppp_opened) { + /* Open the ppp device. */ + memset(&ppp_cur, 0, sizeof(ppp_cur)); + if ((ppp_h = socket(AF_INET, SOCK_DGRAM, 0)) < 0) + return -1; + get_ppp_stats(&ppp_cur); + ppp_old = ppp_cur; + ppp_opened = 1; + } + + get_ppp_stats(&ppp_cur); + + *op = ppp_cur.p.ppp_opackets; + *ip = ppp_cur.p.ppp_ipackets; + + *is = ppp_cur.p.ppp_ibytes; + *os = ppp_cur.p.ppp_obytes; + + return 0; + } + + /* Read from /proc/net/dev the stats! */ + fp = fopen("/proc/net/dev", "r"); + fgets(temp, 128, fp); + fgets(temp, 128, fp); + + input = -1; + output = -1; + i = 0; + found = -1; + + p = strtok(temp, tokens); + do { + if (!(strcmp(p, "packets"))) { + if (input == -1) input = i; + else output = i; + } + i++; + p = strtok(NULL, tokens); + } while (input == -1 || output == -1); + + while (fgets(temp, 128, fp)) { + if (strstr(temp, devname)) { + found = 0; + p = strtok(temp, tokens); + i = 0; + do { + if (i == input) { + *ip = *is = atoi(p); + input = -1; + } + if (i == output) { + *op = *os = atoi(p); + output = -1; + } + i++; + p = strtok(NULL, tokens); + } while (input != -1 || output != -1); + } + } + fclose(fp); + + return found; +} + +/*******************************************************************************\ +|* stillonline *| +\*******************************************************************************/ + +int stillonline(char *ifs) { + + FILE *fp; + char temp[128]; + int i; + + i = 0; + fp = fopen("/proc/net/route", "r"); + if (fp) { + while (fgets(temp, 128, fp)) { + if (strstr(temp, ifs)) { + i = 1; /* Line is alive */ + } + } + fclose(fp); + } + return i; +} + +/*******************************************************************************\ +|* checknetdevs *| +\*******************************************************************************/ + +int checknetdevs(void) { + + FILE *fd; + char temp[128]; + char *p; + int i=0,j; + int k; + int devsfound=0; + char *tokens = " :\t\n"; + char foundbuffer[MAX_STAT_DEVICES][8]; + + for (i=0; i pixels_per_byte) + pixels_per_byte = p[0] + p[1]; + p += 2; + } + + pixels_per_byte /= size; + p = his; + + for (k=0; k\n"); + fprintf(stderr, "\t-h\tthis help screen\n"); + fprintf(stderr, "\t-i \tdefault (as it appears in /proc/net/route)\n"); + fprintf(stderr, "\t-v\tprint the version number\n"); + fprintf(stderr, "\t-w\twaveform load\n"); + fprintf(stderr, "\n"); +} + +/*******************************************************************************\ +|* printversion *| +\*******************************************************************************/ + +void printversion(void) { + + fprintf(stderr, "%s\n", WMIFS_VERSION); +} + +/*******************************************************************************\ +|* get_ppp_stats *| +\*******************************************************************************/ + +void get_ppp_stats(struct ppp_stats *cur) { + + struct ifpppstatsreq req; + + memset(&req, 0, sizeof(req)); + + req.stats_ptr = (caddr_t) &req.stats; + + sprintf(req.ifr__name, "ppp%d", PPP_UNIT); + + if (ioctl(ppp_h, SIOCGPPPSTATS, &req) < 0) { + fprintf(stderr, "heyho!\n"); + } + + *cur = req.stats; +} + +#define LED_SZE_X (4) +#define LED_SZE_Y (4) + +#define LED_ON_NET_X (87) +#define LED_ON_NET_Y (66) +#define LED_OFF_NET_X (93) +#define LED_OFF_NET_Y (66) +#define LED_ERR_NET_X (81) +#define LED_ERR_NET_Y (66) +#define LED_ON_SW_NET_X (49) +#define LED_ON_SW_NET_Y (85) +#define LED_OFF_SW_NET_X (44) +#define LED_OFF_SW_NET_Y (85) + +#define LED_PWR_X (53) +#define LED_PWR_Y (7) +#define LED_SND_X (47) +#define LED_SND_Y (7) +#define LED_RCV_X (41) +#define LED_RCV_Y (7) + +#define LED_SW_X (38) +#define LED_SW_Y (14) + +/*******************************************************************************\ +|* SetOnLED *| +\*******************************************************************************/ +void SetOnLED(int led) { + + switch (led) { + + case LED_NET_RX: + copyXPMArea(LED_ON_NET_X, LED_ON_NET_Y, LED_SZE_X, LED_SZE_Y, LED_RCV_X, LED_RCV_Y); + break; + case LED_NET_TX: + copyXPMArea(LED_ON_NET_X, LED_ON_NET_Y, LED_SZE_X, LED_SZE_Y, LED_SND_X, LED_SND_Y); + break; + case LED_NET_POWER: + copyXPMArea(LED_ON_NET_X, LED_ON_NET_Y, LED_SZE_X, LED_SZE_Y, LED_PWR_X, LED_PWR_Y); + break; + } +} + +/*******************************************************************************\ +|* SetOffLED *| +\*******************************************************************************/ +void SetOffLED(int led) { + + switch (led) { + + case LED_NET_RX: + copyXPMArea(LED_OFF_NET_X, LED_OFF_NET_Y, LED_SZE_X, LED_SZE_Y, LED_RCV_X, LED_RCV_Y); + break; + case LED_NET_TX: + copyXPMArea(LED_OFF_NET_X, LED_OFF_NET_Y, LED_SZE_X, LED_SZE_Y, LED_SND_X, LED_SND_Y); + break; + case LED_NET_POWER: + copyXPMArea(LED_OFF_NET_X, LED_OFF_NET_Y, LED_SZE_X, LED_SZE_Y, LED_PWR_X, LED_PWR_Y); + break; + } +} + +/*******************************************************************************\ +|* SetErrLED *| +\*******************************************************************************/ +void SetErrLED(int led) { + + switch (led) { + case LED_NET_POWER: + copyXPMArea(LED_ERR_NET_X, LED_ERR_NET_Y, LED_SZE_X, LED_SZE_Y, LED_PWR_X, LED_PWR_Y); + break; + } +}