diff options
| -rw-r--r-- | COPYING | 622 | ||||
| -rw-r--r-- | Makefile.am | 19 | ||||
| -rw-r--r-- | Makefile.in | 53 | ||||
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | ethereal.c | 22 | ||||
| -rw-r--r-- | ethereal.h | 3 | ||||
| -rw-r--r-- | ethertype.c | 6 | ||||
| -rw-r--r-- | filter.c | 7 | ||||
| -rw-r--r-- | image/icon-ethereal.xpm | 80 | ||||
| -rw-r--r-- | menu.c | 5 | ||||
| -rw-r--r-- | packet-aarp.c | 158 | ||||
| -rw-r--r-- | packet-arp.c | 8 | ||||
| -rw-r--r-- | packet-atalk.c | 122 | ||||
| -rw-r--r-- | packet-ip.c | 21 | ||||
| -rw-r--r-- | packet.c | 9 | ||||
| -rw-r--r-- | packet.h | 5 | ||||
| -rw-r--r-- | prefs.c | 6 | ||||
| -rw-r--r-- | util.c | 28 | ||||
| -rw-r--r-- | util.h | 4 |
19 files changed, 732 insertions, 453 deletions
@@ -1,25 +1,22 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. +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 @@ -30,347 +27,195 @@ 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 library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain +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 -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - +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 companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. +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. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. +modification follow. - GNU LIBRARY GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, 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 library. - - Activities other than copying, distribution and modification are not + 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 a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete 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 distribute a copy of this License along with the -Library. - - 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 Library or any portion -of it, thus forming a work based on the Library, and copy and +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) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices + a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - + 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 Library, +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 Library, the distribution of the whole must be on the terms of +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. +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 Library. +collective works based on the Program. -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of +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 opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you 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. - - If distribution of 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 satisfies the requirement to -distribute the source code, even though third parties are not + 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. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - c) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - d) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. 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. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library 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. - - 9. You are not required to accept this License, since you have not + 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 Library or its derivative works. These actions are +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 Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and +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 Library or works based on it. +the Program or works based on it. - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further + 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. - - 11. If, as a consequence of a court judgment or allegation of patent + + 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 Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by +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 Library. +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. +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 +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 @@ -380,103 +225,116 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library 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. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Library 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 Library -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 Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -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. + 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 - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "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 -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. 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 LIBRARY 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 -LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Libraries + How to Apply These Terms to Your New Programs - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). + 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 apply these terms, attach the following notices to the library. 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. + 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. - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library 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 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 library is distributed in the hope that it will be useful, + 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 - Library General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307 USA. Also add information on how to contact you by electronic and paper mail. +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 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 library, if +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 - library `Frob' (a library for tweaking knobs) written by James Random Hacker. + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. - <signature of Ty Coon>, 1 April 1990 + <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice -That's all there is to it! +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/Makefile.am b/Makefile.am index c88d2cf50c..edef16f148 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,9 @@ ethereal_SOURCES = \ follow.c \ menu.c \ packet.c \ + packet-aarp.c \ packet-arp.c \ + packet-atalk.c \ packet-bootp.c \ packet-data.c \ packet-dns.c \ @@ -52,8 +54,10 @@ ethereal_SOURCES = \ follow.h \ menu.h \ packet.h \ + packet-dns.h \ packet-ipv6.h \ packet-ipx.h \ + packet-ncp.h \ packet-ospf.h \ packet-rip.h \ packet-vines.h \ @@ -81,11 +85,12 @@ DISTCLEANFILES = \ rdps \ ps.c -EXTRA_DIST = \ - doc/Makefile \ - doc/ethereal.pod \ - ethereal.1 \ - image/icon-excl.xpm \ - manuf \ - print.ps \ +EXTRA_DIST = \ + doc/Makefile \ + doc/ethereal.pod \ + ethereal.1 \ + image/icon-excl.xpm \ + image/icon-ethereal.xpm \ + manuf \ + print.ps \ rdps.c diff --git a/Makefile.in b/Makefile.in index 1940f9ce36..ce37b949d6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -85,7 +85,9 @@ ethereal_SOURCES = \ follow.c \ menu.c \ packet.c \ + packet-aarp.c \ packet-arp.c \ + packet-atalk.c \ packet-bootp.c \ packet-data.c \ packet-dns.c \ @@ -124,8 +126,10 @@ ethereal_SOURCES = \ follow.h \ menu.h \ packet.h \ + packet-dns.h \ packet-ipv6.h \ packet-ipx.h \ + packet-ncp.h \ packet-ospf.h \ packet-rip.h \ packet-vines.h \ @@ -147,13 +151,14 @@ DISTCLEANFILES = \ rdps \ ps.c -EXTRA_DIST = \ - doc/Makefile \ - doc/ethereal.pod \ - ethereal.1 \ - image/icon-excl.xpm \ - manuf \ - print.ps \ +EXTRA_DIST = \ + doc/Makefile \ + doc/ethereal.pod \ + ethereal.1 \ + image/icon-excl.xpm \ + image/icon-ethereal.xpm \ + manuf \ + print.ps \ rdps.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -167,12 +172,13 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ethereal_OBJECTS = capture.o ethereal.o ethertype.o file.o filter.o \ -follow.o menu.o packet.o packet-arp.o packet-bootp.o packet-data.o \ -packet-dns.o packet-eth.o packet-fddi.o packet-llc.o packet-lpd.o \ -packet-ip.o packet-ipv6.o packet-ipx.o packet-nbipx.o packet-nbns.o \ -packet-ncp.o packet-null.o packet-osi.o packet-ospf.o packet-ppp.o \ -packet-raw.o packet-rip.o packet-tcp.o packet-tr.o packet-trmac.o \ -packet-udp.o packet-vines.o prefs.o print.o ps.o resolv.o util.o +follow.o menu.o packet.o packet-aarp.o packet-arp.o packet-atalk.o \ +packet-bootp.o packet-data.o packet-dns.o packet-eth.o packet-fddi.o \ +packet-llc.o packet-lpd.o packet-ip.o packet-ipv6.o packet-ipx.o \ +packet-nbipx.o packet-nbns.o packet-ncp.o packet-null.o packet-osi.o \ +packet-ospf.o packet-ppp.o packet-raw.o packet-rip.o packet-tcp.o \ +packet-tr.o packet-trmac.o packet-udp.o packet-vines.o prefs.o print.o \ +ps.o resolv.o util.o ethereal_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @@ -195,16 +201,17 @@ TAR = tar GZIP = --best DEP_FILES = .deps/capture.P .deps/ethereal.P .deps/ethertype.P \ .deps/file.P .deps/filter.P .deps/follow.P .deps/menu.P \ -.deps/packet-arp.P .deps/packet-bootp.P .deps/packet-data.P \ -.deps/packet-dns.P .deps/packet-eth.P .deps/packet-fddi.P \ -.deps/packet-ip.P .deps/packet-ipv6.P .deps/packet-ipx.P \ -.deps/packet-llc.P .deps/packet-lpd.P .deps/packet-nbipx.P \ -.deps/packet-nbns.P .deps/packet-ncp.P .deps/packet-null.P \ -.deps/packet-osi.P .deps/packet-ospf.P .deps/packet-ppp.P \ -.deps/packet-raw.P .deps/packet-rip.P .deps/packet-tcp.P \ -.deps/packet-tr.P .deps/packet-trmac.P .deps/packet-udp.P \ -.deps/packet-vines.P .deps/packet.P .deps/prefs.P .deps/print.P \ -.deps/ps.P .deps/resolv.P .deps/snprintf.P .deps/util.P +.deps/packet-aarp.P .deps/packet-arp.P .deps/packet-atalk.P \ +.deps/packet-bootp.P .deps/packet-data.P .deps/packet-dns.P \ +.deps/packet-eth.P .deps/packet-fddi.P .deps/packet-ip.P \ +.deps/packet-ipv6.P .deps/packet-ipx.P .deps/packet-llc.P \ +.deps/packet-lpd.P .deps/packet-nbipx.P .deps/packet-nbns.P \ +.deps/packet-ncp.P .deps/packet-null.P .deps/packet-osi.P \ +.deps/packet-ospf.P .deps/packet-ppp.P .deps/packet-raw.P \ +.deps/packet-rip.P .deps/packet-tcp.P .deps/packet-tr.P \ +.deps/packet-trmac.P .deps/packet-udp.P .deps/packet-vines.P \ +.deps/packet.P .deps/prefs.P .deps/print.P .deps/ps.P .deps/resolv.P \ +.deps/snprintf.P .deps/util.P SOURCES = $(ethereal_SOURCES) $(EXTRA_ethereal_SOURCES) OBJECTS = $(ethereal_OBJECTS) @@ -1,3 +1,10 @@ +Overview of changes in Ethereal 0.4.1: +* Copious amount of fixes (Guy) +* Minor fixes to the filter prefs dialog (Gerald) +* About box (Laurent) +* Initial NetBIOS Name Services support (Gilbert, Guy) +* Initial AppleTalk support (Simon Wilkinson) + Overview of changes in Ethereal 0.4.0: * Lots of fixes from Guy Harris diff --git a/ethereal.c b/ethereal.c index 9ad8af75ab..5e890afef7 100644 --- a/ethereal.c +++ b/ethereal.c @@ -1,6 +1,6 @@ /* ethereal.c * - * $Id: ethereal.c,v 1.6 1998/10/14 19:34:57 guy Exp $ + * $Id: ethereal.c,v 1.7 1998/10/16 01:18:26 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -82,6 +82,23 @@ ts_type timestamp_type = RELATIVE; #define E_DFILTER_TE_KEY "display_filter_te" +/* About Ethereal window */ +void +about_ethereal( GtkWidget *w, gpointer data ) { + simple_dialog(ESD_TYPE_INFO, NULL, + "GNU Ethereal - network protocol analyzer\n" + "Version %s (C) 1998 Gerald Combs <gerald@zing.org>\n\n" + "Contributors:\n" + "Gilbert Ramirez Jr. <gram@verdict.uthscsa.edu>\n" + "Hannes R. Boehm <hannes@boehm.org>\n" + "Mike Hall <mlh@io.com>\n" + "Bobo Rajec <bobo@bsp-consulting.sk>\n" + "Laurent Deniel <deniel@worldnet.fr>\n" + "Don Lafontaine <lafont02@cn.ca>\n" + "Guy Harris <guy@netapp.com>\n\n" + "See http://ethereal.zing.org for more information", VERSION); +} + /* Things to do when the OK button is pressed */ void file_sel_ok_cb(GtkWidget *w, GtkFileSelection *fs) { @@ -251,7 +268,8 @@ file_print_cmd_cb(GtkWidget *widget, gpointer data) { void packet_list_select_cb(GtkWidget *w, gint row, gint col, gpointer evt) { GList *l; - + + if (cf.pfh) return; blank_packetinfo(); gtk_text_freeze(GTK_TEXT(byte_view)); gtk_text_set_point(GTK_TEXT(byte_view), 0); diff --git a/ethereal.h b/ethereal.h index 7dad337227..ded1e7d452 100644 --- a/ethereal.h +++ b/ethereal.h @@ -1,7 +1,7 @@ /* ethereal.h * Global defines, etc. * - * $Id: ethereal.h,v 1.6 1998/10/12 01:40:48 gerald Exp $ + * $Id: ethereal.h,v 1.7 1998/10/16 01:18:27 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -94,6 +94,7 @@ typedef enum { extern ts_type timestamp_type; +void about_ethereal( GtkWidget *, gpointer); void file_sel_ok_cb(GtkWidget *, GtkFileSelection *); void blank_packetinfo(); gint file_progress_cb(gpointer); diff --git a/ethertype.c b/ethertype.c index 38b2118beb..e2c04c31e7 100644 --- a/ethertype.c +++ b/ethertype.c @@ -2,7 +2,7 @@ * Routines for calling the right protocol for the ethertype. * This is called by both packet-eth.c (Ethernet II) and packet-llc.c (SNAP) * - * $Id: ethertype.c,v 1.5 1998/10/10 03:32:06 gerald Exp $ + * $Id: ethertype.c,v 1.6 1998/10/16 01:18:28 gerald Exp $ * * Gilbert Ramirez <gram@verdict.uthscsa.edu> * @@ -85,14 +85,14 @@ ethertype(guint16 etype, int offset, add_item_to_tree(fh_tree, offset - 2, 2, "Type: AppleTalk (0x%04x)", etype); } - if (fd->win_info[COL_NUM]) { strcpy(fd->win_info[COL_PROTOCOL], etype_str[3]); } + dissect_ddp(pd, offset, fd, tree); break; case ETHERTYPE_AARP: if (tree) { add_item_to_tree(fh_tree, offset - 2, 2, "Type: AARP (0x%04x)", etype); } - if (fd->win_info[COL_NUM]) { strcpy(fd->win_info[COL_PROTOCOL], etype_str[4]); } + dissect_aarp(pd, offset, fd, tree); break; case ETHERTYPE_IPX: if (tree) { @@ -1,7 +1,7 @@ /* filter.c * Routines for managing filter sets * - * $Id: filter.c,v 1.7 1998/10/13 07:03:33 guy Exp $ + * $Id: filter.c,v 1.8 1998/10/16 01:18:28 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -224,7 +224,12 @@ filter_prefs_show(GtkWidget *w) { gtk_widget_show(filter_te); if (l_select) + { gtk_list_select_child(GTK_LIST(filter_l), l_select); + } else if (filter_te_str && filter_te_str[0]) { + gtk_entry_set_text(GTK_ENTRY(name_te), "New filter"); + gtk_entry_set_text(GTK_ENTRY(filter_te), filter_te_str); + } return(main_vb); } diff --git a/image/icon-ethereal.xpm b/image/icon-ethereal.xpm new file mode 100644 index 0000000000..2529c21fbc --- /dev/null +++ b/image/icon-ethereal.xpm @@ -0,0 +1,80 @@ +/* XPM */ +static char *icon_ethereal_xpm[] = { +/* width height num_colors chars_per_pixel */ +" 66 63 10 1", +/* colors */ +". c #000000", +"# c #181c18", +"a c #383838", +"b c #505450", +"c c #707070", +"d c #888c88", +"e c #a8a8a8", +"f c #c0c4c0", +"g c #e0e0e0", +"h c #f8fcf8", +/* pixels */ +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhfeddbcddfghhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhheb#..........acfhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhgc#................adhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhgb#....................ehhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhe#......................dhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhgc.........#bcddddca#.....dhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhga.......adfhhhhhhhhhgfc##bhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhga......adhhhhhhhhhhhhhhhhghhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhga......cghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhb.....#ehhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhd......ehhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhf#.....ehhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhha.....ehhhhhhhhhhhhhhhhhhhheaadhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhf.....chhhhhhhhhhhhhhhhhhhda....ehhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhb....aghhhhhhhhhhhhhhhhhda......dhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhf#....ehhhhhhhhhhhhhhhhda........dhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhc....bhhhhhhhhhhhhhhhda.........bhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhh#....fhhhhhhhhhhhhhda.........bfhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhf....aghhhhhhhhhhhda.........bfhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhd....bhhhhhhhhhhda.........bfhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhha....ehhhhhhhhda.........bfhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhh#....fhhhhhhda.........bfhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhg#...#ghhhhfa.........bfhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhg#...#ghhhha........bfhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhf....#hhhhg.......bfhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhg#...#ghhhh#....bfhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhh#...#ghhhhe##bfghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhg#....ghhhhhhghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhb....ehhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhd....chhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhf....ahhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhg#....ghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhc....bhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhf....#fhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhha....bhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhe.....dhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhh#....#fhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhe.....#fhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhb.....#fhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhga.....aghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhf#.....#ehhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhf#......bghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhf#.......cfghhhhhhhhhhfeaachhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhgb........#abccddcba##....bhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhe#......................ahhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhgb#....................chhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhgd#................achhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhheca#........#bcfhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhgffeddfffghhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh" +}; @@ -1,7 +1,7 @@ /* menu.c * Menu routines * - * $Id: menu.c,v 1.7 1998/10/12 01:40:51 gerald Exp $ + * $Id: menu.c,v 1.8 1998/10/16 01:18:29 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -76,7 +76,7 @@ static GtkMenuEntry menu_items[] = {"<Main>/Tools/Capture", "<control>K", capture_prep_cb, NULL}, {"<Main>/Tools/Follow TCP Stream", NULL, follow_stream_cb, NULL}, {"<Main>/Tools/Graph", NULL, NULL, NULL}, - {"<Main>/Help/About Ethereal", NULL, NULL, NULL} + {"<Main>/Help/About Ethereal", NULL, about_ethereal, NULL} }; /* calculate the number of menu_items */ @@ -120,7 +120,6 @@ menus_init(void) { set_menu_sensitivity("<Main>/Edit/Paste", FALSE); set_menu_sensitivity("<Main>/Edit/Find", FALSE); set_menu_sensitivity("<Main>/Tools/Graph", FALSE); - set_menu_sensitivity("<Main>/Help/About Ethereal", FALSE); if ((mp = gtk_menu_factory_find(factory, "<Main>/Help")) != NULL) { gtk_menu_item_right_justify((GtkMenuItem *) mp->widget); } diff --git a/packet-aarp.c b/packet-aarp.c new file mode 100644 index 0000000000..564eeba613 --- /dev/null +++ b/packet-aarp.c @@ -0,0 +1,158 @@ +/* packet-aarp.c + * Routines for Appletalk ARP packet disassembly + * + * Simon Wilkinson <sxw@dcs.ed.ac.uk> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <gtk/gtk.h> +#include <pcap.h> + +#include <stdio.h> + +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif + +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif + +#include "ethereal.h" +#include "packet.h" +#include "etypes.h" + +typedef struct _e_ether_aarp { + guint16 htype, ptype; + guint8 halen, palen; + guint16 op; + guint8 hsaddr[6]; + guint8 psaddr[4]; + guint8 hdaddr[6]; + guint8 pdaddr[4]; +} e_ether_aarp; + +#ifndef AARP_REQUEST +#define AARP_REQUEST 0x0001 +#endif +#ifndef AARP_REPLY +#define AARP_REPLY 0x0002 +#endif +#ifndef AARP_PROBE +#define AARP_PROBE 0x0003 +#endif + +gchar * +atalkid_to_str(guint8 *ad) { + gint node; + static gchar str[3][16]; + static gchar *cur; + + if (cur == &str[0][0]) { + cur = &str[1][0]; + } else if (cur == &str[1][0]) { + cur = &str[2][0]; + } else { + cur = &str[0][0]; + } + + node=ad[1]<<8|ad[2]; + sprintf(cur, "%d.%d",node,ad[3]); + return cur; +} + +void +dissect_aarp(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) { + e_ether_aarp ea; + GtkWidget *aarp_tree, *ti; + gchar *op_str; + value_string op_vals[] = { {AARP_REQUEST, "AARP request" }, + {AARP_REPLY, "AARP reply" }, + {AARP_PROBE, "AARP probe" }, + {0, NULL } }; + + ea.htype = pntohs(&pd[offset]); + ea.ptype = pntohs(&pd[offset + 2]); + ea.halen = (guint8) pd[offset + 4]; + ea.palen = (guint8) pd[offset + 5]; + ea.op = pletohs(&pd[offset + 6]); + memcpy(&ea.hsaddr, &pd[offset + 8], 6); + memcpy(&ea.psaddr, &pd[offset + 14], 4); + memcpy(&ea.hdaddr, &pd[offset + 18], 6); + memcpy(&ea.pdaddr, &pd[offset + 24], 4); + + if (fd->win_info[COL_NUM]) { strcpy(fd->win_info[COL_PROTOCOL], "AARP"); } + + if (tree) { + if ((op_str = match_strval(ea.op, op_vals))) + ti = add_item_to_tree(GTK_WIDGET(tree), offset, 28, op_str); + else + ti = add_item_to_tree(GTK_WIDGET(tree), offset, 28, + "Unknown AARP (opcode 0x%04x)", ea.op); + aarp_tree = gtk_tree_new(); + add_subtree(ti, aarp_tree, ETT_AARP); + add_item_to_tree(aarp_tree, offset, 2, + "Hardware type: 0x%04x", ea.htype); + add_item_to_tree(aarp_tree, offset + 2, 2, + "Protocol type: 0x%04x", ea.ptype); + add_item_to_tree(aarp_tree, offset + 4, 1, + "Hardware size: 0x%02x", ea.halen); + add_item_to_tree(aarp_tree, offset + 5, 1, + "Protocol size: 0x%02x", ea.palen); + add_item_to_tree(aarp_tree, offset + 6, 2, + "Opcode: 0x%04x (%s)", ea.op, op_str ? op_str : "Unknown"); + add_item_to_tree(aarp_tree, offset + 8, 6, + "Sender ether: %s", ether_to_str((guint8 *) ea.hsaddr)); + add_item_to_tree(aarp_tree, offset + 14, 4, + "Sender ID: %s", atalkid_to_str((guint8 *) ea.psaddr)); + add_item_to_tree(aarp_tree, offset + 18, 6, + "Target ether: %s", ether_to_str((guint8 *) ea.hdaddr)); + add_item_to_tree(aarp_tree, offset + 24, 4, + "Target ID: %s", atalkid_to_str((guint8 *) ea.pdaddr)); + } + + if (ea.ptype != ETHERTYPE_AARP && ea.ptype !=ETHERTYPE_ATALK && + fd->win_info[COL_NUM]) { + sprintf(fd->win_info[COL_INFO], "h/w %d (%d) prot %d (%d) op 0x%04x", + ea.htype, ea.halen, ea.ptype, ea.palen, ea.op); + return; + } + switch (ea.op) { + case AARP_REQUEST: + if (fd->win_info[COL_NUM]) { + sprintf(fd->win_info[COL_INFO], "Who has %s? Tell %s", + atalkid_to_str((guint8 *) ea.pdaddr), atalkid_to_str((guint8 *) ea.psaddr)); + } + break; + case AARP_REPLY: + if (fd->win_info[COL_NUM]) { + sprintf(fd->win_info[COL_INFO], "%s is at %s", + atalkid_to_str((guint8 *) ea.psaddr), + ether_to_str((guint8 *) ea.hsaddr)); + } + break; + case AARP_PROBE: + if (fd->win_info[COL_NUM]) { + sprintf(fd->win_info[COL_INFO], "Is there a %s", + atalkid_to_str((guint8 *) ea.pdaddr)); + } + break; + } +} diff --git a/packet-arp.c b/packet-arp.c index c48e5efa6b..5af5b554fb 100644 --- a/packet-arp.c +++ b/packet-arp.c @@ -1,7 +1,7 @@ /* packet-arp.c * Routines for ARP packet disassembly * - * $Id: packet-arp.c,v 1.6 1998/10/13 05:20:53 guy Exp $ + * $Id: packet-arp.c,v 1.7 1998/10/16 01:18:30 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -52,8 +52,8 @@ dissect_arp(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) { static value_string op_vals[] = { {ARPOP_REQUEST, "ARP request" }, {ARPOP_REPLY, "ARP reply" }, {ARPOP_RREQUEST, "RARP request"}, - {ARPOP_RREPLY, "RARP reply" } }; -#define N_OP_VALS (sizeof op_vals / sizeof op_vals[0]) + {ARPOP_RREPLY, "RARP reply" }, + {0, NULL } }; /* To do: Check for {cap len,pkt len} < struct len */ ea.ar_hrd = pntohs(&pd[offset]); @@ -69,7 +69,7 @@ dissect_arp(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) { if (fd->win_info[COL_NUM]) { strcpy(fd->win_info[COL_PROTOCOL], "ARP"); } if (tree) { - if ((op_str = match_strval(ea.ar_op, op_vals, N_OP_VALS))) + if ((op_str = match_strval(ea.ar_op, op_vals))) ti = add_item_to_tree(GTK_WIDGET(tree), offset, 28, op_str); else ti = add_item_to_tree(GTK_WIDGET(tree), offset, 28, diff --git a/packet-atalk.c b/packet-atalk.c new file mode 100644 index 0000000000..c3589701ad --- /dev/null +++ b/packet-atalk.c @@ -0,0 +1,122 @@ +/* packet-ddp.c + * Routines for DDP packet disassembly. + * + * Simon Wilkinson <sxw@dcs.ed.ac.uk> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <gtk/gtk.h> +#include <pcap.h> + +#include <stdio.h> + +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif + +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif + +#include "ethereal.h" +#include "packet.h" +#include "etypes.h" +#include "resolv.h" + +extern packet_info pi; + +typedef struct _e_ddp { +#if BYTE_ORDER == BIG_ENDIAN + guint16 pad:2,hops:4,len:10; +#else + guint16 len:10,hops:4,pad:2; +#endif + guint16 sum,dnet,snet; + guint8 dnode,snode; + guint8 dport,sport; + guint8 type; +} e_ddp; + +#define DDP_RTMPDATA 0x01 +#define DDP_NBP 0x02 +#define DDP_ATP 0x03 +#define DDP_AEP 0x04 +#define DDP_RTMPREQ 0x05 +#define DDP_ZIP 0x06 +#define DDP_ADSP 0x07 + +void +dissect_ddp(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) { + e_ddp ddp; + GtkWidget *ddp_tree, *ti; + value_string op_vals[] = { {DDP_RTMPDATA, "AppleTalk Routing Table response or data" }, + {DDP_NBP, "AppleTalk Name Binding Protocol packet"}, + {DDP_ATP, "AppleTalk Transaction Protocol packet"}, + {DDP_AEP, "AppleTalk Echo Protocol packet"}, + {DDP_RTMPREQ, "AppleTalk Routing Table request"}, + {DDP_ZIP, "AppleTalk Zone Information Protocol packet"}, + {DDP_ADSP, "AppleTalk Data Stream Protocol"}, + {0, NULL} }; + + memcpy(&ddp, &pd[offset], sizeof(e_ddp)); + ddp.dnet=ntohs(ddp.dnet); + ddp.snet=ntohs(ddp.snet); + ddp.sum=ntohs(ddp.sum); + + if (fd->win_info[COL_NUM]) { + strcpy(fd->win_info[COL_PROTOCOL], "DDP"); + switch (ddp.type) { + case DDP_RTMPDATA: + case DDP_RTMPREQ: + case DDP_NBP: + case DDP_ATP: + case DDP_AEP: + case DDP_ZIP: + case DDP_ADSP: + strcpy(fd->win_info[COL_INFO], match_strval(ddp.type,op_vals)); + break; + default: + sprintf(fd->win_info[COL_INFO], "Unknown DDP protocol (%02x)", ddp.type); + } + + sprintf(fd->win_info[COL_SOURCE],"%d.%d:%d",ddp.snet,ddp.snode,ddp.sport); + sprintf(fd->win_info[COL_DESTINATION], "%d.%d:%d",ddp.dnet,ddp.dnode,ddp.dport); + } + + if (tree) { + ti = add_item_to_tree(GTK_WIDGET(tree), offset, 13, + "Datagram Delivery Protocol"); + ddp_tree = gtk_tree_new(); + add_subtree(ti, ddp_tree, ETT_IP); + add_item_to_tree(ddp_tree, offset, 1, "Hop count: %d", ddp.hops); + add_item_to_tree(ddp_tree, offset, 2, "Datagram length: %d", ddp.len); + add_item_to_tree(ddp_tree, offset + 2, 2, "Checksum: %d",ddp.sum); + add_item_to_tree(ddp_tree, offset + 4, 2, "Destination Net: %d",ddp.dnet); + add_item_to_tree(ddp_tree, offset + 6, 2, "Source Net: %d",ddp.snet); + add_item_to_tree(ddp_tree, offset + 8, 1, "Destination Node: %d",ddp.dnode); + add_item_to_tree(ddp_tree, offset + 9, 1, "Source Node: %d",ddp.snode); + add_item_to_tree(ddp_tree, offset + 10, 1, "Destination Socket: %d",ddp.dport); + add_item_to_tree(ddp_tree, offset + 11, 1, "Source Socket: %d",ddp.sport); + add_item_to_tree(ddp_tree, offset + 12, 1, "Type: %d",ddp.type); + } + + offset += 13; + +} diff --git a/packet-ip.c b/packet-ip.c index 011d469b7e..44c74a2408 100644 --- a/packet-ip.c +++ b/packet-ip.c @@ -1,7 +1,7 @@ /* packet-ip.c * Routines for IP and miscellaneous IP protocol packet disassembly * - * $Id: packet-ip.c,v 1.7 1998/10/13 05:40:03 guy Exp $ + * $Id: packet-ip.c,v 1.8 1998/10/16 01:18:31 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -69,9 +69,8 @@ dissect_ipopt_security(GtkWidget *opt_tree, const char *name, {IPSEC_RESERVED5, "Reserved" }, {IPSEC_RESERVED6, "Reserved" }, {IPSEC_RESERVED7, "Reserved" }, - {IPSEC_RESERVED8, "Reserved" } }; -#define N_SECL_VALS (sizeof secl_vals / sizeof secl_vals[0]) - + {IPSEC_RESERVED8, "Reserved" }, + {0, NULL } }; tf = add_item_to_tree(opt_tree, offset, optlen, "%s:", name); field_tree = gtk_tree_new(); @@ -79,7 +78,7 @@ dissect_ipopt_security(GtkWidget *opt_tree, const char *name, offset += 2; val = pntohs(opd); - if ((secl_str = match_strval(val, secl_vals, N_SECL_VALS))) + if ((secl_str = match_strval(val, secl_vals))) add_item_to_tree(field_tree, offset, 2, "Security: %s", secl_str); else @@ -171,8 +170,8 @@ dissect_ipopt_timestamp(GtkWidget *opt_tree, const char *name, const u_char *opd static value_string flag_vals[] = { {IPOPT_TS_TSONLY, "Time stamps only" }, {IPOPT_TS_TSANDADDR, "Time stamp and address" }, - {IPOPT_TS_PRESPEC, "Time stamps for prespecified addresses"} }; -#define N_FLAG_VALS (sizeof flag_vals / sizeof flag_vals[0]) + {IPOPT_TS_PRESPEC, "Time stamps for prespecified addresses"}, + {0, NULL } }; struct in_addr addr; guint ts; @@ -198,7 +197,7 @@ dissect_ipopt_timestamp(GtkWidget *opt_tree, const char *name, const u_char *opd add_item_to_tree(field_tree, offset + optoffset, 1, "Overflow: %d", flg >> 4); flg &= 0xF; - if ((flg_str = match_strval(flg, flag_vals, N_FLAG_VALS))) + if ((flg_str = match_strval(flg, flag_vals))) add_item_to_tree(field_tree, offset + optoffset, 1, "Flag: %s", flg_str); else @@ -402,8 +401,8 @@ dissect_ip(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) { {IP_PROTO_IGMP, "IGMP"}, {IP_PROTO_TCP, "TCP" }, {IP_PROTO_UDP, "UDP" }, - {IP_PROTO_OSPF, "OSPF"} }; -#define N_PROTO_VALS (sizeof proto_vals / sizeof proto_vals[0]) + {IP_PROTO_OSPF, "OSPF"}, + {0, NULL } }; /* To do: check for runts, errs, etc. */ @@ -472,7 +471,7 @@ dissect_ip(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) { iph.ip_off & IP_OFFSET); add_item_to_tree(ip_tree, offset + 8, 1, "Time to live: %d", iph.ip_ttl); - if ((proto_str = match_strval(iph.ip_p, proto_vals, N_PROTO_VALS))) + if ((proto_str = match_strval(iph.ip_p, proto_vals))) add_item_to_tree(ip_tree, offset + 9, 1, "Protocol: %s", proto_str); else add_item_to_tree(ip_tree, offset + 9, 1, "Protocol: Unknown (%x)", @@ -1,7 +1,7 @@ /* packet.c * Routines for packet disassembly * - * $Id: packet.c,v 1.6 1998/10/12 01:40:53 gerald Exp $ + * $Id: packet.c,v 1.7 1998/10/16 01:18:32 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -198,12 +198,13 @@ collapse_tree(GtkWidget *w, gpointer data) { Returns the associated string ptr on a match, or NULL on failure. Len is the length of the array. */ gchar* -match_strval(guint32 val, value_string *vs, gint len) { - gint i; +match_strval(guint32 val, value_string *vs) { + gint i = 0; - for (i = 0; i < len; i++) { + while (vs[i].strptr) { if (vs[i].value == val) return(vs[i].strptr); + i++; } return(NULL); @@ -1,7 +1,7 @@ /* packet.h * Definitions for packet disassembly structures and routines * - * $Id: packet.h,v 1.18 1998/10/15 06:40:51 guy Exp $ + * $Id: packet.h,v 1.19 1998/10/16 01:18:33 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -434,6 +434,7 @@ enum { ETT_NBNS_ANS, ETT_NBNS_RR, ETT_NBIPX, + ETT_AARP, NUM_TREE_TYPES /* last item number plus one */ }; @@ -485,7 +486,7 @@ GtkWidget* add_item_to_tree(GtkWidget *, gint, gint, gchar *, ...) #else GtkWidget* add_item_to_tree(GtkWidget *, gint, gint, gchar *, ...); #endif -gchar* match_strval(guint32, value_string*, gint); +gchar* match_strval(guint32, value_string*); /* Routines in packet.c */ @@ -1,7 +1,7 @@ /* prefs.c * Routines for handling preferences * - * $Id: prefs.c,v 1.6 1998/10/13 02:10:56 gerald Exp $ + * $Id: prefs.c,v 1.7 1998/10/16 01:18:33 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -46,8 +46,8 @@ void prefs_cb(GtkWidget *w, gpointer sp) { GtkWidget *prefs_w, *main_vb, *top_hb, *bbox, *prefs_nb, *ok_bt, *save_bt, *cancel_bt; - GtkWidget *print_pg, *filter_pg, *filter_te; - GtkWidget *nlabel, *label; + GtkWidget *print_pg, *filter_pg, *filter_te, *label; +/* GtkWidget *nlabel; */ gint start_page = (gint) sp; prefs_w = gtk_window_new(GTK_WINDOW_TOPLEVEL); @@ -1,7 +1,7 @@ /* util.c * Utility routines * - * $Id: util.c,v 1.5 1998/10/13 07:03:37 guy Exp $ + * $Id: util.c,v 1.6 1998/10/16 01:18:34 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -46,6 +46,7 @@ #include "util.h" #include "image/icon-excl.xpm" +#include "image/icon-ethereal.xpm" const gchar *bm_key = "button mask"; @@ -53,7 +54,7 @@ const gchar *bm_key = "button mask"; * text. * * Args: - * type : One of ESD_TYPE_*. Currently ignored. + * type : One of ESD_TYPE_*. * btn_mask : The address of a gint. The value passed in determines if * the 'Cancel' button is displayed. The button pressed by the * user is passed back. @@ -74,11 +75,28 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) { GdkColormap *cmap; va_list ap; gchar message[ESD_MAX_MSG_LEN]; - + gchar **icon; + /* Main window */ win = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_container_border_width(GTK_CONTAINER(win), 7); - gtk_window_set_title(GTK_WINDOW(win), "Ethereal: Warning"); + + switch (type) { + case ESD_TYPE_WARN : + gtk_window_set_title(GTK_WINDOW(win), "Ethereal: Warning"); + icon = icon_excl_xpm; + break; + case ESD_TYPE_CRIT : + gtk_window_set_title(GTK_WINDOW(win), "Ethereal: Critical"); + icon = icon_excl_xpm; + break; + case ESD_TYPE_INFO : + default : + icon = icon_ethereal_xpm; + gtk_window_set_title(GTK_WINDOW(win), "Ethereal: Information"); + break; + } + gtk_object_set_data(GTK_OBJECT(win), bm_key, btn_mask); /* Container for our rows */ @@ -95,7 +113,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) { style = gtk_widget_get_style(win); cmap = gdk_colormap_get_system(); pixmap = gdk_pixmap_colormap_create_from_xpm_d(NULL, cmap, &mask, - &style->bg[GTK_STATE_NORMAL], icon_excl_xpm); + &style->bg[GTK_STATE_NORMAL], icon); type_pm = gtk_pixmap_new(pixmap, mask); gtk_container_add(GTK_CONTAINER(top_hb), type_pm); gtk_widget_show(type_pm); @@ -1,7 +1,7 @@ /* util.h * Utility definitions * - * $Id: util.h,v 1.4 1998/10/12 01:40:57 gerald Exp $ + * $Id: util.h,v 1.5 1998/10/16 01:18:35 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -30,7 +30,7 @@ extern "C" { #endif /* __cplusplus */ -/* Dialog type. Currently, only ESD_TYPE_WARN is supported. */ +/* Dialog type. */ #define ESD_TYPE_INFO 0 #define ESD_TYPE_WARN 1 #define ESD_TYPE_CRIT 2 |