pax_global_header00006660000000000000000000000064134216027510014513gustar00rootroot0000000000000052 comment=1aad8e8c2591d40b9ba63f032da4b2f736685e56 pcapfix-1.1.4/000077500000000000000000000000001342160275100131505ustar00rootroot00000000000000pcapfix-1.1.4/COPYING000066400000000000000000001043741342160275100142140ustar00rootroot00000000000000 GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The GNU General Public License is a free, copyleft license for software and other kinds of works. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. 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 them 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 prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. 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. Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. TERMS AND CONDITIONS 0. Definitions. "This License" refers to version 3 of the GNU General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. "The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. A "covered work" means either the unmodified Program or a work based on the Program. To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. 1. Source Code. The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. The Corresponding Source for a work in source code form is that same work. 2. Basic Permissions. All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. 3. Protecting Users' Legal Rights From Anti-Circumvention Law. No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. 4. Conveying Verbatim Copies. You may convey 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; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. 5. Conveying Modified Source Versions. You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: a) The work must carry prominent notices stating that you modified it, and giving a relevant date. b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. 6. Conveying Non-Source Forms. You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. "Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. 7. Additional Terms. "Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or d) Limiting the use for publicity purposes of names of licensors or authors of the material; or e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. 8. Termination. You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. 9. Acceptance Not Required for Having Copies. You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. 10. Automatic Licensing of Downstream Recipients. Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. 11. Patents. A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. 12. No Surrender of Others' Freedom. If 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 convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. 13. Use with the GNU Affero General Public License. Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of the GNU 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 that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. 15. Disclaimer of Warranty. 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. 16. Limitation of Liability. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS 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. 17. Interpretation of Sections 15 and 16. If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 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, see . Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: Copyright (C) This program 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, your program's commands might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . The GNU 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 Lesser General Public License instead of this License. But first, please read . pcapfix-1.1.4/Changelog000066400000000000000000000077111342160275100147700ustar00rootroot00000000000000pcapfix Changelog ***************** 1.1.4 - 22.01.2019 ------------------ * added support for extended pcap file format (kuznetzov) * fixed dtl 113 (linux cooked) handling (thanks to Andre Luyer) * improved hard and soft mode checks for younger/older packets * minor fixes and improvements 1.1.3 - 04.09.2018 ------------------ * implemtented soft mode (for plausibility checks) 1.1.2 - 16.07.2018 ------------------ * fixed cross compiling (thanks to Helmut Grohne) * increased maximum snap length to 262144 1.1.1 - 25.12.2017 ------------------ * added write buffers and support to perform repair process without creation of a separate output file * fixed another MacOS build problem * fixed minor bugs 1.1.0 - 31.08.2014 ------------------ * added checks for valid pcapng format (epb) * added --outfile parameter to chose fixed file name * improved pcapng packet alignment (pb, spb, nrb) * improved pcapng option fields handling * improved status and verbosity outputs * fixed reparation bugs with swapped pcap files * fixed MacOS compile problem * fixed windows output file name extension missing * fixed many minor bugs 1.0.2 - 18.02.2014 ------------------ * added support for files larger than 2GB on 32bit systems 1.0.1 - 03.11.2013 ------------------ * added reparation block type id zero (pcapng) * added reparation of capture length inside EPB (pcapng) * set data link type to ethernet on missing header (pcap) * changed missing pcap header threshold * fixed minor bugs 1.0.0 - 12.10.2013 ------------------ * added pcapng support * added nanoseconds support (Issue #1) * improved console output * minor bugs fixed 0.7.3 - 16.06.2013 ------------------ * added snoop file detection * added large file support on 32bit architectures * improved missing header detection * fixed compiling errors on hurd and kfreebsd architectures * fixed minor bugs 0.7.2 - 30.03.2013 ------------------ * compiles on Apple systems properly now * fixed problems installing man-pages (on some systems) 0.7.1 - 03.01.2013 ------------------ * REALLY fixed file pointer exception on windows64 systems * updated man-page 0.7 - 18.10.2012 ---------------- * added support for swapped (big endian) pcap files * compiles on OpenBSD properly now * fixed file pointer exception on windows64 systems * fixed detection bug when corrupted packet is larger than 65536 bytes * fixed minimal packet limit to cope with wlan traffic 0.6 - 20.05.2012 ---------------- * added deep scan option (-d) to force packet detection inside the whole file * detects ascii-corruption in pcap header (unix->win) * improved global header and packet checks (0 <= usec <= 1000000) * repair files that first packet is entirely corrupted * repair oversized packets * improved last packet mismatch correction * fixed reading packets over EOF 0.5 - 05.05.2012 ---------------- * repair files that packets were not saved chronologically * detect and repair overlapping packets * detect and repair cut-off pcap files * detect and repair ascii-mode transfered pcap files (pcap headers only!) * added progress bar * added man-page 0.4 - 27.04.2012 ---------------- * completely redesigned packet detection algorithm (replaced bottom-up-recovery with brute-force-packet-guessing) * improved detection rate by additional plausability checks * increased speed when repairing large pcap files 0.3 - 31.03.2012 ---------------- * when recovering packets size will be checked to be smaller than 65536 * added recognition when a file does not seem to be a pcap file at all * compiles on windows systems properly now (tested with dev-cpp) * added option to manually select data link type 0.2 - 11.03.2012 ---------------- * pcapfix compiles on 64bit systems correctly now * fixed segfault when no filename was given * fixed (input) file not found bug on directory differ * added recognition of other data link types beside ethernet in global header * added source code documentation 0.1 - 01.03.2012 ---------------- * this is the first version, everything has changed thou :-) pcapfix-1.1.4/INSTALL000066400000000000000000000013551342160275100142050ustar00rootroot00000000000000Installation Instructions ************************* You do not need any futher packages. Basic Installation ================== 1. Compile pcapfix with the following command: make 2. Install the binary file make install The tool will be installed in /usr by default. To change this, edit the $PREFIX variable in Makefile. Uninstall ========= To uninstall pcapfix just enter: make uninstall Microsoft Windows ================= Compile pcapfix using cygwin: gcc -c pcap.c -o pcap.o gcc -c pcapng.c -o pcapng.o gcc pcapfix.c pcap.o pcapng.o -l ws2_32 -o pcapfix.exe Troubleshooting =============== If there are any problems compiling the program, please write an email to ruport@f00l.de and include your compiling error message. pcapfix-1.1.4/Makefile000066400000000000000000000017761342160275100146230ustar00rootroot00000000000000PREFIX ?= /usr BINDIR ?= $(PREFIX)/bin DOCDIR ?= $(PREFIX)/share/doc MANDIR ?= $(PREFIX)/share/man OPTFLAGS = $(shell getconf LFS_CFLAGS) -D_FORTIFY_SOURCE=2 -O2 -fstack-protector --param=ssp-buffer-size=4 WARNFLAGS = -Wall -Wextra -std=gnu99 -pedantic -Wformat -Werror=format-security DEBUGFLAGS = -g CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS) OS := $(shell uname) ifneq ($(OS), Darwin) LDFLAGS += -Wl,-z,relro endif all: pcap pcap_kuznet pcapng $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) pcapfix.c pcap.o pcap_kuznet.o pcapng.o -o pcapfix pcap: pcap.c $(CC) $(CPPFLAGS) $(CFLAGS) -c pcap.c -o pcap.o pcap_kuznet: pcap_kuznet.c $(CC) $(CPPFLAGS) $(CFLAGS) -c pcap_kuznet.c -o pcap_kuznet.o pcapng: pcapng.c $(CC) $(CPPFLAGS) $(CFLAGS) -c pcapng.c -o pcapng.o install: install -pDm755 pcapfix $(DESTDIR)$(BINDIR)/pcapfix install -pDm644 pcapfix.1 $(DESTDIR)$(MANDIR)/man1/pcapfix.1 uninstall: rm -f $(DESTDIR)$(BINDIR)/pcapfix rm -f $(DESTDIR)$(MANDIR)/man1/pcapfix.1 clean: rm -f *.o rm -f pcapfix pcapfix-1.1.4/README000066400000000000000000000150641342160275100140360ustar00rootroot00000000000000pcapfix v1.1.4 README ********************* Pcapfix is a tool to repair your damaged or corrupted pcap and pcapng files. It is written in C and released under the GNU General Public License. To fix your pcap files the tool first checks for an intact pcap global header and repairs it if there are some corrupted bytes. It there seems to be no global header at all, pcapfix adds a self-created one at the beginning of the file. In a second step the tool tries to find pcap packet headers inside the file, below the global header. It checks if the values are correct (or seem to be correct) and tries to repair a packet if there is something wrong. To fix your pcapng files the tool loops through all packet headers that can be found in the file. It checks for mandatory Section Header Block and Interface Description Block and creates them if missing. Pcapfix checks for correct block sizes and valid option fields. If something is wrong, invalid fields are repaired (if possible) or skipped and adjusted to finally get a proper pcapng file. Please send any further wishes, feature requests or problems in compiling and execution to ruport@f00l.de. Additionally You may send me pcap/pcapng files that could not be repaired too in order to improve pcapfix and get your file repaired. For further information visit the pcapfix homepage at http://f00l.de/pcapfix/. USAGE ===== ./pcapfix [OPTIONS] filename OPTIONS: -d , --deep-scan Deep Scan (default = 0) (pcap only!) -s , --soft-mode Soft mode (packet detection) -n , --pcapng Force File Format to PCAPNG -o , --outfile Set output file name -t , --data-link-type Data Link Type (default = 1) -v , --verbose Verbose output (default = 0) Output file name ................ If you want to perform the reparation process on the input file without creating a separate output file - e.g. in case you are out of space, you can use the -o option and give the same name as the input file. WARNING: This process is DANGEROUS and may destroy your data. You should only use this option if you know what you are doing and accept the risk of losing the input file. Deep Scan Option ................ In classic pcap files, pcapfix will only scan the first 65536 bytes (maximum packet length) for a proper first packet. If you want to force packet detection even above this limit (e.g. because your file has been heavily destroyed) you can use the deep scan option (-d). This option is not necessary for pcapng files because the whole file is arranged in blocks that are 'unlimited' by default. In result pcapfix will always scan the whole pcapng file for further blocks. Soft Mode ......... There are programs that breach some pcap conventions when writing files. Ignoring those rules do not break the pcap file but they make it difficult for pcapfix to identify the packets in case of broken files. By default pcapfix uses hard mode. If you encounter problems when repairing files, try to switch to soft mode (-s). Pcapfix will then try to find the packets in a more tolerant way. PCAPNG Format ............. Pcapfix will try to identify the file format to repair (pcap / pcapng) before doing any further checks. If the header itself is corrupted, it will assume the format to be classic pcap. To change this behaviour you can force the tool to do a pcapng-repair by supplying -n (--pcapng) option. Verbosity ......... You can use multiple -v options to increase verbosity. An verbosity of 2 will result in very much output data during package search. ASCII-mode transfered Files (FTP) ................................. Pcapfix is able to repair classic pcap files that have been transfered in ascii-mode via FTP. In those files a proper pcap structure will be created only to make them readable by wireshark etc. The data inside the packets (and some pcap headers) might still be corrupted. To repair those packets a deeper look inside the packet structure (e.g. checksum) will be necessary. Data Link Types ............... You can make pcapfix change / select your data link type by supplying -t option. Although you may select a data link type number between 0 and 255, only the following types are assigned: If the data link type field is corrupt, pcapfix will select LINKTYPE_ETHERNET by default. See http://www.tcpdump.org/linktypes.html for futher information. NUMBER LINK_TYPE 0 LINKTYPE_NULL 1 LINKTYPE_ETHERNET 6 LINKTYPE_TOKEN_RING 7 LINKTYPE_ARCNET_BSD 8 LINKTYPE_SLIP 9 LINKTYPE_PPP 10 LINKTYPE_FDDI 50 LINKTYPE_PPP_HDLC 51 LINKTYPE_PPP_ETHER 100 LINKTYPE_ATM_RFC1483 101 LINKTYPE_RAW 104 LINKTYPE_C_HDLC 105 LINKTYPE_IEEE802_11 107 LINKTYPE_FRELAY 108 LINKTYPE_LOOP 113 LINKTYPE_LINUX_SLL 114 LINKTYPE_LTALK 117 LINKTYPE_PFLOG 119 LINKTYPE_PRISM_HEADER 122 LINKTYPE_IP_OVER_FC 123 LINKTYPE_SUNATM 127 LINKTYPE_IEEE802_11_RADIO 129 LINKTYPE_ARCNET_LINUX 138 LINKTYPE_APPLE_IP_OVER_IEEE1394 139 LINKTYPE_MTP2_WITH_PHDR 140 LINKTYPE_MTP2 141 LINKTYPE_MTP3 142 LINKTYPE_SCCP 143 LINKTYPE_DOCSIS 144 LINKTYPE_LINUX_IRDA 147-162 LINKTYPE_USER0-LINKTYPE-USER15 163 LINKTYPE_IEEE802_11_RADIO_AVS 166 LINKTYPE_PPP_PPPD 169 LINKTYPE_GPRS_LLC 177 LINKTYPE_LINUX_LAPD 187 LINKTYPE_BLUETOOTH_HCI_H4 189 LINKTYPE_USB_LINUX 192 LINKTYPE_PPI 195 LINKTYPE_IEEE802_15_4 196 LINKTYPE_SITA 197 LINKTYPE_ERF 201 LINKTYPE_BLUETOOTH_HCI_H4_WITH_PHDR 202 LINKTYPE_AX25_KISS 203 LINKTYPE_LAPD 204 LINKTYPE_PPP_WITH_DIR 205 LINKTYPE_C_HDLC_WITH_DIR 206 LINKTYPE_FRELAY_WITH_DIR 209 LINKTYPE_IPMB_LINUX 215 LINKTYPE_IEEE802_15_4_NONASK_PHY 220 LINKTYPE_USB_LINUX_MMAPPED 224 LINKTYPE_FC_2 225 LINKTYPE_FC_2_WITH_FRAME_DELIMS 226 LINKTYPE_IPNET 227 LINKTYPE_CAN_SOCKETCAN 228 LINKTYPE_IPV4 229 LINKTYPE_IPV6 230 LINKTYPE_IEEE802_15_4_NOFCS 231 LINKTYPE_DBUS 235 LINKTYPE_DVB_CI 236 LINKTYPE_MUX27010 237 LINKTYPE_STANAG_5066_D_PDU 239 LINKTYPE_NFLOG 240 LINKTYPE_NETANALYZER 241 LINKTYPE_NETANALYZER_TRANSPARENT 242 LINKTYPE_IPOIB 243 LINKTYPE_MPEG_2_TS 244 LINKTYPE_NG40 245 LINKTYPE_NFC_LLCP COPYRIGHT ========= Copyright 2012-2019 Robert Krause Pcapfix 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 3 of the License, or any later version. Pcapfix 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 Pcapfix. If not, see http://www.gnu.org/licenses/. pcapfix-1.1.4/pcap.c000066400000000000000000001055241342160275100142460ustar00rootroot00000000000000/******************************************************************************* * * Copyright (c) 2012-2019 Robert Krause (ruport@f00l.de) * * This file is part of Pcapfix. * * Pcapfix 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 3 of the License, or any later version. * * Pcapfix 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 * Pcapfix. If not, see http://www.gnu.org/licenses/. * ******************************************************************************/ #include "pcapfix.h" #include "pcap.h" /* pcap file global vars */ int nanoseconds = 0; /* pcap file uses nanoseconds (instead of microseconds) */ /* * Function: is_plausible * ----------------------- * check if the pcap packet header could be a plausible one by satisfying those conditions: * - packet size >= 16 bytes AND <= MAX_SNAPLEN bytes (included length AND original length) (conditions 1,2,3,4,5) * - included length <= original lenth (conditions 6,7,8,9) * - packet timestamp is NOT older OR younger than the prior packets timestamp -+ one day (conditions 10,11,12) * - usec (microseconds) field <= 1000000 (conditions 13) * - usec (nanoseconds) field <= 1000000000 (conditions 14) * * global_hdr: the filled pcap header struct to check for snaplen * hdr: the filled packet header struct to check for plausibility * prior_ts: the prior packets timestamp (seconds) to check for time relation (condition 6,7) * * returns: 0 success * -X error (condition X failed) * */ int is_plausible(struct global_hdr_s global_hdr, struct packet_hdr_s hdr, unsigned int prior_ts) { /* check for minimum packet size * minimum packet size should be 16, but in some cases, e.g. local wlan capture, packet might * even be smaller --> decreased minimum size to 10 */ if (conint(hdr.incl_len) < 10) return(-1); if (conint(hdr.orig_len) < 10) return(-2); /* check packet limit with header field and max snaplen in soft mode (and dlt 119) the packet detection accepts a wider range */ if (soft_mode || global_hdr.network == 119) { /* in soft mode, global pcap snap length is ignored, instead MAX snaplen is used */ /* strange behavior for wlan: in some cases incl length seems to differ not following the configured max snap length; this leads to dropping valid wlan packets -> use soft mode for DLT 119 */ if (conint(hdr.incl_len) > PCAP_MAX_SNAPLEN) return(-3); } else { /* in hard mode (and not dlt 119), global pcap snap length is the limit in plausibility checks */ if (conint(hdr.incl_len) > conint(global_hdr.snaplen)) return(-4); } /* orig length should not be greater than pcap max snaplen */ if (conint(hdr.orig_len) > PCAP_MAX_SNAPLEN) return(-5); /* if the packet original size is larger than the included length, then the included length should be limited by the files snap length */ if (conint(hdr.orig_len) > conint(hdr.incl_len)) { /* check for dlt 119 == wlan */ if (global_hdr.network == 119) { /* strange behavior for wlan: in some cases incl length seems to differ not following the configured max snap length; this leads to dropping valid wlan packets -> ignore this check for DLT 119 */ } else { if (conint(hdr.incl_len) != conint(global_hdr.snaplen)) return(-7); } } /* the included length CAN NOT be larger than the original length */ /* check for LINKTYPE_LINUX_SLL (linux cooked) */ if (global_hdr.network == 113) { /* linux cooked headers are appended to packet length, but not to orig length so we need to remove it from incl_len before checking */ if (conint(hdr.incl_len)-16 > conint(hdr.orig_len)) return(-8); } else if (conint(hdr.incl_len) > conint(hdr.orig_len)) return(-9); /* check packet times (older) */ if (soft_mode) { /* in soft mode, there is no limit for older packets */ } else { /* in hard mode, packet must not be older than one day (related to prior packet) */ if ((prior_ts != 0) && (conint(hdr.ts_sec) > (prior_ts+86400))) return(-10); } /* check packet times (younger) */ if (soft_mode) { /* in soft mode, packet must not be younger than one day (related to prior packet) */ if ((prior_ts >= 86400) && (conint(hdr.ts_sec) < (prior_ts-86400))) return(-11); } else { /* in hard mode, packets must not be younger than prior packet */ if ((prior_ts != 0) && (conint(hdr.ts_sec) < prior_ts)) return(-12); } /* check for nano/microseconds (hard mode only) */ if (!soft_mode) { /* in hard mode */ if (nanoseconds == 0) { /* usec (microseconds) must <= 1000000 */ if (conint(hdr.ts_usec) > 1000000) return(-13); } else { /* usec (nanoseconds) must be <= 1000000000 */ if (conint(hdr.ts_usec) > 1000000000) return(-14); } } /* all conditions fullfilled ==> everything fine! */ return(0); } /* * Function: check_header * ----------------------- * this function takes a buffer and brute forces some possible ascii-corrupted bytes versus plausibility checks * * buffer: the buffer that might contain the possible pcap packet header * size: the size of the buffer (double pcap packet header size is a good choice) * priot_ts: the prior packets timestamp (to check for plausibility) * global_hdr: the pointer to the pcap header * hdr: the pointer to the packet header buffer (we use this to return the repaired header) * * returns: >=0 success (return value contains number of ascii corrupted bytes in hdr (we need this data to align the beginning of the packet body later) * -1 error (no valid pcap header found inside buffer) * */ int check_header(char *buffer, unsigned int size, unsigned int prior_ts, struct global_hdr_s *global_hdr, struct packet_hdr_s *hdr) { unsigned int i; /* loop variable - first byte in buffer that could be beginning of packet */ int res; /* return value */ char *tmp; /* the temporary buffer that will be used for recursion */ /* does the buffer already contain a valid packet header (without any correction) ?? */ memcpy(hdr, buffer, sizeof(struct packet_hdr_s)); res = is_plausible(*global_hdr, *hdr, prior_ts); if (res == 0) return(0); if (verbose >= 2) printf("[-] Header plausibility check failed with error code %d\n", res); /* we need to abort the recursion of there are too many possible ascii corrupted bytes at ones */ /* 32-25 = 7 bytes maximum in 32bytes of data! */ if (size <= 25) return(-1); /* this loop will check the the buffer for occurence of 0x0D + 0x0A (UNIX to WINDOWS ascii corruption) */ for(i=0; i0 success (number of corruptions fixed) * 0 success (nothing to fix) * -1 error (not a pcap file) * -2 error (unable to repair) * -3 error (EOF reached while reading input file) * */ int fix_pcap(FILE *pcap, FILE *pcap_fix) { struct global_hdr_s global_hdr; /* global header data */ /* we use a buffer to cache 1mb of writing... this way writing is faster and we can read and write the file at the same time */ char *writebuffer; uint64_t writepos = 0; uint64_t bytes; /* read/written bytes counter */ uint64_t filesize; /* filesize of input file in bytes */ unsigned short hdr_integ; /* integrity counter of global header */ /* init write buffer */ writebuffer = malloc(1024000); /* get size of input file */ fseeko(pcap, 0, SEEK_END); filesize = ftello(pcap); fseeko(pcap, 0, SEEK_SET); /* BEGIN GLOBAL HEADER CHECK */ /* check space of pcap global header */ if (filesize < sizeof(global_hdr)) { printf("[-] File is too small to read pcap global header.\n"); return(-2); } printf("[*] Analyzing Global Header...\n"); bytes = fread(&global_hdr, sizeof(global_hdr), 1, pcap); /* read first bytes of input file into struct */ if (bytes != 1) return -3; /* init integrity counter */ hdr_integ = 0; /* check for pcap's magic bytes () */ if (global_hdr.magic_number == PCAP_MAGIC) { /* we got a classic pcap file (non swapped) */ if (verbose) printf("[+] Magic number: 0x%x\n", global_hdr.magic_number); } else if (global_hdr.magic_number == htonl(PCAP_MAGIC)) { /* we got a classic pcap file (swapped) */ if (verbose) printf("[+] Magic number: 0x%x (SWAPPED)\n", global_hdr.magic_number); swapped = 1; } else if (global_hdr.magic_number == PCAP_NSEC_MAGIC) { /* we got a classic pcap file that uses nanoseconds (non swapped) */ if (verbose) printf("[+] Magic number: 0x%x (NANOSECONDS)\n", global_hdr.magic_number); nanoseconds = 1; } else if (global_hdr.magic_number == htonl(PCAP_NSEC_MAGIC)) { /* we got a classic pcap file that uses nanoseconds (swapped) */ if (verbose) printf("[+] Magic number: 0x%x (SWAPPED - NANOSECONDS)\n", global_hdr.magic_number); swapped = 1; nanoseconds = 1; } else { /* we are not able to determine the pcap magic */ hdr_integ++; if (verbose) printf("[-] Magic number: 0x%x\n", global_hdr.magic_number); /* assume input file is a classic pcap file (NO nanoseconds, NOT swapped) */ global_hdr.magic_number = PCAP_MAGIC; } /* check for major version number (2) */ if (conshort(global_hdr.version_major) == 2) { /* current major version is 2 */ if (verbose) printf("[+] Major version number: %hu\n", conshort(global_hdr.version_major)); } else { hdr_integ++; if (verbose) printf("[-] Major version number: %hu\n", conshort(global_hdr.version_major)); global_hdr.version_major = conshort(2); } /* check for minor version number */ if (conshort(global_hdr.version_minor) == 4) { /* current minor version is 4 */ if (verbose) printf("[+] Minor version number: %hu\n", conshort(global_hdr.version_minor)); } else { hdr_integ++; if (verbose) printf("[-] Minor version number: %hu\n", conshort(global_hdr.version_minor)); global_hdr.version_minor = conshort(4); } /* check for GTM to local correction */ if (conshort(global_hdr.thiszone) == 0) { /* in practise time stamps are always in GTM, so the correction is always zero */ if (verbose) printf("[+] GTM to local correction: %d\n", conint(global_hdr.thiszone)); } else { hdr_integ++; if (verbose) printf("[-] GTM to local correction: %d\n", conint(global_hdr.thiszone)); global_hdr.thiszone = conint(0); } /* check for accuracy of timestamps */ if (conint(global_hdr.sigfigs) == 0) { /* all capture tools set this to zero */ if (verbose) printf("[+] Accuracy of timestamps: %u\n", conint(global_hdr.sigfigs)); } else { hdr_integ++; if (verbose) printf("[-] Accuracy of timestamps: %u\n", conint(global_hdr.sigfigs)); global_hdr.sigfigs = conint(0); } /* check for max packet length */ if ((conint(global_hdr.snaplen) > 0) && (conint(global_hdr.snaplen) <= PCAP_MAX_SNAPLEN)) { /* typically 262144 nowadays */ if (verbose) printf("[+] Max packet length: %u\n", conint(global_hdr.snaplen)); } else { hdr_integ++; if (verbose) printf("[-] Max packet length: %u\n", conint(global_hdr.snaplen)); global_hdr.snaplen = conint(PCAP_MAX_SNAPLEN); } /* check for data link type (http://www.tcpdump.org/linktypes.html) */ if (conint(global_hdr.network) <= 251) { /* data link types are <= 251 */ if (verbose) printf("[+] Data link type: %u\n", conint(global_hdr.network)); } else { hdr_integ++; if (verbose) printf("[-] Data link type: %u\n", conint(global_hdr.network)); /* if data link type is corrupt, we set it to ethernet (user supplied param will be processed afterwards) */ global_hdr.network = conint(1); } /* does the user provides a self-supplied data link type? if yes... change global header */ if (data_link_type != -1) { printf("[+] Changing data link type to %d.\n", data_link_type); global_hdr.network = conint(data_link_type); hdr_integ++; } /* evaluate the integrity of the global header */ if (hdr_integ == 0) { /* no field has been corrupted? --> header is intact */ printf("[+] The global pcap header seems to be fine!\n"); } else if (hdr_integ >= 4) { /* there have been five or more (of seven) corrupted fields? --> header is missing */ printf("[-] The global pcap header seems to be missing ==> CORRECTED!\n"); /* we need to set the file pointer to the beginning of the file, because * further packet search depends on this position and without a global * header the first packet might begin there */ fseeko(pcap, 0, SEEK_SET); /* set important header values to defaults */ global_hdr.snaplen = conint(PCAP_MAX_SNAPLEN); if (data_link_type != -1) { global_hdr.network = conint(data_link_type); } else { global_hdr.network = conint(1); } } else { /* there have been corrupted fields (less than five) --> header is corrupted */ printf("[-] The global pcap header seems to be corrupt! ==> CORRECTED\n"); } /* write the (maybe changed) global header to output file */ memcpy(writebuffer, &global_hdr, sizeof(global_hdr)); writepos += sizeof(global_hdr); /* END OF GLOBAL HEADER CHECK */ /* start checking packets now */ return(fix_pcap_packets(pcap, pcap_fix, filesize, global_hdr, hdr_integ, writebuffer, writepos)); } /* * Function: fix_pcap_packets * --------------------------- * tries to fix pcap packets inside a pcap file * * pcap: file pointer to input file * pcap_fix: file pointer to output file * filesize: input file size in bytes * global_hdr: global header struct * hdr_integ: global header integrity counter * writebuffer: buffer to write pcap packets into * writepos: position in buffer to write next packet to * * returns: >0 success (number of corruptions fixed) * 0 success (nothing to fix) * -1 error (not a pcap file) * -2 error (unable to repair) * -3 error (EOF reached while reading input file) * */ int fix_pcap_packets(FILE *pcap, FILE *pcap_fix, uint64_t filesize, struct global_hdr_s global_hdr, unsigned short hdr_integ, char *writebuffer, uint64_t writepos) { struct packet_hdr_s packet_hdr; /* packet header data */ struct packet_hdr_s next_packet_hdr; /* next packet header data to look forward */ char hdrbuffer[sizeof(packet_hdr)*2]; /* the buffer that will be used to find a proper packet */ char buffer[PCAP_MAX_SNAPLEN]; /* the packet body */ uint64_t bytes; /* read/written bytes counter */ unsigned int count; /* packet counter */ unsigned int step = 1; /* step counter for progress bar */ uint64_t pos = 0; /* position of current packet header */ uint64_t nextpos = 0; /* possible position of next packets header */ unsigned int last_correct_ts_sec = 0; /* timestamp of the last proper packet found (seconds) */ unsigned int last_correct_ts_usec = 0; /* timestamp of the last proper packet found (microseconds or nanoseconds) */ int ascii = 0; /* ascii counter for possible ascii-corrupted packets */ int corrupted = 0; /* corrupted packet counter for final output */ int res; /* the result of the header check == the offset of body shifting */ /* BEGIN PACKET CHECK */ printf("[*] Analyzing packets...\n"); /* this loop iterates the packets from top till down by checking the * pcap packet headers on plausibility. if any packet header has got * implausible information the packet will be handled as corrupted * and pcapfix will brute force the next packet. if the packet header * look plausible, pcapfix will check if the next packet is aligned and * if not check for overlapping packets. */ /* get current file pointer position */ pos = ftello(pcap); /* loop the pcap files packets until pos has reacher end of file */ for (count=1; pos < filesize; count++) { /* we only want the progress bar to be printed in non-verbose mode */ if ((verbose == 0) && (5*(float)pos/(float)filesize > step)) { print_progress(pos, filesize); step++; } /* check if a pcap packet header would fit into the file */ if (pos + sizeof(hdrbuffer) > filesize) { printf("[-] Not enough bytes left in file ==> SKIPPING %" PRIu64 " bytes.\n", filesize-pos); corrupted++; /* at least one packet has been found?? */ if (count == 1) { printf("[-] No packet has been found!\n"); return(-2); } /* end of file reached */ pos = filesize; break; } /* read the next packet header */ bytes = fread(hdrbuffer, sizeof(hdrbuffer), 1, pcap); if (bytes != 1) return -3; /* check if the packet header looks proper */ res = check_header(hdrbuffer, sizeof(hdrbuffer), last_correct_ts_sec, &global_hdr, &packet_hdr); if (res != -1) { /* realign packet body (based on possible-ascii corrupted pcap header) */ pos += res; fseeko(pcap, pos+sizeof(packet_hdr), SEEK_SET); /* try to read the packet body AND check if there are still at least 16 bytes left for the next pcap packet header */ if ((fread(&buffer, conint(packet_hdr.incl_len), 1, pcap) == 0) || ((filesize-(pos+sizeof(packet_hdr)+conint(packet_hdr.incl_len)) > 0) && (filesize-(pos+sizeof(packet_hdr)+conint(packet_hdr.incl_len)) < sizeof(packet_hdr)))) { /* fread returned an error (EOL while read the body) or the file is not large enough for the next pcap packet header (16bytes) */ /* thou the last packet has been cut of */ if (verbose >= 1) printf("[-] LAST PACKET MISMATCH (%u | %u | %u | %u)\n", conint(packet_hdr.ts_sec), conint(packet_hdr.ts_usec), conint(packet_hdr.incl_len), conint(packet_hdr.orig_len)); /* correct the packets included length field to match the end of file */ packet_hdr.incl_len = conint(filesize-pos-sizeof(packet_hdr)); /* the original length must not be smaller than the included length */ if (conint(packet_hdr.incl_len) > conint(packet_hdr.orig_len)) packet_hdr.orig_len = packet_hdr.incl_len; /* print out information */ printf("[+] CORRECTED Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", count, pos, conint(packet_hdr.ts_sec), conint(packet_hdr.ts_usec), conint(packet_hdr.incl_len), conint(packet_hdr.orig_len)); corrupted++; } /* OVERLAPPING DETECTION */ /* we do ONLY scan for overlapping if next packet is NOT aligned */ /* read next packet header */ bytes = fread(hdrbuffer, sizeof(hdrbuffer), 1, pcap); /* check if next packets header looks proper */ if (check_header(hdrbuffer, sizeof(hdrbuffer), conint(packet_hdr.ts_sec), &global_hdr, &next_packet_hdr) == -1) { /* the next packets header is corrupted thou we are going to scan through the prior packets body to look for an overlapped packet header * also look inside the next packets header + 16bytes of packet body, because we need to know HERE * do not leave the loop if the first packet has not been found yet AND deep scan mode is activated */ for (nextpos=pos+sizeof(packet_hdr)+1; (nextpos < pos+sizeof(packet_hdr)+conint(packet_hdr.incl_len)+2*sizeof(packet_hdr)) || (count == 1 && deep_scan == 1); nextpos++) { /* read the possible next packets header */ fseeko(pcap, nextpos, SEEK_SET); bytes = fread(hdrbuffer, sizeof(hdrbuffer), 1, pcap); /* check read success */ if (bytes == 0) break; /* heavy verbose output :-) */ if (verbose >= 2) printf("[*] Trying Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", (count+1), nextpos, conint(next_packet_hdr.ts_sec), conint(next_packet_hdr.ts_usec), conint(next_packet_hdr.incl_len), conint(next_packet_hdr.orig_len)); /* check the header for plausibility */ res = check_header(hdrbuffer, sizeof(hdrbuffer), last_correct_ts_sec, &global_hdr, &next_packet_hdr); if (res != -1) { /* we found a proper header inside the packets body! */ if (verbose >= 1) printf("[-] FOUND OVERLAPPING data of Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", (count+1), nextpos, conint(next_packet_hdr.ts_sec), conint(next_packet_hdr.ts_usec), conint(next_packet_hdr.incl_len), conint(next_packet_hdr.orig_len)); /* correct the prior packets length information fields to align the overlapped packet */ packet_hdr.incl_len = conint(nextpos-(pos+sizeof(packet_hdr))+res); /* also include ascii corruption offset (res) */ packet_hdr.orig_len = packet_hdr.incl_len; /* time correction for the FIRST packet only */ if (count == 1) { if (conint(next_packet_hdr.ts_usec) > 0) { /* next packets usec is > 0 ===> first packet will get same timestamp and usec - 1 */ packet_hdr.ts_sec = next_packet_hdr.ts_sec; packet_hdr.ts_usec = conint(conint(next_packet_hdr.ts_usec)-1); } else if(conint(next_packet_hdr.ts_sec) > 0) { /* else: next packets timestamp i > 0 ===> firt packet will get timestamp -1 and maximum usec */ packet_hdr.ts_sec = conint(conint(next_packet_hdr.ts_sec)-1); packet_hdr.ts_usec = conint(999999); } else { /* else: (next packets sec and usec are zero), this packet will get zero times as well */ packet_hdr.ts_sec = conint(0); packet_hdr.ts_usec = conint(0); } } /* print out information */ printf("[+] CORRECTED Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", count, pos, conint(packet_hdr.ts_sec), conint(packet_hdr.ts_usec), conint(packet_hdr.incl_len), conint(packet_hdr.orig_len)); corrupted++; /* overlapping seems to be a result of ascii-transferred pcap files via FTP */ ascii++; break; } } } /* reset file fointer to next packet */ fseeko(pcap, pos+sizeof(packet_hdr)+conint(packet_hdr.incl_len), SEEK_SET); /* we found a correct packet (and aligned it maybe) */ if (verbose >= 1) printf("[+] Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", count, pos, conint(packet_hdr.ts_sec), conint(packet_hdr.ts_usec), conint(packet_hdr.incl_len), conint(packet_hdr.orig_len)); /* write this packet */ // check if there is enough space in buffer int totalsize = sizeof(packet_hdr) + conint(packet_hdr.incl_len); if (writepos+totalsize > 1024000) { bytes = fwrite(writebuffer, writepos, 1, pcap_fix); writepos = 0; } // put new bytes into write buffer memcpy(writebuffer+writepos, &packet_hdr, sizeof(packet_hdr)); writepos += sizeof(packet_hdr); memcpy(writebuffer+writepos, buffer, conint(packet_hdr.incl_len)); writepos += conint(packet_hdr.incl_len); /* remember that this packets timestamp to evaluate futher timestamps */ last_correct_ts_sec = conint(packet_hdr.ts_sec); last_correct_ts_usec = conint(packet_hdr.ts_usec); } else { /* PACKET IS CORRUPT */ if (verbose >= 1) printf("[-] CORRUPTED Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", count, pos, conint(packet_hdr.ts_sec), conint(packet_hdr.ts_usec), conint(packet_hdr.incl_len), conint(packet_hdr.orig_len)); /* scan from the current position to the maximum packet size and look for a next proper packet header to align the corrupted packet * also do not leave the loop if the first packet has not been found yet AND deep scan mode is activated */ for (nextpos=pos+sizeof(packet_hdr)+1; (nextpos <= pos+sizeof(packet_hdr)+PCAP_MAX_SNAPLEN) || (count == 1 && deep_scan == 1); nextpos++) { /* read the possible next packets header */ fseeko(pcap, nextpos, SEEK_SET); if (fread(hdrbuffer, sizeof(hdrbuffer), 1, pcap) == 0) { /* did we read over EOF AND havent found the first packet yet? then we need to abort! */ if ((count == 1) && (deep_scan == 1)) { /* abort scan */ pos = 0; corrupted = -1; break; } printf("[*] End of file reached. Aligning last packet.\n"); /* check last packet for plausiblilty */ res = check_header(hdrbuffer, sizeof(hdrbuffer), last_correct_ts_sec, &global_hdr, &packet_hdr); if (res != 0) { printf("[-] Cannot align last packet, because it is broken.\n"); corrupted++; count--; break; } /* check passed */ /* align the last packet to match EOF */ packet_hdr.incl_len = conint(filesize-(pos+sizeof(packet_hdr))); packet_hdr.orig_len = packet_hdr.incl_len; /* if the is the first packet, we need to set timestamps to zero */ if (count == 1) { packet_hdr.ts_sec = conint(0); packet_hdr.ts_usec = conint(0); } else { /* else take the last correct timestamp and usec plus one */ packet_hdr.ts_sec = conint(last_correct_ts_sec); packet_hdr.ts_usec = conint(last_correct_ts_usec+1); } /* read the packets body (size based on the just found next packets position) */ fseeko(pcap, pos+sizeof(packet_hdr), SEEK_SET); bytes = fread(&buffer, conint(packet_hdr.incl_len), 1, pcap); // check if there is enough space in buffer int totalsize = sizeof(packet_hdr) + conint(packet_hdr.incl_len); if (writepos+totalsize > 1024000) { bytes = fwrite(writebuffer, writepos, 1, pcap_fix); writepos = 0; } // put new bytes into write buffer memcpy(writebuffer+writepos, &packet_hdr, sizeof(packet_hdr)); writepos += sizeof(packet_hdr); memcpy(writebuffer+writepos, buffer, conint(packet_hdr.incl_len)); writepos += conint(packet_hdr.incl_len); /* remember that this packets timestamp to evaluate futher timestamps */ last_correct_ts_sec = packet_hdr.ts_sec; last_correct_ts_usec = packet_hdr.ts_usec; /* print out information */ printf("[+] CORRECTED LAST Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", count, pos, conint(packet_hdr.ts_sec), conint(packet_hdr.ts_usec), conint(packet_hdr.incl_len), conint(packet_hdr.orig_len)); corrupted++; break; } /* shall we abort the whole scan?? */ if (corrupted == -1) break; /* heavy verbose output :-) */ if (verbose >= 2) printf("[*] Trying Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", (count+1), nextpos, conint(next_packet_hdr.ts_sec), conint(next_packet_hdr.ts_usec), conint(next_packet_hdr.incl_len), conint(next_packet_hdr.orig_len)); /* check if next packets header looks proper */ res = check_header(hdrbuffer, sizeof(hdrbuffer), last_correct_ts_sec, &global_hdr, &next_packet_hdr); if (res != -1) { /* if we found a packet that is below the top MAX_SNAPLEN bytes (deep scan) we cut it off and take the second packet as first one */ if ((nextpos-(pos+sizeof(packet_hdr)) > PCAP_MAX_SNAPLEN) && (count == 1) && (deep_scan == 1)) { if (verbose >= 1) printf("[+] (DEEP SCAN) FOUND FIRST Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", count, nextpos, conint(next_packet_hdr.ts_sec), conint(next_packet_hdr.ts_usec), conint(next_packet_hdr.incl_len), conint(next_packet_hdr.orig_len)); /* set the filepoint to the top of the first packet to be read in next loop iteration */ fseeko(pcap, nextpos, SEEK_SET); /* correct counter due to deep scan */ count--; } else { /* found next packet (NO deep scan mode) */ /* we found the NEXT packets header, now we are able to align the corrupted packet */ if (verbose >= 1) printf("[+] FOUND NEXT Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", (count+1), nextpos, conint(next_packet_hdr.ts_sec), conint(next_packet_hdr.ts_usec), conint(next_packet_hdr.incl_len), conint(next_packet_hdr.orig_len)); /* correct the corrupted pcap packet header to match the just found next packet header */ packet_hdr.incl_len = conint(nextpos-(pos+sizeof(packet_hdr))); packet_hdr.orig_len = packet_hdr.incl_len; if (count == 1) { /* time correction for the FIRST packet */ if (conint(next_packet_hdr.ts_usec) > 0) { /* next packets usec is > 0 ===> first packet will get same timestamp and usec - 1 */ packet_hdr.ts_sec = next_packet_hdr.ts_sec; packet_hdr.ts_usec = conint(conint(next_packet_hdr.ts_usec)-1); } else if(conint(next_packet_hdr.ts_sec) > 0) { /* else: next packets timestamp i > 0 ===> firt packet will get timestamp -1 and maximum usec */ packet_hdr.ts_sec = conint(conint(next_packet_hdr.ts_sec)-1); packet_hdr.ts_usec = conint(999999); } else { /* else: (next packets sec and usec are zero), this packet will get zero times as well */ packet_hdr.ts_sec = conint(0); packet_hdr.ts_usec = conint(0); } } else { /* ALL packets except the first one will use the last correct packets timestamps */ packet_hdr.ts_sec = conint(last_correct_ts_sec); packet_hdr.ts_usec = conint(last_correct_ts_usec+1); } /* read the packets body (size based on the just found next packets position) */ fseeko(pcap, pos+sizeof(packet_hdr), SEEK_SET); bytes = fread(&buffer, conint(packet_hdr.incl_len), 1, pcap); /* final check resulting packet for plausibility */ res = is_plausible(global_hdr, packet_hdr, last_correct_ts_sec); if (res == 0) { // check if there is enough space in buffer int totalsize = sizeof(packet_hdr) + conint(packet_hdr.incl_len); if (writepos+totalsize > 1024000) { bytes = fwrite(writebuffer, writepos, 1, pcap_fix); writepos = 0; } // put new bytes into write buffer memcpy(writebuffer+writepos, &packet_hdr, sizeof(packet_hdr)); writepos += sizeof(packet_hdr); memcpy(writebuffer+writepos, buffer, conint(packet_hdr.incl_len)); writepos += conint(packet_hdr.incl_len); /* remember that this packets timestamp to evaluate futher timestamps */ last_correct_ts_sec = conint(packet_hdr.ts_sec); last_correct_ts_usec = conint(packet_hdr.ts_usec); /* print out information */ printf("[+] CORRECTED Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", count, pos, conint(packet_hdr.ts_sec), conint(packet_hdr.ts_usec), conint(packet_hdr.incl_len), conint(packet_hdr.orig_len)); } else { /* prior packet is invalid */ printf("[-] Packet #%u at position %" PRIu64 " is invalid ==> SKIPPING.\n", count, pos); } } /* increase corruption counter */ corrupted++; /* leave the next packet search loop */ break; } } /* shall we abort the whole scan (due to deep scan did not succeed at all) */ if (corrupted == -1) break; /* did the counter exceed the maximum packet size? */ if ((count == 1 && deep_scan == 0) && (nextpos > pos+sizeof(packet_hdr)+PCAP_MAX_SNAPLEN)) { /* PACKET COULD NOT BE REPAIRED! */ if (verbose >= 1) printf("[-] Cannot align corrupted packet! \n"); break; } /* maximum search range reached? -> skip packet and keep on searching */ if (deep_scan == 0 && (nextpos > pos+sizeof(packet_hdr)+PCAP_MAX_SNAPLEN)) { if (verbose >= 1) printf("[-] No next packet found within max packet range --> SKIPPING!\n"); /* reset counter because no packet found */ count--; } } /* get current file pointer position to start next loop iteration */ pos = ftello(pcap); } // write remaining data into buffer bytes = fwrite(writebuffer, writepos, 1, pcap_fix); writepos = 0; if (verbose == 0) { print_progress(pos, filesize); } /* did we reach the end of pcap file? */ if (pos != filesize) { /* no ==> data missing == FAILED */ printf("[-] Reached EOF without finding more packets!\n"); corrupted = -1; /* the file could not be repaired */ } /* END PACKET CHECK */ /* EVALUATE RESULT */ if ((hdr_integ == 0) && (corrupted == 0)) { /* check allover failure / integrity count and corrupted counter */ /* no errors (header + packets correct) */ return(0); } else if (corrupted == -1) { /* check vor very high packet failure value ==> no recovery possible */ /* file could NOT be repaired */ if (count == 1) { /* even the first packet was corrupted and no other packet could be found */ return(-1); } else { /* the first packet was intact, but recovery is not possible nevertheless */ return(-2); } } else { /* check if we found at least one packet */ if (count == 1) { /* even the first packet was corrupted and no other packet could be found */ return(-1); } /* file has been successfully repaired (corruption fixed) */ printf("[*] Wrote %u packets to file.\n", count-1); /* are there any packets that might have been transferred in ascii mode? */ if (ascii) { printf("[!] This corruption seems to be a result of an ascii-mode transferred pcap file via FTP.\n"); printf("[!] The pcap structure of those files can be repaired, but the data inside might still be corrupted!\n"); } return(hdr_integ+corrupted); } } pcapfix-1.1.4/pcap.h000066400000000000000000000123771342160275100142560ustar00rootroot00000000000000/******************************************************************************* * * Copyright (c) 2012-2019 Robert Krause (ruport@f00l.de) * * This file is part of Pcapfix. * * Pcapfix 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 3 of the License, or any later version. * * Pcapfix 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 * Pcapfix. If not, see http://www.gnu.org/licenses/. * ******************************************************************************/ #ifndef PF_PCAP #define PF_PCAP #define PCAP_MAGIC 0xa1b2c3d4 /* the magic of the pcap global header (non swapped) */ #define PCAP_MAGIC_SWAPPED 0xd4c3b2a1 /* the magic of the pcap global header (non swapped) */ #define PCAPNG_MAGIC 0x0a0d0d0a /* the magic of the pcap global header (non swapped) */ #define PCAP_NSEC_MAGIC 0xa1b23c4d /* the magic of the pcap global header (nanoseconds - non swapped) */ #define PCAP_MAX_SNAPLEN 262144 /* the maximum snap length, should be 256K instead of 64K nowadays */ /* Global header (http://v2.nat32.com/pcap.htm) */ struct global_hdr_s { u_int32_t magic_number; /* magic number */ u_int16_t version_major; /* major version number */ u_int16_t version_minor; /* minor version number */ int32_t thiszone; /* GMT to local correction */ u_int32_t sigfigs; /* accuracy of timestamps */ u_int32_t snaplen; /* max length of captured packets, in octets */ u_int32_t network; /* data link type */ }; /* Packet header (http://v2.nat32.com/pcap.htm) */ struct packet_hdr_s { u_int32_t ts_sec; /* timestamp seconds */ u_int32_t ts_usec; /* timestamp microseconds */ u_int32_t incl_len; /* number of octets of packet saved in file */ u_int32_t orig_len; /* actual length of packet */ }; /* * Function: is_plausible * ----------------------- * check if the pcap packet header could be a plausible one by satisfying those conditions: * - packet size >= 16 bytes AND <= MAX_SNAPLEN bytes (included length AND original length) (conditions 1,2,3,4) * - included length <= original lenth (condition 5) * - packet timestamp is NOT older OR younger than the prior packets timestamp -+ one day (conditions 6,7) * - usec (microseconds) field <= 1000000 (conditions 8) * - usec (nanoseconds) field <= 1000000000 (conditions 9) * * global_hdr: the filled pcap header to check for snaplen * hdr: the filled packet header struct to check for plausibility * prior_ts: the prior packets timestamp (seconds) to check for time relation (condition 6,7) * * returns: 0 success * -X error (condition X failed) * */ int is_plausible(struct global_hdr_s global_hdr, struct packet_hdr_s hdr, unsigned int prior_ts); /* * Function: check_header * ----------------------- * this function takes a buffer and brute forces some possible ascii-corrupted bytes versus plausibility checks * * buffer: the buffer that might contain the possible pcap packet header * size: the size of the buffer (double pcap packet header size is a good choice) * priot_ts: the prior packets timestamp (to check for plausibility) * global_hdr: the pointer to the pcap buffer * hdr: the pointer to the packet header buffer (we use this to return the repaired header) * * returns: >=0 success (return value contains number of ascii corrupted bytes in hdr (we need this data to align the beginning of the packet body later) * -1 error (no valid pcap header found inside buffer) * */ int check_header(char *buffer, unsigned int size, unsigned int prior_ts, struct global_hdr_s *global_hdr, struct packet_hdr_s *hdr); /* * Function: fix_pcap * ------------------- * tries to fix a classic pcap file * * pcap: file pointer to input file * pcap_fix: file pointer to output file * * returns: >0 success (number of corruptions fixed) * 0 success (nothing to fix) * -1 error (not a pcap file) * -2 error (unable to repair) * -3 error (EOF reached while reading input file) * */ int fix_pcap(FILE *pcap, FILE *pcap_fix); /* * Function: fix_pcap_packets * --------------------------- * tries to fix pcap packets inside a pcap file * * pcap: file pointer to input file * pcap_fix: file pointer to output file * filesize: input file size in bytes * global_hdr: global header struct * hdr_integ: global header integrity counter * writebuffer: buffer to write pcap packets into * writepos: position in buffer to write next packet to * * returns: >0 success (number of corruptions fixed) * 0 success (nothing to fix) * -1 error (not a pcap file) * -2 error (unable to repair) * -3 error (EOF reached while reading input file) * */ int fix_pcap_packets(FILE *pcap, FILE *pcap_fix, uint64_t filesize, struct global_hdr_s global_hdr, unsigned short hdr_integ, char *writebuffer, uint64_t writepos); #endif pcapfix-1.1.4/pcap_kuznet.c000066400000000000000000001044651342160275100156510ustar00rootroot00000000000000/******************************************************************************* * * Copyright (c) 2012-2019 Robert Krause (ruport@f00l.de) * * This file is part of Pcapfix. * * Pcapfix 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 3 of the License, or any later version. * * Pcapfix 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 * Pcapfix. If not, see http://www.gnu.org/licenses/. * ******************************************************************************/ #include "pcapfix.h" #include "pcap_kuznet.h" /* * Function: is_plausible * ----------------------- * check if the pcap packet header could be a plausible one by satisfying those conditions: * - packet size >= 16 bytes AND <= MAX_SNAPLEN bytes (included length AND original length) (conditions 1,2,3,4,5) * - included length <= original lenth (conditions 6,7,8,9) * - packet timestamp is NOT older OR younger than the prior packets timestamp -+ one day (conditions 10,11,12) * - usec (microseconds) field <= 1000000 (conditions 13) * - usec (nanoseconds) field <= 1000000000 (conditions 14) * * global_hdr: the filled pcap header struct to check for snaplen * hdr: the filled packet header struct to check for plausibility * prior_ts: the prior packets timestamp (seconds) to check for time relation (condition 6,7) * * returns: 0 success * -X error (condition X failed) * */ int is_plausible_kuznetzov(struct global_hdr_s global_hdr, struct packet_hdr_kuznet_s hdr, unsigned int prior_ts) { /* check for minimum packet size * minimum packet size should be 16, but in some cases, e.g. local wlan capture, packet might * even be smaller --> decreased minimum size to 10 */ if (conint(hdr.incl_len) < 10) return(-1); if (conint(hdr.orig_len) < 10) return(-2); /* check packet limit with header field and max snaplen in soft mode (and dlt 119) the packet detection accepts a wider range */ if (soft_mode || global_hdr.network == 119) { /* in soft mode, global pcap snap length is ignored, instead MAX snaplen is used */ /* strange behavior for wlan: in some cases incl length seems to differ not following the configured max snap length; this leads to dropping valid wlan packets -> use soft mode for DLT 119 */ if (conint(hdr.incl_len) > PCAP_MAX_SNAPLEN) return(-3); } else { /* in hard mode (and not dlt 119), global pcap snap length is the limit in plausibility checks */ if (conint(hdr.incl_len) > conint(global_hdr.snaplen)) return(-4); } /* orig length should not be greater than pcap max snaplen */ if (conint(hdr.orig_len) > PCAP_MAX_SNAPLEN) return(-5); /* if the packet original size is larger than the included length, then the included length should be limited by the files snap length */ if (conint(hdr.orig_len) > conint(hdr.incl_len)) { /* check for dlt 119 == wlan */ if (global_hdr.network == 119) { /* strange behavior for wlan: in some cases incl length seems to differ not following the configured max snap length; this leads to dropping valid wlan packets -> ignore this check for DLT 119 */ } else { if (conint(hdr.incl_len) != conint(global_hdr.snaplen)) return(-7); } } /* the included length CAN NOT be larger than the original length */ /* check for LINKTYPE_LINUX_SLL (linux cooked) */ if (global_hdr.network == 113) { /* linux cooked headers are appended to packet length, but not to orig length so we need to remove it from incl_len before checking */ if (conint(hdr.incl_len)-16 > conint(hdr.orig_len)) return(-8); } else if (conint(hdr.incl_len) > conint(hdr.orig_len)) return(-9); /* check packet times (older) */ if (soft_mode) { /* in soft mode, there is no limit for older packets */ } else { /* in hard mode, packet must not be older than one day (related to prior packet) */ if ((prior_ts != 0) && (conint(hdr.ts_sec) > (prior_ts+86400))) return(-10); } /* check packet times (younger) */ if (soft_mode) { /* in soft mode, packet must not be younger than one day (related to prior packet) */ if ((prior_ts >= 86400) && (conint(hdr.ts_sec) < (prior_ts-86400))) return(-11); } else { /* in hard mode, packets must not be younger than prior packet */ if ((prior_ts != 0) && (conint(hdr.ts_sec) < prior_ts)) return(-12); } /* check for nano/microseconds (hard mode only) */ if (!soft_mode) { /* in hard mode */ /* usec (microseconds) must <= 1000000 */ /* kuznetzov never uses nanoseconds */ if (conint(hdr.ts_usec) > 1000000) return(-13); } /* all conditions fullfilled ==> everything fine! */ return(0); } /* * Function: check_header * ----------------------- * this function takes a buffer and brute forces some possible ascii-corrupted bytes versus plausibility checks * * buffer: the buffer that might contain the possible pcap packet header * size: the size of the buffer (double pcap packet header size is a good choice) * priot_ts: the prior packets timestamp (to check for plausibility) * global_hdr: the pointer to the pcap header * hdr: the pointer to the packet header buffer (we use this to return the repaired header) * * returns: >=0 success (return value contains number of ascii corrupted bytes in hdr (we need this data to align the beginning of the packet body later) * -1 error (no valid pcap header found inside buffer) * */ int check_header_kuznetzov(char *buffer, unsigned int size, unsigned int prior_ts, struct global_hdr_s *global_hdr, struct packet_hdr_kuznet_s *hdr) { unsigned int i; /* loop variable - first byte in buffer that could be beginning of packet */ int res; /* return value */ char *tmp; /* the temporary buffer that will be used for recursion */ /* does the buffer already contain a valid packet header (without any correction) ?? */ memcpy(hdr, buffer, sizeof(struct packet_hdr_kuznet_s)); res = is_plausible_kuznetzov(*global_hdr, *hdr, prior_ts); if (res == 0) return(0); if (verbose >= 2) printf("[-] Header plausibility check failed with error code %d\n", res); /* we need to abort the recursion of there are too many possible ascii corrupted bytes at ones */ /* 32-25 = 7 bytes maximum in 32bytes of data! */ if (size <= 25) return(-1); /* this loop will check the the buffer for occurence of 0x0D + 0x0A (UNIX to WINDOWS ascii corruption) */ for(i=0; i0 success (number of corruptions fixed) * 0 success (nothing to fix) * -1 error (not a pcap file) * -2 error (unable to repair) * -3 error (EOF reached while reading input file) * */ int fix_pcap_kuznetzov(FILE *pcap, FILE *pcap_fix) { struct global_hdr_s global_hdr; /* global header data */ /* we use a buffer to cache 1mb of writing... this way writing is faster and we can read and write the file at the same time */ char *writebuffer; uint64_t writepos = 0; uint64_t bytes; /* read/written bytes counter */ uint64_t filesize; /* filesize of input file in bytes */ unsigned short hdr_integ; /* integrity counter of global header */ /* init write buffer */ writebuffer = malloc(1024000); /* get size of input file */ fseeko(pcap, 0, SEEK_END); filesize = ftello(pcap); fseeko(pcap, 0, SEEK_SET); /* BEGIN GLOBAL HEADER CHECK */ /* check space of pcap global header */ if (filesize < sizeof(global_hdr)) { printf("[-] File is too small to read pcap global header.\n"); return(-2); } printf("[*] Analyzing Global Header...\n"); bytes = fread(&global_hdr, sizeof(global_hdr), 1, pcap); /* read first bytes of input file into struct */ if (bytes != 1) return -3; /* init integrity counter */ hdr_integ = 0; /* check for pcap's magic bytes () */ if (global_hdr.magic_number == PCAP_EXT_MAGIC) { /* we got a KUZNETZOV extended tcpdump magic (non swapped) */ if (verbose) printf("[+] Magic number: 0x%x (KUZNETZOV)\n", global_hdr.magic_number); } else if (global_hdr.magic_number == htonl(PCAP_EXT_MAGIC)) { /* we got a KUZNETZOV extended tcpdump magic (swapped) */ if (verbose) printf("[+] Magic number: 0x%x (KUZNETZOV - SWAPPED)\n", global_hdr.magic_number); swapped = 1; } else { /* we are not able to determine the pcap magic */ hdr_integ++; if (verbose) printf("[-] Magic number: 0x%x\n", global_hdr.magic_number); /* in this special case of kuznetzov, we do not try to assume it is a pcap file */ return(-1); } /* check for major version number (2) */ if (conshort(global_hdr.version_major) == 2) { /* current major version is 2 */ if (verbose) printf("[+] Major version number: %hu\n", conshort(global_hdr.version_major)); } else { hdr_integ++; if (verbose) printf("[-] Major version number: %hu\n", conshort(global_hdr.version_major)); global_hdr.version_major = conshort(2); } /* check for minor version number */ if (conshort(global_hdr.version_minor) == 4) { /* current minor version is 4 */ if (verbose) printf("[+] Minor version number: %hu\n", conshort(global_hdr.version_minor)); } else { hdr_integ++; if (verbose) printf("[-] Minor version number: %hu\n", conshort(global_hdr.version_minor)); global_hdr.version_minor = conshort(4); } /* check for GTM to local correction */ if (conshort(global_hdr.thiszone) == 0) { /* in practise time stamps are always in GTM, so the correction is always zero */ if (verbose) printf("[+] GTM to local correction: %d\n", conint(global_hdr.thiszone)); } else { hdr_integ++; if (verbose) printf("[-] GTM to local correction: %d\n", conint(global_hdr.thiszone)); global_hdr.thiszone = conint(0); } /* check for accuracy of timestamps */ if (conint(global_hdr.sigfigs) == 0) { /* all capture tools set this to zero */ if (verbose) printf("[+] Accuracy of timestamps: %u\n", conint(global_hdr.sigfigs)); } else { hdr_integ++; if (verbose) printf("[-] Accuracy of timestamps: %u\n", conint(global_hdr.sigfigs)); global_hdr.sigfigs = conint(0); } /* check for max packet length */ if ((conint(global_hdr.snaplen) > 0) && (conint(global_hdr.snaplen) <= PCAP_MAX_SNAPLEN)) { /* typically 262144 nowadays */ if (verbose) printf("[+] Max packet length: %u\n", conint(global_hdr.snaplen)); } else { hdr_integ++; if (verbose) printf("[-] Max packet length: %u\n", conint(global_hdr.snaplen)); global_hdr.snaplen = conint(PCAP_MAX_SNAPLEN); } /* check for data link type (http://www.tcpdump.org/linktypes.html) */ if (conint(global_hdr.network) <= 251) { /* data link types are <= 251 */ if (verbose) printf("[+] Data link type: %u\n", conint(global_hdr.network)); } else { hdr_integ++; if (verbose) printf("[-] Data link type: %u\n", conint(global_hdr.network)); /* if data link type is corrupt, we set it to ethernet (user supplied param will be processed afterwards) */ global_hdr.network = conint(1); } /* does the user provides a self-supplied data link type? if yes... change global header */ if (data_link_type != -1) { printf("[+] Changing data link type to %d.\n", data_link_type); global_hdr.network = conint(data_link_type); hdr_integ++; } /* evaluate the integrity of the global header */ if (hdr_integ == 0) { /* no field has been corrupted? --> header is intact */ printf("[+] The global pcap header seems to be fine!\n"); } else if (hdr_integ >= 4) { /* there have been five or more (of seven) corrupted fields? --> header is missing */ printf("[-] The global pcap header seems to be missing ==> CORRECTED!\n"); /* we need to set the file pointer to the beginning of the file, because * further packet search depends on this position and without a global * header the first packet might begin there */ fseeko(pcap, 0, SEEK_SET); /* set important header values to defaults */ global_hdr.snaplen = conint(PCAP_MAX_SNAPLEN); if (data_link_type != -1) { global_hdr.network = conint(data_link_type); } else { global_hdr.network = conint(1); } } else { /* there have been corrupted fields (less than five) --> header is corrupted */ printf("[-] The global pcap header seems to be corrupt! ==> CORRECTED\n"); } /* write the (maybe changed) global header to output file */ memcpy(writebuffer, &global_hdr, sizeof(global_hdr)); writepos += sizeof(global_hdr); /* END OF GLOBAL HEADER CHECK */ /* start handling packets */ return(fix_pcap_packets_kuznetzov(pcap, pcap_fix, filesize, global_hdr, hdr_integ, writebuffer, writepos)); } /* * Function: fix_pcap_packets * --------------------------- * tries to fix pcap packets inside a pcap file * * pcap: file pointer to input file * pcap_fix: file pointer to output file * filesize: input file size in bytes * global_hdr: global header struct * hdr_integ: global header integrity counter * writebuffer: buffer to write pcap packets into * writepos: position in buffer to write next packet to * * returns: >0 success (number of corruptions fixed) * 0 success (nothing to fix) * -1 error (not a pcap file) * -2 error (unable to repair) * -3 error (EOF reached while reading input file) * */ int fix_pcap_packets_kuznetzov(FILE *pcap, FILE *pcap_fix, uint64_t filesize, struct global_hdr_s global_hdr, unsigned short hdr_integ, char *writebuffer, uint64_t writepos) { struct packet_hdr_kuznet_s packet_hdr; /* packet header data */ struct packet_hdr_kuznet_s next_packet_hdr; /* next packet header data to look forward */ char hdrbuffer[sizeof(packet_hdr)*2]; /* the buffer that will be used to find a proper packet */ char buffer[PCAP_MAX_SNAPLEN]; /* the packet body */ uint64_t bytes; /* read/written bytes counter */ unsigned int count; /* packet counter */ unsigned int step = 1; /* step counter for progress bar */ uint64_t pos = 0; /* position of current packet header */ uint64_t nextpos = 0; /* possible position of next packets header */ unsigned int last_correct_ts_sec = 0; /* timestamp of the last proper packet found (seconds) */ unsigned int last_correct_ts_usec = 0; /* timestamp of the last proper packet found (microseconds or nanoseconds) */ int ascii = 0; /* ascii counter for possible ascii-corrupted packets */ int corrupted = 0; /* corrupted packet counter for final output */ int res; /* the result of the header check == the offset of body shifting */ /* BEGIN PACKET CHECK */ printf("[*] Analyzing packets...\n"); /* this loop iterates the packets from top till down by checking the * pcap packet headers on plausibility. if any packet header has got * implausible information the packet will be handled as corrupted * and pcapfix will brute force the next packet. if the packet header * look plausible, pcapfix will check if the next packet is aligned and * if not check for overlapping packets. */ /* get current file pointer position */ pos = ftello(pcap); /* loop the pcap files packets until pos has reacher end of file */ for (count=1; pos < filesize; count++) { /* we only want the progress bar to be printed in non-verbose mode */ if ((verbose == 0) && (5*(float)pos/(float)filesize > step)) { print_progress(pos, filesize); step++; } /* check if a pcap packet header would fit into the file */ if (pos + sizeof(hdrbuffer) > filesize) { printf("[-] Not enough bytes left in file ==> SKIPPING %" PRIu64 " bytes.\n", filesize-pos); corrupted++; /* at least one packet has been found?? */ if (count == 1) { printf("[-] No packet has been found!\n"); return(-2); } /* end of file reached */ pos = filesize; break; } /* read the next packet header */ bytes = fread(hdrbuffer, sizeof(hdrbuffer), 1, pcap); if (bytes != 1) return -3; /* check if the packet header looks proper */ res = check_header_kuznetzov(hdrbuffer, sizeof(hdrbuffer), last_correct_ts_sec, &global_hdr, &packet_hdr); if (res != -1) { /* realign packet body (based on possible-ascii corrupted pcap header) */ pos += res; fseeko(pcap, pos+sizeof(packet_hdr), SEEK_SET); /* try to read the packet body AND check if there are still at least 24 bytes left for the next pcap packet header */ if ((fread(&buffer, conint(packet_hdr.incl_len), 1, pcap) == 0) || ((filesize-(pos+sizeof(packet_hdr)+conint(packet_hdr.incl_len)) > 0) && (filesize-(pos+sizeof(packet_hdr)+conint(packet_hdr.incl_len)) < sizeof(packet_hdr)))) { /* fread returned an error (EOL while read the body) or the file is not large enough for the next pcap packet header (24bytes) */ /* thou the last packet has been cut of */ if (verbose >= 1) printf("[-] LAST PACKET MISMATCH (%u | %u | %u | %u)\n", conint(packet_hdr.ts_sec), conint(packet_hdr.ts_usec), conint(packet_hdr.incl_len), conint(packet_hdr.orig_len)); /* correct the packets included length field to match the end of file */ packet_hdr.incl_len = conint(filesize-pos-sizeof(packet_hdr)); /* the original length must not be smaller than the included length */ if (conint(packet_hdr.incl_len) > conint(packet_hdr.orig_len)) packet_hdr.orig_len = packet_hdr.incl_len; /* print out information */ printf("[+] CORRECTED Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", count, pos, conint(packet_hdr.ts_sec), conint(packet_hdr.ts_usec), conint(packet_hdr.incl_len), conint(packet_hdr.orig_len)); corrupted++; } /* OVERLAPPING DETECTION */ /* we do ONLY scan for overlapping if next packet is NOT aligned */ /* read next packet header */ bytes = fread(hdrbuffer, sizeof(hdrbuffer), 1, pcap); /* check if next packets header looks proper */ if (check_header_kuznetzov(hdrbuffer, sizeof(hdrbuffer), conint(packet_hdr.ts_sec), &global_hdr, &next_packet_hdr) == -1) { /* the next packets header is corrupted thou we are going to scan through the prior packets body to look for an overlapped packet header * also look inside the next packets header + 24bytes of packet body, because we need to know HERE * do not leave the loop if the first packet has not been found yet AND deep scan mode is activated */ for (nextpos=pos+sizeof(packet_hdr)+1; (nextpos < pos+sizeof(packet_hdr)+conint(packet_hdr.incl_len)+2*sizeof(packet_hdr)) || (count == 1 && deep_scan == 1); nextpos++) { /* read the possible next packets header */ fseeko(pcap, nextpos, SEEK_SET); bytes = fread(hdrbuffer, sizeof(hdrbuffer), 1, pcap); /* check read success */ if (bytes == 0) break; /* heavy verbose output :-) */ if (verbose >= 2) printf("[*] Trying Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", (count+1), nextpos, conint(next_packet_hdr.ts_sec), conint(next_packet_hdr.ts_usec), conint(next_packet_hdr.incl_len), conint(next_packet_hdr.orig_len)); /* check the header for plausibility */ res = check_header_kuznetzov(hdrbuffer, sizeof(hdrbuffer), last_correct_ts_sec, &global_hdr, &next_packet_hdr); if (res != -1) { /* we found a proper header inside the packets body! */ if (verbose >= 1) printf("[-] FOUND OVERLAPPING data of Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", (count+1), nextpos, conint(next_packet_hdr.ts_sec), conint(next_packet_hdr.ts_usec), conint(next_packet_hdr.incl_len), conint(next_packet_hdr.orig_len)); /* correct the prior packets length information fields to align the overlapped packet */ packet_hdr.incl_len = conint(nextpos-(pos+sizeof(packet_hdr))+res); /* also include ascii corruption offset (res) */ packet_hdr.orig_len = packet_hdr.incl_len; /* time correction for the FIRST packet only */ if (count == 1) { if (conint(next_packet_hdr.ts_usec) > 0) { /* next packets usec is > 0 ===> first packet will get same timestamp and usec - 1 */ packet_hdr.ts_sec = next_packet_hdr.ts_sec; packet_hdr.ts_usec = conint(conint(next_packet_hdr.ts_usec)-1); } else if(conint(next_packet_hdr.ts_sec) > 0) { /* else: next packets timestamp i > 0 ===> firt packet will get timestamp -1 and maximum usec */ packet_hdr.ts_sec = conint(conint(next_packet_hdr.ts_sec)-1); packet_hdr.ts_usec = conint(999999); } else { /* else: (next packets sec and usec are zero), this packet will get zero times as well */ packet_hdr.ts_sec = conint(0); packet_hdr.ts_usec = conint(0); } } /* print out information */ printf("[+] CORRECTED Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", count, pos, conint(packet_hdr.ts_sec), conint(packet_hdr.ts_usec), conint(packet_hdr.incl_len), conint(packet_hdr.orig_len)); corrupted++; /* overlapping seems to be a result of ascii-transferred pcap files via FTP */ ascii++; break; } } } /* reset file fointer to next packet */ fseeko(pcap, pos+sizeof(packet_hdr)+conint(packet_hdr.incl_len), SEEK_SET); /* we found a correct packet (and aligned it maybe) */ if (verbose >= 1) printf("[+] Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", count, pos, conint(packet_hdr.ts_sec), conint(packet_hdr.ts_usec), conint(packet_hdr.incl_len), conint(packet_hdr.orig_len)); /* write this packet */ // check if there is enough space in buffer int totalsize = sizeof(packet_hdr) + conint(packet_hdr.incl_len); if (writepos+totalsize > 1024000) { bytes = fwrite(writebuffer, writepos, 1, pcap_fix); writepos = 0; } // put new bytes into write buffer memcpy(writebuffer+writepos, &packet_hdr, sizeof(packet_hdr)); writepos += sizeof(packet_hdr); memcpy(writebuffer+writepos, buffer, conint(packet_hdr.incl_len)); writepos += conint(packet_hdr.incl_len); /* remember that this packets timestamp to evaluate futher timestamps */ last_correct_ts_sec = conint(packet_hdr.ts_sec); last_correct_ts_usec = conint(packet_hdr.ts_usec); } else { /* PACKET IS CORRUPT */ if (verbose >= 1) printf("[-] CORRUPTED Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", count, pos, conint(packet_hdr.ts_sec), conint(packet_hdr.ts_usec), conint(packet_hdr.incl_len), conint(packet_hdr.orig_len)); /* scan from the current position to the maximum packet size and look for a next proper packet header to align the corrupted packet * also do not leave the loop if the first packet has not been found yet AND deep scan mode is activated */ for (nextpos=pos+sizeof(packet_hdr)+1; (nextpos <= pos+sizeof(packet_hdr)+PCAP_MAX_SNAPLEN) || (count == 1 && deep_scan == 1); nextpos++) { /* read the possible next packets header */ fseeko(pcap, nextpos, SEEK_SET); if (fread(hdrbuffer, sizeof(hdrbuffer), 1, pcap) == 0) { /* did we read over EOF AND havent found the first packet yet? then we need to abort! */ if ((count == 1) && (deep_scan == 1)) { /* abort scan */ pos = 0; corrupted = -1; break; } printf("[*] End of file reached. Aligning last packet.\n"); /* check last packet for plausiblilty */ res = check_header_kuznetzov(hdrbuffer, sizeof(hdrbuffer), last_correct_ts_sec, &global_hdr, &packet_hdr); if (res != 0) { printf("[-] Cannot align last packet, because it is broken.\n"); corrupted++; count--; break; } /* check passed */ /* align the last packet to match EOF */ packet_hdr.incl_len = conint(filesize-(pos+sizeof(packet_hdr))); packet_hdr.orig_len = packet_hdr.incl_len; /* if the is the first packet, we need to set timestamps to zero */ if (count == 1) { packet_hdr.ts_sec = conint(0); packet_hdr.ts_usec = conint(0); } else { /* else take the last correct timestamp and usec plus one */ packet_hdr.ts_sec = conint(last_correct_ts_sec); packet_hdr.ts_usec = conint(last_correct_ts_usec+1); } /* read the packets body (size based on the just found next packets position) */ fseeko(pcap, pos+sizeof(packet_hdr), SEEK_SET); bytes = fread(&buffer, conint(packet_hdr.incl_len), 1, pcap); // check if there is enough space in buffer int totalsize = sizeof(packet_hdr) + conint(packet_hdr.incl_len); if (writepos+totalsize > 1024000) { bytes = fwrite(writebuffer, writepos, 1, pcap_fix); writepos = 0; } // put new bytes into write buffer memcpy(writebuffer+writepos, &packet_hdr, sizeof(packet_hdr)); writepos += sizeof(packet_hdr); memcpy(writebuffer+writepos, buffer, conint(packet_hdr.incl_len)); writepos += conint(packet_hdr.incl_len); /* remember that this packets timestamp to evaluate futher timestamps */ last_correct_ts_sec = packet_hdr.ts_sec; last_correct_ts_usec = packet_hdr.ts_usec; /* print out information */ printf("[+] CORRECTED LAST Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", count, pos, conint(packet_hdr.ts_sec), conint(packet_hdr.ts_usec), conint(packet_hdr.incl_len), conint(packet_hdr.orig_len)); corrupted++; break; } /* shall we abort the whole scan?? */ if (corrupted == -1) break; /* heavy verbose output :-) */ if (verbose >= 2) printf("[*] Trying Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", (count+1), nextpos, conint(next_packet_hdr.ts_sec), conint(next_packet_hdr.ts_usec), conint(next_packet_hdr.incl_len), conint(next_packet_hdr.orig_len)); /* check if next packets header looks proper */ res = check_header_kuznetzov(hdrbuffer, sizeof(hdrbuffer), last_correct_ts_sec, &global_hdr, &next_packet_hdr); if (res != -1) { /* if we found a packet that is below the top MAX_SNAPLEN bytes (deep scan) we cut it off and take the second packet as first one */ if ((nextpos-(pos+sizeof(packet_hdr)) > PCAP_MAX_SNAPLEN) && (count == 1) && (deep_scan == 1)) { if (verbose >= 1) printf("[+] (DEEP SCAN) FOUND FIRST Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", count, nextpos, conint(next_packet_hdr.ts_sec), conint(next_packet_hdr.ts_usec), conint(next_packet_hdr.incl_len), conint(next_packet_hdr.orig_len)); /* set the filepoint to the top of the first packet to be read in next loop iteration */ fseeko(pcap, nextpos, SEEK_SET); /* correct counter due to deep scan */ count--; } else { /* found next packet (NO deep scan mode) */ /* we found the NEXT packets header, now we are able to align the corrupted packet */ if (verbose >= 1) printf("[+] FOUND NEXT Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", (count+1), nextpos, conint(next_packet_hdr.ts_sec), conint(next_packet_hdr.ts_usec), conint(next_packet_hdr.incl_len), conint(next_packet_hdr.orig_len)); /* correct the corrupted pcap packet header to match the just found next packet header */ packet_hdr.incl_len = conint(nextpos-(pos+sizeof(packet_hdr))); packet_hdr.orig_len = packet_hdr.incl_len; if (count == 1) { /* time correction for the FIRST packet */ if (conint(next_packet_hdr.ts_usec) > 0) { /* next packets usec is > 0 ===> first packet will get same timestamp and usec - 1 */ packet_hdr.ts_sec = next_packet_hdr.ts_sec; packet_hdr.ts_usec = conint(conint(next_packet_hdr.ts_usec)-1); } else if(conint(next_packet_hdr.ts_sec) > 0) { /* else: next packets timestamp i > 0 ===> firt packet will get timestamp -1 and maximum usec */ packet_hdr.ts_sec = conint(conint(next_packet_hdr.ts_sec)-1); packet_hdr.ts_usec = conint(999999); } else { /* else: (next packets sec and usec are zero), this packet will get zero times as well */ packet_hdr.ts_sec = conint(0); packet_hdr.ts_usec = conint(0); } } else { /* ALL packets except the first one will use the last correct packets timestamps */ packet_hdr.ts_sec = conint(last_correct_ts_sec); packet_hdr.ts_usec = conint(last_correct_ts_usec+1); } /* read the packets body (size based on the just found next packets position) */ fseeko(pcap, pos+sizeof(packet_hdr), SEEK_SET); bytes = fread(&buffer, conint(packet_hdr.incl_len), 1, pcap); /* final check resulting packet for plausibility */ res = is_plausible_kuznetzov(global_hdr, packet_hdr, last_correct_ts_sec); if (res == 0) { // check if there is enough space in buffer int totalsize = sizeof(packet_hdr) + conint(packet_hdr.incl_len); if (writepos+totalsize > 1024000) { bytes = fwrite(writebuffer, writepos, 1, pcap_fix); writepos = 0; } // put new bytes into write buffer memcpy(writebuffer+writepos, &packet_hdr, sizeof(packet_hdr)); writepos += sizeof(packet_hdr); memcpy(writebuffer+writepos, buffer, conint(packet_hdr.incl_len)); writepos += conint(packet_hdr.incl_len); /* remember that this packets timestamp to evaluate futher timestamps */ last_correct_ts_sec = conint(packet_hdr.ts_sec); last_correct_ts_usec = conint(packet_hdr.ts_usec); /* print out information */ printf("[+] CORRECTED Packet #%u at position %" PRIu64 " (%u | %u | %u | %u).\n", count, pos, conint(packet_hdr.ts_sec), conint(packet_hdr.ts_usec), conint(packet_hdr.incl_len), conint(packet_hdr.orig_len)); } else { /* prior packet is invalid */ printf("[-] Packet #%u at position %" PRIu64 " is invalid ==> SKIPPING.\n", count, pos); } } /* increase corruption counter */ corrupted++; /* leave the next packet search loop */ break; } } /* shall we abort the whole scan (due to deep scan did not succeed at all) */ if (corrupted == -1) break; /* did the counter exceed the maximum packet size? */ if ((count == 1 && deep_scan == 0) && (nextpos > pos+sizeof(packet_hdr)+PCAP_MAX_SNAPLEN)) { /* PACKET COULD NOT BE REPAIRED! */ if (verbose >= 1) printf("[-] Cannot align corrupted packet! \n"); break; } /* maximum search range reached? -> skip packet and keep on searching */ if (deep_scan == 0 && (nextpos > pos+sizeof(packet_hdr)+PCAP_MAX_SNAPLEN)) { if (verbose >= 1) printf("[-] No next packet found within max packet range --> SKIPPING!\n"); /* reset counter because no packet found */ count--; } } /* get current file pointer position to start next loop iteration */ pos = ftello(pcap); } // write remaining data into buffer bytes = fwrite(writebuffer, writepos, 1, pcap_fix); writepos = 0; if (verbose == 0) { print_progress(pos, filesize); } /* did we reach the end of pcap file? */ if (pos != filesize) { /* no ==> data missing == FAILED */ printf("[-] Reached EOF without finding more packets!\n"); corrupted = -1; /* the file could not be repaired */ } /* END PACKET CHECK */ /* EVALUATE RESULT */ if ((hdr_integ == 0) && (corrupted == 0)) { /* check allover failure / integrity count and corrupted counter */ /* no errors (header + packets correct) */ return(0); } else if (corrupted == -1) { /* check vor very high packet failure value ==> no recovery possible */ /* file could NOT be repaired */ if (count == 1) { /* even the first packet was corrupted and no other packet could be found */ return(-1); } else { /* the first packet was intact, but recovery is not possible nevertheless */ return(-2); } } else { /* check if we found at least one packet */ if (count == 1) { /* even the first packet was corrupted and no other packet could be found */ return(-1); } /* file has been successfully repaired (corruption fixed) */ printf("[*] Wrote %u packets to file.\n", count-1); /* are there any packets that might have been transferred in ascii mode? */ if (ascii) { printf("[!] This corruption seems to be a result of an ascii-mode transferred pcap file via FTP.\n"); printf("[!] The pcap structure of those files can be repaired, but the data inside might still be corrupted!\n"); } return(hdr_integ+corrupted); } } pcapfix-1.1.4/pcap_kuznet.h000066400000000000000000000114041342160275100156440ustar00rootroot00000000000000/******************************************************************************* * * Copyright (c) 2012-2019 Robert Krause (ruport@f00l.de) * * This file is part of Pcapfix. * * Pcapfix 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 3 of the License, or any later version. * * Pcapfix 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 * Pcapfix. If not, see http://www.gnu.org/licenses/. * ******************************************************************************/ #ifndef PF_PCAP_KUZNET #define PF_PCAP_KUZNET #define PCAP_EXT_MAGIC 0xa1b2cd34 /* the magic of the extended pcap global header (non swapped) */ #define PCAP_EXT_MAGIC_SWAPPED 0x34cdb2a1 /* the magic of the extended pcap global header (swapped) */ #include "pcap.h" /* KUZNETZOV Packet Header http://tcpreplay.synfin.net/doxygen_yhsiam/tcpcapinfo_8c-source.html - is there an official documentation? */ struct packet_hdr_kuznet_s { u_int32_t ts_sec; /* timestamp seconds */ u_int32_t ts_usec; /* timestamp microseconds */ u_int32_t incl_len; /* number of octets of packet saved in file */ u_int32_t orig_len; /* actual length of packet */ int32_t index; u_int16_t protocol; u_int8_t pkt_type; }; /* * Function: is_plausible * ----------------------- * check if the pcap packet header could be a plausible one by satisfying those conditions: * - packet size >= 16 bytes AND <= MAX_SNAPLEN bytes (included length AND original length) (conditions 1,2,3,4) * - included length <= original lenth (condition 5) * - packet timestamp is NOT older OR younger than the prior packets timestamp -+ one day (conditions 6,7) * - usec (microseconds) field <= 1000000 (conditions 8) * - usec (nanoseconds) field <= 1000000000 (conditions 9) * * global_hdr: the filled pcap header to check for snaplen * hdr: the filled packet header struct to check for plausibility * prior_ts: the prior packets timestamp (seconds) to check for time relation (condition 6,7) * * returns: 0 success * -X error (condition X failed) * */ int is_plausible_kuznet(struct global_hdr_s global_hdr, struct packet_hdr_s hdr, unsigned int prior_ts); /* * Function: check_header * ----------------------- * this function takes a buffer and brute forces some possible ascii-corrupted bytes versus plausibility checks * * buffer: the buffer that might contain the possible pcap packet header * size: the size of the buffer (double pcap packet header size is a good choice) * priot_ts: the prior packets timestamp (to check for plausibility) * global_hdr: the pointer to the pcap buffer * hdr: the pointer to the packet header buffer (we use this to return the repaired header) * * returns: >=0 success (return value contains number of ascii corrupted bytes in hdr (we need this data to align the beginning of the packet body later) * -1 error (no valid pcap header found inside buffer) * */ int check_header_kuznetzov(char *buffer, unsigned int size, unsigned int prior_ts, struct global_hdr_s *global_hdr, struct packet_hdr_kuznet_s *hdr); /* * Function: fix_pcap * ------------------- * tries to fix a classic pcap file * * pcap: file pointer to input file * pcap_fix: file pointer to output file * * returns: >0 success (number of corruptions fixed) * 0 success (nothing to fix) * -1 error (not a pcap file) * -2 error (unable to repair) * -3 error (EOF reached while reading input file) * */ int fix_pcap_kuznetzov(FILE *pcap, FILE *pcap_fix); /* * Function: fix_pcap_packets * --------------------------- * tries to fix pcap packets inside a pcap file * * pcap: file pointer to input file * pcap_fix: file pointer to output file * filesize: input file size in bytes * global_hdr: global header struct * hdr_integ: global header integrity counter * writebuffer: buffer to write pcap packets into * writepos: position in buffer to write next packet to * * returns: >0 success (number of corruptions fixed) * 0 success (nothing to fix) * -1 error (not a pcap file) * -2 error (unable to repair) * -3 error (EOF reached while reading input file) * */ int fix_pcap_packets_kuznetzov(FILE *pcap, FILE *pcap_fix, uint64_t filesize, struct global_hdr_s global_hdr, unsigned short hdr_integ, char *writebuffer, uint64_t writepos); #endif pcapfix-1.1.4/pcapfix.1000066400000000000000000000301741342160275100146710ustar00rootroot00000000000000.TH PCAPFIX 1 "22 JAN 2019" .SH "NAME" pcapfix \- repair pcap and pcapng files .SH "SYNOPSIS" \fBpcapfix\fP [\-d] [\-n] [\-o filename] [\-t DATA_LINK_TYPE] [\-v] filename .SH "DESCRIPTION" Pcapfix is a tool to repair your damaged or corrupted pcap and pcapng files. It is written in C and released under the GNU General Public License. To fix your pcap files the tool first checks for an intact pcap global header and repairs it if there are some corrupted bytes. It there seems to be no global header at all, pcapfix adds a self-created one at the beginning of the file. In a second step the tool tries to find pcap packet headers inside the file, below the global header. It checks if the values are correct (or seem to be correct) and tries to repair a packet if there is something wrong. To fix your pcapng files the tool loops through all packet headers that can be found in the file. It checks for mandatory Section Header and Interface Description Block and creates them if missing. Pcapfix checks for correct block sizes and valid option fields. If something is wrong, invalid fields are repaired (if possible) or skipped and adjusted to finally get a proper pcapng file. .SH "OPTIONS" .TP 5 \-d, \-\-deep\-scan Force deep scan (default = 0) .br \-s, \-\-soft\-mode Switch to soft mode packet detection (default = 0) .br This option will force pcapfix to scan for any packet inside the whole file (instead of the first 262144 (max snaplen) bytes only). .TP \-n, \-\-pcapng Force File Format to PCAPNG (default = 0) .br This option will force pcapfix to repair the input file as it were in pcapng format (useful for destroyed file headers). .TP \-o, \-\-outfile Set the output file name. Default will be input file prepended by "fixed_". .TP \-t, \-\-data\-link\-type Data Link Type (default = 1) .br (See NOTES section below.) .TP \-v, \-\-verbose Enable verbose output (default = 0) .br You can use multiple \-v options to increase verbosity. .br An verbosity of 2 will result in very much output data during package search. .SH "EXAMPLES" .TP 5 Repair the pcap file using deep scan mode, because large blocks of the file are corrupted. pcapfix \-d file.pcap .TP Repair the file damaged_file.pcapng using verbose output. pcapfix \-v damaged_file.pcapng .TP Repair the file wlan_traffic.pcap and force the data link type to be 119 (PRISM HEADER). pcapfix \-t 119 wlan_traffic.pcap .TP Repair the file damaged.pcapng which file header is corrupted and force its format to be pcapng. pcapfix \-n damaged.pcapng .SH "NOTES" .TP 5 \fIOutput file name\fP If you want to perform the reparation process on the input file without creating a separate output file - e.g. in case you are out of space, you can use the -o option and give the same name as the input file. WARNING: This process is DANGEROUS and may destroy your data. You should only use this option if you know what you are doing and accept the risk of losing the input file. .TP \fIDeep scan\fP In classic pcap files, pcapfix will only scan the first 65536 bytes (maximum packet length) for a proper first packet. If you want to force packet detection even above this limit (e.g. because your file has been heavily destroyed) you can use the deep scan option (\-d). This option is not necessary for pcapng files because the whole file is arranged in blocks that are 'unlimited' by default. In result pcapfix will always scan the whole pcapng file for further blocks. .TP \fISoft mode\fP There are programs that breach some pcap conventions when writing files. Ignoring those rules do not break the pcap file but they make it difficult for pcapfix to identify the packets in case of broken files. By default pcapfix uses hard mode. If you encounter problems when repairing files, try to switch to soft mode (-s). Pcapfix will then try to find the packets in a more tolerant way. .TP \fIPCAPNG Format\fP Pcapfix will try to identify the file format to repair (pcap / pcapng) before doing any further checks. If the header itself is corrupted, it will assume the format to be classic pcap. To change this behaviour you can force the tool to do a pcapng-repair by supplying \-n (\-\-pcapng) option. .TP \fIVerbosity\fP You can use multiple \-v options to increase verbosity. An verbosity of 2 will result in very much output data during package search. .TP \fIASCII-mode transferred Files (FTP)\fP Pcapfix is able to repair pcap files that have been transferred in ascii-mode via FTP. In those files a proper pcap structure will be created only to make them readable by wireshark etc. The data inside the packets (and some pcap headers) might still be corrupted. To repair those packets a deeper look inside the packet structure (e.g. checksum) will be necessary. .TP \fIData Link Types\fP You can make pcapfix change / select your data link type by supplying \-t option. Although you may select a data link type number between 0 and 255, only the following types are assigned: If the data link type field is corrupt, pcapfix will select LINKTYPE_ETHERNET by default. See http://www.tcpdump.org/linktypes.html for further information. NUMBER LINK_TYPE 0 LINKTYPE_NULL .br 1 LINKTYPE_ETHERNET .br 6 LINKTYPE_TOKEN_RING .br 7 LINKTYPE_ARCNET_BSD .br 8 LINKTYPE_SLIP .br 9 LINKTYPE_PPP .br 10 LINKTYPE_FDDI .br 50 LINKTYPE_PPP_HDLC .br 51 LINKTYPE_PPP_ETHER .br 100 LINKTYPE_ATM_RFC1483 .br 101 LINKTYPE_RAW .br 104 LINKTYPE_C_HDLC .br 105 LINKTYPE_IEEE802_11 .br 107 LINKTYPE_FRELAY .br 108 LINKTYPE_LOOP .br 113 LINKTYPE_LINUX_SLL .br 114 LINKTYPE_LTALK .br 117 LINKTYPE_PFLOG .br 119 LINKTYPE_PRISM_HEADER .br 122 LINKTYPE_IP_OVER_FC .br 123 LINKTYPE_SUNATM .br 127 LINKTYPE_IEEE802_11_RADIO .br 129 LINKTYPE_ARCNET_LINUX .br 138 LINKTYPE_APPLE_IP_OVER_IEEE1394 .br 139 LINKTYPE_MTP2_WITH_PHDR .br 140 LINKTYPE_MTP2 .br 141 LINKTYPE_MTP3 .br 142 LINKTYPE_SCCP .br 143 LINKTYPE_DOCSIS .br 144 LINKTYPE_LINUX_IRDA .br 147-162 LINKTYPE_USER0-LINKTYPE-USER15 .br 163 LINKTYPE_IEEE802_11_RADIO_AVS .br 166 LINKTYPE_PPP_PPPD .br 169 LINKTYPE_GPRS_LLC .br 177 LINKTYPE_LINUX_LAPD .br 187 LINKTYPE_BLUETOOTH_HCI_H4 .br 189 LINKTYPE_USB_LINUX .br 192 LINKTYPE_PPI .br 195 LINKTYPE_IEEE802_15_4 .br 196 LINKTYPE_SITA .br 197 LINKTYPE_ERF .br 201 LINKTYPE_BLUETOOTH_HCI_H4_WITH_PHDR .br 202 LINKTYPE_AX25_KISS .br 203 LINKTYPE_LAPD .br 204 LINKTYPE_PPP_WITH_DIR .br 205 LINKTYPE_C_HDLC_WITH_DIR .br 206 LINKTYPE_FRELAY_WITH_DIR .br 209 LINKTYPE_IPMB_LINUX .br 215 LINKTYPE_IEEE802_15_4_NONASK_PHY .br 220 LINKTYPE_USB_LINUX_MMAPPED .br 224 LINKTYPE_FC_2 .br 225 LINKTYPE_FC_2_WITH_FRAME_DELIMS .br 226 LINKTYPE_IPNET .br 227 LINKTYPE_CAN_SOCKETCAN .br 228 LINKTYPE_IPV4 .br 229 LINKTYPE_IPV6 .br 230 LINKTYPE_IEEE802_15_4_NOFCS .br 231 LINKTYPE_DBUS .br 235 LINKTYPE_DVB_CI .br 236 LINKTYPE_MUX27010 .br 237 LINKTYPE_STANAG_5066_D_PDU .br 239 LINKTYPE_NFLOG .br 240 LINKTYPE_NETANALYZER .br 241 LINKTYPE_NETANALYZER_TRANSPARENT .br 242 LINKTYPE_IPOIB .br 243 LINKTYPE_MPEG_2_TS .br 244 LINKTYPE_NG40 .br 245 LINKTYPE_NFC_LLCP .SH "DEVELOPMENT" This tool is still under development! Please send any further wishes, feature requests or problems in compiling and execution to ruport@f00l.de. Additionally You may send me pcap/pcapng files that could not be repaired too in order to improve pcapfix and get your file repaired. For further information visit the pcapfix homepage at http://f00l.de/pcapfix/. .SH "MESSAGES AND EXIT CODES" 1 , file was corrupted and has been repaired .br 0 , file is proper; nothing to repair .br \-1 , invalid options / parameters given .br \-2 , cannot open input file for reading .br \-3 , cannot open output file for writing .br \-4 , input file is empty .br \-5 , input file is too small .br \-6 , file type not supported .br \-11 , not a pcap/pcapng file .br \-12 , unable to repair the file .br \-13 , EOF while reading input file .br \-255 , unknown error .SH "HISTORY" .TP 5 1.1.4 - 22.01.2019 * added support for extended pcap file format (kuznetzov) .br * fixed dtl 113 (linux cooked) handling (thanks to Andre Luyer) .br * improved hard and soft mode checks for younger/older packets .br * minor fixes and improvements .TP 1.1.3 - 04.09.2018 * implemtented soft mode (for plausibility checks) .TP 1.1.2 - 16.07.2018 * fixed cross compiling (thanks to Helmut Grohne) .br * increased maximum snap length to 262144 .TP 1.1.1 - 25.12.2017 * added write buffers and support to perform repair process without creation of a separate output file .br * fixed another MacOS build problem .br * fixed minor bugs .TP 1.1.0 - 31.08.2013 * added checks for valid pcapng format (epb) .br * added \-\-outfile parameter to chose fixed file name .br * improved pcapng packet alignment (pb, spb, nrb) .br * improved pcapng option fields handling .br * improved status and verbosity outputs .br * fixed reparation bugs with swapped pcap files .br * fixed MacOS compile problem .br * fixed windows output file name extension missing .br * fixed many minor bugs .TP 1.0.2 - 18.02.2013 * added support for files larger than 2GB on 32bit systems .TP 1.0.1 - 03.11.2013 * added reparation block type id zero (pcapng) .br * added reparation of capture length inside EPB (pcapng) .br * set data link type to ethernet on missing header (pcap) .br * changed missing pcap header threshold .br * fixed minor bugs .TP 1.0.0 - 12.10.2013 * added pcapng support .br * added nanoseconds support (Issue #1) .br * improved console output .br * minor bugs fixed .TP 0.7.3 - 16.06.2013 * added snoop file detection .br * added large file support on 32bit architectures .br * improved missing header detection .br * fixed compiling errors on hurd and kfreebsd architectures .br * fixed minor bugs .TP 0.7.2 - 30.03.2013 * compiles on Apple systems properly now .br * fixed problems installing man-pages (on some systems) .TP 0.7.1 - 03.01.2013 * REALLY fixed file pointer exception on windows64 systems .br * updated man-page .TP 0.7 - 18.10.2012 * added support for swapped (big endian) pcap files .br * compiles on OpenBSD properly now .br * fixed file pointer exception on windows64 systems .br * fixed detection bug when corrupted packet is larger than 65536 bytes .br * fixed minimal packet limit to cope with wlan traffic .TP 0.6 - 20.05.2012 * added deep scan option (\-d) to force packet detection inside the whole file .br * detects ascii-corruption in pcap header (unix->win) .br * improved global header and packet checks (0 <= usec <= 1000000) .br * repair files that first packet is entirely corrupted .br * repair oversized packets .br * improved last packet mismatch correction .br * fixed reading packets over EOF .TP 0.5 - 05.05.2012 * repair files that packets were not saved chronologically .br * detect and repair overlapping packets .br * detect and repair cut-off pcap files .br * detect and repair ascii-mode transferred pcap files (pcap headers only!) .br * added progress bar .br * added man-page .TP 0.4 - 27.04.2012 * completely redesigned packet detection algorithm (replaced bottom-up-recovery with brute-force-packet-guessing) .br * improved detection rate by additional plausibility checks .br * increased speed when repairing large pcap files .TP 0.3 - 31.03.2012 * when recovering packets size will be checked to be smaller than 65536 .br * added recognition when a file does not seem to be a pcap file at all .br * compiles on windows systems properly now (tested with dev-cpp) .br * added option to manually select data link type .TP 0.2 - 11.03.2012 * pcapfix compiles on 64bit systems correctly now .br * fixed segfault when no filename was given .br * fixed (input) file not found bug on directory differ .br * added recognition of other data link types beside ethernet in global header .br * added source code documentation .TP 0.1 - 01.03.2012 * this is the first version, everything has changed thou :-) .SH "COPYRIGHT" Copyright (c) 2012-2018 Robert Krause Pcapfix 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 3 of the License, or any later version. Pcapfix 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. .SH "AUTHOR" Written by Robert Krause . pcapfix-1.1.4/pcapfix.c000066400000000000000000000413601342160275100147520ustar00rootroot00000000000000/******************************************************************************* * * Copyright (c) 2012-2019 Robert Krause (ruport@f00l.de) * * This file is part of Pcapfix. * * Pcapfix 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 3 of the License, or any later version. * * Pcapfix 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 * Pcapfix. If not, see http://www.gnu.org/licenses/. * * Last Modified: 22.01.2019 * ******************************************************************************* * * Description: * * Pcapfix is a tool to repair your damaged or corrupted pcap and pcapng files. * It is written in C and released under the GNU General Public License. * * To fix your pcap files the tool first checks for an intact pcap global header * and repairs it if there are some corrupted bytes. It there seems to be no * global header at all, pcapfix adds a self-created one at the beginning of the * file. In a second step the tool tries to find pcap packet headers inside the * file, below the global header. It checks if the values are correct (or seem * to be correct) and tries to repair a packet if there is something wrong. * * To fix your pcapng files the tool loops through all packet headers that can * be found in the file. It checks for mandatory Section Header Block and * Interface Description Block and creates them if missing. Pcapfix checks for * correct block sizes and valid option fields. If something is wrong, invalid * fields are repaired (if possible) or skipped and adjusted to finally get a * proper pcapng file. * ******************************************************************************/ #include "pcapfix.h" #include "pcap.h" #include "pcap_kuznet.h" #include "pcapng.h" #define VERSION "1.1.4" /* pcapfix version */ #define BTSNOOP_MAGIC 0x6E737462 /* btsnoop file magic (first 4 bytes) */ #define SNOOP_MAGIC 0x6f6f6e73 /* snoop file magic (first 4 bytes) */ #define NETMON_MAGIC 0x55424d47 /* netmon file magic */ #define NETMON11_MAGIC 0x53535452 /* netmon 1.1 file magic */ #define ETHERPEEK_MAGIC 0x7265767f /* EtherPeek/AiroPeek/OmniPeek file magic */ /* configuration variables */ int deep_scan = 0; /* deep scan option (default: no deep scan) */ int soft_mode = 0; /* soft mode option (default: no soft mode) */ int keep_outfile = 0; /* keep output file even if nothing needed fixing (default: don't) */ int verbose = 0; /* verbose output option (default: dont be verbose) */ int swapped = 0; /* pcap file is swapped (big endian) */ int data_link_type = -1; /* data link type (default: LINKTYPE_ETHERNET) */ int pcapng = 0; /* file format to assume */ /* header placeholder */ unsigned int header_magic; /* * Function: usage * ---------------- * prints out the usage information of pcapfix * invoked when running without / with too less parameters * * in: the name of pcapfix' binary file * */ void usage(char *progname) { printf("Usage: %s [OPTIONS] filename\n", progname); printf("OPTIONS:"); printf( "\t-d , --deep-scan \tDeep scan (pcap only)\n"); printf("\t\t-s , --soft-mode \tSoft mode (packet detection)\n"); printf("\t\t-n , --pcapng \tforce pcapng format\n"); printf("\t\t-o , --outfile \tset output file name\n"); printf("\t\t-k , --keep-outfile \tdon't delete the output file if nothing needed to be fixed\n"); printf("\t\t-t , --data-link-type \tData link type\n"); printf("\t\t-v , --verbose \tVerbose output\n"); printf("\n"); } /* * Function: conshort * ------------------- * Convertes a short variable into correct byte order (if necessary) * depending on the global -swapped- settings of pcap data. * * This function MUST encapsulate all variables that might be swapped! * * var: the variable that shall be converted into correct byte order * * returns: the variable in correct byte order * */ unsigned short conshort(unsigned short var) { if (swapped == 0) return(var); return(htons(var)); } /* * Function: conint * ----------------- * Convertes an integer variable into correct byte order (if necessary) * depending on the global -swapped- settings of pcap data. * * This function MUST encapsulate all variables that might be swapped! * * var: the variable that shall be converted into correct byte order * * returns: the variable in correct byte order * */ unsigned int conint(unsigned int var) { if (swapped == 0) return(var); return(htonl(var)); } /* * Function: print_progress * ------------------------- * prints the progess line when using pcapfix in non-verbose mode * * pos: the current filepointer position * filesize: the size of the input pcap file in bytes * */ void print_progress(uint64_t pos, uint64_t filesize) { float percentage; /* pencentage variable */ /* calculate the current percentage of file analyzing progress */ percentage = (float)pos/(float)filesize; /* print the first part of the line including percentage output */ printf("[*] Progress: %6.02f %%\n", percentage*100); } /* * Function: main * --------------- * - takes arguments from command line * - opens input and output files * - checks for file format (pcap, pcapng, snoop, ...) * - runs fixing function depending on format * - evaluates result * * argc: number of cmd line args * argv: array of pointers to cmd line args * * returns: 1 success (filed repaired) * 0 success (nothing to fix) * -1 error (parameters) * -2 error (cannot open input file) * -3 error (cannot open output file for writing) * -4 error (input file is empty) * -5 error (input file is too small) * -6 error (filetype is known but not supported) * -11 error (not a pcap file) * -12 error (unable to recover pcap file) * -13 error (EOF while reading input file) * -255 error (unkown) * */ int main(int argc, char *argv[]) { FILE *pcap, *pcap_fix; /* input and output file */ int option_index = 0; /* getopt_long option index */ int c; /* getopts loop counter */ int res; /* return values */ char *filename; /* filename of input file */ char *filebname; /* filebasename of input file (without path) */ char *filename_fix = NULL; /* filename of output file */ uint64_t bytes; /* read/written blocks counter */ uint64_t filesize; /* file size of input pcap file in bytes */ /* init getopt_long options struct */ struct option long_options[] = { {"deep-scan", no_argument, 0, 'd'}, /* --deep-scan == -d */ {"soft-mode", no_argument, 0, 's'}, /* --soft-mode == -s */ {"pcapng", no_argument, 0, 'n'}, /* --pcapng == -n */ {"outfile", required_argument, 0, 'o'}, /* --outfile == -o */ {"keep-outfile", no_argument, 0, 'k'}, /* --keep-outfile == -k */ {"data-link-type", required_argument, 0, 't'}, /* --data-link-type == -t */ {"verbose", no_argument, 0, 'v'}, /* --verbose == -v */ {0, 0, 0, 0} }; /* print out pcapfix header information */ printf("pcapfix %s (c) 2012-2019 Robert Krause\n\n", VERSION); /* scan for options and arguments */ while ((c = getopt_long(argc, argv, ":t:ko:v::d::s::n::", long_options, &option_index)) != -1) { switch (c) { case 0: /* getopt_long options evaluation */ break; case 'd': /* deep scan */ deep_scan++; break; case 's': /* soft mode */ soft_mode++; break; case 'k': /* keep outfile even if nothing needed fixing */ keep_outfile++; break; case 'n': /* pcapng format */ pcapng++; break; case 'o': /* output file name */ filename_fix = malloc(strlen(optarg)+1); strcpy(filename_fix, optarg); break; case 't': /* data link type */ data_link_type = atoi(optarg); break; case 'v': /* verbose */ verbose++; break; case '?': /* unknown option */ usage(argv[0]); return -1; default: abort(); } } /* filename is first argument */ filename = argv[optind++]; /* if filename is not set, output usage information */ if (filename == NULL) { usage(argv[0]); return(-1); } /* open input file */ printf("[*] Reading from file: %s\n", filename); pcap = fopen(filename, "rb"); if (!pcap) { perror("[-] Cannot open input file"); return(-2); } /* check for preassigned fixed file name */ if (filename_fix == NULL) { /* open output file */ /* we need to extract the basename first (windows and linux use different functions) */ filebname = malloc(strlen(filename)+1); #ifdef __WIN32__ char *fileext = malloc(strlen(filename)); /* file extention to be used in output file as well */ _splitpath(filename, NULL, NULL, filebname, fileext); /* windown method (_splitpath) */ strcat(filebname, fileext); free(fileext); # else strcpy(filebname, basename(filename)); /* unix method (basename) */ #endif filename_fix = malloc(strlen(filebname)+7); /* size of outputfile depends on inputfile's length */ /* prepare output file name: "fixed_" + inputfilename */ strcpy(filename_fix, "fixed_"); strcat(filename_fix, filebname); free(filebname); } /* open the file for writing */ // is output == inputfile ?? if yes, then open for read / append // if no, then open for writing only if (strcmp(filename, filename_fix) == 0) pcap_fix = fopen(filename_fix, "rb+"); else pcap_fix = fopen(filename_fix, "w+"); if (!pcap_fix) { perror("[-] Cannot open output file for writing"); return(-3); } printf("[*] Writing to file: %s\n", filename_fix); /* basic checks of input file */ /* get file size */ fseeko(pcap, 0, SEEK_END); filesize = ftello(pcap); printf("[*] File size: %" PRIu64 " bytes.\n", filesize); /* check for empty file */ if (filesize == 0) { printf("[-] The source file is empty.\n\n"); fclose(pcap); fclose(pcap_fix); if (strcmp(filename, filename_fix) != 0) remove(filename_fix); return(-4); } /* reset file pointer to file begin */ fseeko(pcap, 0, SEEK_SET); /* read header to header magic for further inspection */ bytes = fread(&header_magic, sizeof(header_magic), 1, pcap); if (bytes == 0) { printf("[-] Cannot read file header (file too small?).\n\n"); fclose(pcap); fclose(pcap_fix); if (strcmp(filename, filename_fix) != 0) remove(filename_fix); return(-5); } fseeko(pcap, 0, SEEK_SET); /* check for file type */ switch (header_magic) { /* etherpeek file format --> often used with pcapfix but NOT supported (yet) */ case ETHERPEEK_MAGIC: printf("[-] This is a EtherPeek/AiroPeek/OmniPeek file, which is not supported.\n\n"); /* close input and output files */ fclose(pcap); fclose(pcap_fix); /* delete output file due to no changes failure */ if (strcmp(filename, filename_fix) != 0) remove(filename_fix); return(-6); /* netmon file format --> often used with pcapfix but NOT supported (yet) */ case NETMON_MAGIC: case NETMON11_MAGIC: printf("[-] This is a NetMon file, which is not supported.\n\n"); /* close input and output files */ fclose(pcap); fclose(pcap_fix); /* delete output file due to no changes failure */ if (strcmp(filename, filename_fix) != 0) remove(filename_fix); return(-6); /* SNOOP file format --> often used with pcapfix but NOT supported (yet) */ case SNOOP_MAGIC: printf("[-] This is a SNOOP file, which is not supported.\n\n"); /* close input and output files */ fclose(pcap); fclose(pcap_fix); /* delete output file due to no changes failure */ if (strcmp(filename, filename_fix) != 0) remove(filename_fix); return(-6); case BTSNOOP_MAGIC: printf("[-] This is a BTSNOOP file, which is not supported.\n\n"); /* close input and output files */ fclose(pcap); fclose(pcap_fix); /* delete output file due to no changes failure */ if (strcmp(filename, filename_fix) != 0) remove(filename_fix); return(-6); /* extended pcap format (KUZNETZOV) */ case PCAP_EXT_MAGIC: case PCAP_EXT_MAGIC_SWAPPED: printf("[+] This is an extended tcpdump file.\n"); res = fix_pcap_kuznetzov(pcap, pcap_fix); break; /* PCAPNG format */ case PCAPNG_MAGIC: printf("[+] This is a PCAPNG file.\n"); res = fix_pcapng(pcap, pcap_fix); break; /* classic PCAP format */ case PCAP_MAGIC: case PCAP_MAGIC_SWAPPED: printf("[+] This is a PCAP file.\n"); if (pcapng > 0) { printf("[!] Your wish is my command! I will handle it as PCAPNG nevertheless.\n"); res = fix_pcapng(pcap, pcap_fix); } else { res = fix_pcap(pcap, pcap_fix); } break; /* if the file type is unknown (maybe header corrupted) assume classic PCAP format */ default: if (pcapng > 0) { printf("[*] Unknown file type. Assuming PCAPNG format.\n"); res = fix_pcapng(pcap, pcap_fix); } else { printf("[*] Unknown file type. Assuming PCAP format.\n"); res = fix_pcap(pcap, pcap_fix); } break; } /* evaluate result of fixing function */ switch (res) { /* no corruption found; all fields were valid */ case 0: printf("[*] Your pcap file looks proper. Nothing to fix!\n\n"); /* close input and output files */ fclose(pcap); fclose(pcap_fix); /* delete output file due to no changes failure */ if ((strcmp(filename, filename_fix) != 0) && (0 == keep_outfile)) { remove(filename_fix); } return(0); /* there is NO indication that this has ever been a pcap file at all */ case -1: printf("[-] FAILED: This file does not seem to be a pcap/pcapng file!\n\n"); /* close input and output files */ fclose(pcap); fclose(pcap_fix); /* delete output file due to failure */ if (strcmp(filename, filename_fix) != 0) remove(filename_fix); /* deep scan / soft mode dependent output */ if (deep_scan == 0 || soft_mode == 0) printf("If you are SURE that there are pcap packets inside, try with deep scan (-d) (pcap only!) and/or soft mode (-s) to find them!\n\n"); else printf("There is REALLY no pcap packet inside this file!!!\n\n"); return(res-10); /* it seems to be a pcap file, but pcapfix can NOT repair it (yet) */ case -2: printf("[-] FAILED: Unable to recover pcap file.\n\n"); /* some hints for verbose mode and pcapfix improvement support */ if (!verbose) printf("Try executing pcapfix with -v option to trace the corruption!\n"); printf("You may help to improve pcapfix by sending your pcap file to ruport@f00l.de\n\n"); /* close input and output files */ fclose(pcap); fclose(pcap_fix); /* delete output file due to failure */ if (strcmp(filename, filename_fix) != 0) remove(filename_fix); return(res-10); /* fread did not succeed; might be caused by early EOF; but it should NOT happen at all */ case -3: printf("[-] FAILED: EOF while reading input file.\n\n"); /* some hints for verbose mode and pcapfix improvement support */ if (!verbose) printf("Try executing pcapfix with -v option to trace the corruption!\n"); printf("You may help to improve pcapfix by sending your pcap file to ruport@f00l.de\n\n"); /* close input and output files */ fclose(pcap); fclose(pcap_fix); /* delete output file due to failure */ if (strcmp(filename, filename_fix) != 0) remove(filename_fix); return(res-10); } /* file has been progressed properly. what is the result (number of corruptions)? */ if (res > 0) { /* Successful repaired! (res > 0) */ fclose(pcap); off_t finalpos = ftello(pcap_fix); fclose(pcap_fix); int success = truncate(filename_fix, finalpos); if (success != 0) printf("[-] Truncating result file failed!"); printf("[+] SUCCESS: %d Corruption(s) fixed!\n\n", res); return(0); } else { /* Unknown Error (res < 0); this should NEVER happen! */ printf("[-] UNKNOWN ERROR (%d)\n\n", res); printf("Please report this bug to ruport@f00l.de (including -v -v output).\n\n"); return(-255); } } pcapfix-1.1.4/pcapfix.h000066400000000000000000000057741342160275100147700ustar00rootroot00000000000000/******************************************************************************* * * Copyright (c) 2012-2019 Robert Krause (ruport@f00l.de) * * This file is part of Pcapfix. * * Pcapfix 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 3 of the License, or any later version. * * Pcapfix 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 * Pcapfix. If not, see http://www.gnu.org/licenses/. * ******************************************************************************/ #ifndef PF_PCAPFIX #define PF_PCAPFIX #define _FILE_OFFSET_BITS 64 #include #include #include #include #include #include #ifdef __WIN32__ #include /* needed for htons,htonl on windows systems */ /* fseeko, ftello are unkown on mingw, use o64 instead */ #define fseeko fseeko64 #define ftello ftello64 /* compatibility for fixed size integer types on windows */ typedef uint8_t u_int8_t; typedef uint16_t u_int16_t; typedef uint32_t u_int32_t; #else #include /* needed for basename */ #include /* htons, htonl */ #endif /* * Function: conshort * ------------------- * Convertes a short variable into correct byte order (if necessary) * depending on the global -swapped- settings of pcap data. * * This function MUST encapsulate all variables that might be swapped! * * var: the variable that shall be converted into correct byte order * * returns: the variable in correct byte order * */ unsigned short conshort(unsigned short var); /* * Function: conint * ----------------- * Convertes an integer variable into correct byte order (if necessary) * depending on the global -swapped- settings of pcap data. * * This function MUST encapsulate all variables that might be swapped! * * var: the variable that shall be converted into correct byte order * * returns: the variable in correct byte order * */ unsigned int conint(unsigned int var); /* * Function: print_progress * ------------------------- * prints the progess line when using pcapfix in non-verbose mode * * pos: the current filepointer position * filesize: the size of the input pcap file in bytes * */ void print_progress(uint64_t pos, uint64_t filesize); /* global configuration variables */ extern int deep_scan; /* deep scan option (default: no depp scan) */ extern int verbose; /* verbose output option (default: dont be verbose) */ extern int swapped; /* pcap file is swapped (big endian) */ extern int data_link_type; /* data link type (default: LINKTYPE_ETHERNET) */ extern int soft_mode; /* soft plausibility check (default: OFF) */ #endif pcapfix-1.1.4/pcapng.c000066400000000000000000001770151342160275100145770ustar00rootroot00000000000000/******************************************************************************* * * Copyright (c) 2012-2019 Robert Krause (ruport@f00l.de) * * This file is part of Pcapfix. * * Pcapfix 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 3 of the License, or any later version. * * Pcapfix 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 * Pcapfix. If not, see http://www.gnu.org/licenses/. * ******************************************************************************/ #include "pcapfix.h" #include "pcapng.h" /* Header of all pcapng blocks */ struct block_header { u_int32_t block_type; /* block type */ u_int32_t total_length; /* block length */ }; /* Header of all pcapng options */ struct option_header { u_int16_t option_code; /* option code - depending of block (0 - end of opts, 1 - comment are in common) */ u_int16_t option_length; /* option length - length of option in bytes (will be padded to 32bit) */ }; /* Section Header Block (SHB) - ID 0x0A0D0D0A */ struct section_header_block { u_int32_t byte_order_magic; /* byte order magic - indicates swapped data */ u_int16_t major_version; /* major version of pcapng (1 atm) */ u_int16_t minor_version; /* minor version of pcapng (0 atm) */ int64_t section_length; /* length of section - can be -1 (parsing necessary) */ }; /* Interface Description Block (IDB) - ID 0x00000001 */ struct interface_description_block { u_int16_t linktype; /* the link layer type (was -network- in classic pcap global header) */ u_int16_t reserved; /* 2 bytes of reserved data */ u_int32_t snaplen; /* maximum number of bytes dumped from each packet (was -snaplen- in classic pcap global header */ }; /* Packet Block (PB) - ID 0x00000002 (OBSOLETE - EPB should be used instead) */ struct packet_block { u_int16_t interface_id; /* the interface the packet was captured from - identified by interface description block in current section */ u_int16_t drops_count; /* packet dropped by IF and OS since prior packet */ u_int32_t timestamp_high; /* high bytes of timestamp */ u_int32_t timestamp_low; /* low bytes of timestamp */ u_int32_t caplen; /* length of packet in the capture file (was -incl_len- in classic pcap packet header) */ u_int32_t len; /* length of packet when transmitted (was -orig_len- in classic pcap packet header) */ }; /* Simple Packet Block (SPB) - ID 0x00000003 */ struct simple_packet_block { u_int32_t len; /* length of packet when transmitted (was -orig_len- in classic pcap packet header) */ }; /* Name Resolution Block (NRB) - ID 0x00000004 */ struct name_resolution_block { u_int16_t record_type; /* type of record (ipv4 / ipv6) */ u_int16_t record_length; /* length of record value */ }; /* Interface Statistics Block - ID 0x00000005 */ struct interface_statistics_block { u_int32_t interface_id; /* the interface the stats refer to - identified by interface description block in current section */ u_int32_t timestamp_high; /* high bytes of timestamp */ u_int32_t timestamp_low; /* low bytes of timestamp */ }; /* Enhanced Packet Block (EPB) - ID 0x00000006 */ struct enhanced_packet_block { u_int32_t interface_id; /* the interface the packet was captured from - identified by interface description block in current section */ u_int32_t timestamp_high; /* high bytes of timestamp */ u_int32_t timestamp_low; /* low bytes of timestamp */ u_int32_t caplen; /* length of packet in the capture file (was -incl_len- in classic pcap packet header) */ u_int32_t len; /* length of packet when transmitted (was -orig_len- in classic pcap packet header) */ }; /* * Function: fix_pcapng * --------------------- * tries to fix a pcapng file * * pcap: file pointer to input file * pcap_fix: file pointer to output file * * returns: >0 success (number of corruptions fixed) * 0 success (nothing to fix) * -1 error (not a pcap file) * -2 error (unable to repair) * -3 error (EOF while reading input file) * */ int fix_pcapng(FILE *pcap, FILE *pcap_fix) { struct block_header bh; /* Block Header */ struct option_header oh; /* Option Header */ struct section_header_block shb; /* Section Header Block */ struct interface_description_block idb; /* Interface Description Block */ struct packet_block pb; /* Packet Block */ struct simple_packet_block spb; /* Simple Packet Block */ struct name_resolution_block nrb; /* Name Resolution Block */ struct interface_statistics_block isb; /* Interface Statistics Block */ struct enhanced_packet_block epb; /* Enhanced Packet Block */ char *data; /* Storage for packet data */ char *new_block; /* Storage for new (maybe repaired) block to finally write into ouput file */ // we use a buffer to cache 1mb of writing... this way writing is faster and // we can read and write the file at the same time char *writebuffer; uint64_t writepos = 0; uint64_t bytes; /* written bytes/blocks counter */ uint64_t padding; /* calculation for padding bytes */ uint64_t pos; /* current block position in input file */ uint64_t filesize; /* size of input file */ unsigned int block_pos; /* current position inside -new_block- to write further data to */ unsigned int check; /* variable to check end of blocks sizes */ unsigned int count; /* option / record counter to create EOO/EOR if necessary */ unsigned int shb_num; /* number of SHB counter */ unsigned int idb_num; /* number of IDB counter */ unsigned int step; /* step counter for progress bar */ unsigned int packets; int64_t left; /* bytes left to proceed until current blocks end is reached */ int fixes; /* corruptions counter */ int res; /* return values */ /* init write buffer */ writebuffer = malloc(1024000); /* get file size of input file */ fseeko(pcap, 0, SEEK_END); filesize = ftello(pcap); fseeko(pcap, 0, SEEK_SET); /* init variables */ pos = 0; /* begin file check at position 0 */ packets = 0; fixes = 0; /* no corruptions fixed yet */ shb_num = 0; /* no SHBs progressed yet */ idb_num = 0; /* no IDBs progressed yet */ step = 1; /* progress bar starts at 0 steps */ /* loop every block inside pcapng file until end of file is reached */ while (pos < filesize-sizeof(bh)) { /* print out progress bar if in non-verbose mode */ if ((verbose == 0) && (5*(float)pos/(float)filesize > step)) { print_progress(pos, filesize); step++; } /* read the header of the current block */ bytes = fread(&bh, sizeof(bh), 1, pcap); if (bytes != 1) return -3; /* check for invalid block length / file cut off */ if (bh.total_length > filesize-pos) { /* block size is larger than bytes in input file */ if (verbose >= 1) printf("[-] Block Length (%u) exceeds file size (%" PRIu64 ").\n", bh.total_length, filesize); /* search for next valid block */ if (verbose >= 1) printf("[*] Trying to align next block...\n"); res = find_valid_block(pcap, filesize); /* block found? */ if (res == 0) { /* another valid block has been found in the file */ if (verbose >= 1) printf("[+] GOT Next Block at Position %" PRIu64 "\n", ftello(pcap)); /* adjust total blocks length to match next block */ bh.total_length = ftello(pcap)-pos; } else { /* there are no more blocks inside the file */ if (verbose >= 1) printf("[*] No more valid Blocks found inside file! (maybe it was the last one)\n"); /* adjust total blocks length to end of file */ bh.total_length = filesize-pos; } if (verbose >= 1) printf("[*] Assuming this blocks size as %u bytes.\n", bh.total_length); else printf("[-] Invalid Block size => CORRECTED.\n"); /* reset input file pointer behind block header */ fseeko(pcap, pos+sizeof(struct block_header), SEEK_SET); /* increase corruptions counter */ fixes++; } /* how many bytes are left until the final block size (end of block) is reached */ left = bh.total_length-sizeof(bh)-sizeof(check); /* allocate memory for the new block - that will be written to repaired output file finally */ new_block = malloc(bh.total_length); /* copy the current blocks header into repaired block */ memcpy(new_block, &bh, 8); block_pos = 8; /* what is the type of block at current position ? */ switch (bh.block_type) { /* Section Header Block */ case TYPE_SHB: if (verbose >= 1) printf("[*] FOUND: Section Header Block at position %" PRIu64 " (%u bytes)\n", pos, bh.total_length); /* read section header block into struct */ bytes = fread(&shb, sizeof(shb), 1, pcap); if (bytes != 1) return -3; left -= sizeof(shb); /* check for pcap's magic bytes () */ if (shb.byte_order_magic == BYTE_ORDER_MAGIC) { if (verbose >= 1) printf("[+] Byte Order Magic: 0x%x\n", shb.byte_order_magic); } else if (shb.byte_order_magic == htonl(BYTE_ORDER_MAGIC)) { if (verbose >= 1) printf("[+] Byte Order Magic: 0x%x (SWAPPED)\n", shb.byte_order_magic); swapped = 1; } else { printf("[-] Unknown Byte Order Magic: 0x%x ==> CORRECTED.\n", shb.byte_order_magic); shb.byte_order_magic = BYTE_ORDER_MAGIC; fixes++; } /* check for major version number (2) */ if (conshort(shb.major_version) == 1) { /* current major version is 2 */ if (verbose >= 1) printf("[+] Major version number: %hu\n", conshort(shb.major_version)); } else { printf("[-] Major version number: %hu ==> CORRECTED.\n", conshort(shb.major_version)); shb.major_version = conshort(1); fixes++; } /* check for minor version number */ if (conshort(shb.minor_version) == 0) { /* current minor version is 4 */ if (verbose >= 1) printf("[+] Minor version number: %hu\n", conshort(shb.minor_version)); } else { printf("[-] Minor version number: %hu ==> CORRECTED.\n", conshort(shb.minor_version)); shb.minor_version = conshort(0); fixes++; } /* section length */ if (shb.section_length == -1) { if (verbose >= 1) printf("[*] Section length: %" PRId64 "\n", shb.section_length); } else { if (verbose >= 1) printf("[*] Section length: %" PRId64 " ==> SETTING TO -1\n", shb.section_length); shb.section_length = -1; } /* copy section header block into repaired block */ memcpy(new_block+block_pos, &shb, sizeof(shb)); block_pos += sizeof(shb); /* options */ count = 0 ; while (left > 0) { /* read option header into struct */ bytes = fread(&oh, sizeof(oh), 1, pcap); if (bytes != 1) return -3; left -= sizeof(oh); /* which option did we get ? */ switch (oh.option_code) { /* End of Options */ case 0x00: if (verbose >= 2) printf("[+] OPTION: End of Options... (%u bytes)\n", oh.option_length); break; /* Comment Option */ case 0x01: if (verbose >= 2) printf("[+] OPTION: Comment... (%u bytes)\n", oh.option_length); break; /* Hardware Information */ case 0x02: if (verbose >= 2) printf("[+] OPTION: Hardware... (%u bytes)\n", oh.option_length); break; /* Operating System Information */ case 0x03: if (verbose >= 2) printf("[+] OPTION: Operating System... (%u bytes)\n", oh.option_length); break; /* User Application Information */ case 0x04: if (verbose >= 2) printf("[+] OPTION: Userappl... (%u bytes)\n", oh.option_length); break; } /* Invalid Option? */ if (oh.option_code > 0x04) { printf("[-] Unknown option code: 0x%04x (%u bytes) ==> SKIPPING.\n", oh.option_code, oh.option_length); /* increase corruptions counter */ fixes++; /* is this the first option we check? */ if (count == 0) { /* there are NO options inside this block; skipping EOO option */ if (verbose >= 1) printf("[*] No Options inside -> no need for End of Options...\n"); break; } /* there have been other options before this corruption, we need EOO option */ if (verbose >= 1) printf("[*] %u Options inside -> Finishing with End of Options...\n", count); /* adjust option header to end of options */ oh.option_code = 0x00; oh.option_length = 0x00; } /* option is valid */ /* calculate padding for current option value */ padding = oh.option_length; if (oh.option_length%4 != 0) padding += (4-oh.option_length%4); /* check oversize */ if (padding > (unsigned)left) { printf("[-] Option size (%" PRIu64 ") exceeds remaining block space (%" PRId64 "). ==> SKIPPING OPTION.\n", padding, left); fixes++; /* because this block oversizes, there should not be any further option */ /* is this the first option we check? */ if (count == 0) { /* there are NO options inside this block; skipping EOO option */ if (verbose >= 1) printf("[*] No Options inside -> no need for End of Options...\n"); break; } /* there have been other options before this corruption, we need EOO option */ if (verbose >= 1) printf("[*] %u Options inside -> Finishing with End of Options...\n", count); /* adjust option header to end of options */ oh.option_code = 0x00; oh.option_length = 0x00; } /* copy option header into repaired block */ memcpy(new_block+block_pos, &oh, sizeof(oh)); block_pos += sizeof(oh); /* end of options? -> do not write any further */ if (oh.option_code == 0x00 && oh.option_length == 0x00) break; /* read data of current option */ data = malloc(padding); bytes = fread(data, padding, 1, pcap); left -= padding; /* write option data to repaired block */ memcpy(new_block+block_pos, data, padding); block_pos += padding; /* clean up memory */ free(data); count++; } break; /* Packet Block */ case TYPE_PB: packets++; /* check oversize */ if (sizeof(pb) > (unsigned)left) { printf("[-] Packet #%u exceeds size of block header (%" PRIu64 " > %" PRId64 ") ==> SKIPPING.\n", packets, sizeof(pb), left); /* set to "invalid block" */ bh.block_type = -1; break; } /* check for the mandatory SBH that MUST be before any packet! */ if (shb_num == 0) { /* no SBH before this packet, we NEED to create one */ printf("[-] No Section Block header found ==> CREATING.\n"); write_shb(pcap_fix, writebuffer, &writepos); /* increase counters */ shb_num++; fixes++; } if (verbose >= 1) printf("[*] FOUND Packet #%u: Packet Block at position %" PRIu64 " (%u bytes)\n", packets, pos, bh.total_length); /* read packet block into struct */ bytes = fread(&pb, sizeof(pb), 1, pcap); if (bytes != 1) return -3; left -= sizeof(pb); /* pre-check too large interface number (1024) */ if (pb.interface_id > 1024) { /* interface id is unusal high --> this field is probably corrupted */ printf("[-] Probably corrupted Interface ID #%u (too high?) ==> CORRECTED.\n", pb.interface_id); pb.interface_id = 1; fixes++; } /* check for the mandatory IDB that MUST identify every packets interface_id */ while (pb.interface_id >= idb_num) { /* no IDB is identifying this packet, we need to create one - until the ID has been reached */ printf("[-] Missing IDB for Interface #%u ==> CREATING (#%u).\n", pb.interface_id, idb_num); write_idb(pcap_fix, writebuffer, &writepos); /* increase counters */ idb_num++; fixes++; } /* copy packet block into repaired block */ memcpy(new_block+block_pos, &pb, sizeof(pb)); block_pos += sizeof(pb); /* check for oversized caplen */ if (pb.caplen > (unsigned)left) { printf("[-] Capture length (%u) exceeds block size (%" PRId64 ") ==> CORRECTED.\n", pb.caplen, left); pb.caplen = left; } /* calculate padding for packet data */ padding = pb.caplen; if (pb.caplen % 4 != 0) padding += (4 - pb.caplen % 4); /* read packet data from input file */ data = malloc(padding); bytes = fread(data, padding, 1, pcap); left -= padding; /* copy packet data into repaired block */ memcpy(new_block+block_pos, data, padding); block_pos += padding; /* clean up memory */ free(data); /* options */ count = 0; while (left > 0) { /* read options header */ bytes = fread(&oh, sizeof(oh), 1, pcap); if (bytes != 1) return -3; left -= sizeof(oh); /* which option did we get ? */ switch (oh.option_code) { /* End of Options */ case 0x00: if (verbose >= 2) printf("[+] OPTION: End of Options... (%u bytes)\n", oh.option_length); break; /* Comment Option */ case 0x01: if (verbose >= 2) printf("[+] OPTION: Comment... (%u bytes)\n", oh.option_length); break; /* Link Layer Flags */ case 0x02: if (verbose >= 2) printf("[+] OPTION: Link Layer Flags... (%u bytes)\n", oh.option_length); break; /* Packet Hash */ case 0x03: if (verbose >= 2) printf("[+] OPTION: Packet Hash... (%u bytes)\n", oh.option_length); break; } /* Invalid Option? */ if (oh.option_code > 0x03) { printf("[-] Unknown option code: 0x%04x (%u bytes) ==> SKIPPING.\n", oh.option_code, oh.option_length); /* increase corruptions counter */ fixes++; /* is this the first option we check? */ if (count == 0) { /* there are NO options inside this block; skipping EOO option */ if (verbose >= 1) printf("[*] No Options inside -> no need for End of Options...\n"); break; } /* there have been other options before this corruption, we need EOO option */ if (verbose >= 1) printf("[*] %u Options inside -> Finishing with End of Options...\n", count); /* adjust option header to end of options */ oh.option_code = 0x00; oh.option_length = 0x00; } /* option is valid */ /* calculate padding for current option value */ padding = oh.option_length; if (oh.option_length%4 != 0) padding += (4-oh.option_length%4); /* check oversize */ if (padding > (unsigned)left) { printf("[-] Option size (%" PRIu64 ") exceeds remaining block space (%" PRId64 "). ==> SKIPPING OPTION.\n", padding, left); fixes++; /* because this block oversizes, there should not be any further option */ /* is this the first option we check? */ if (count == 0) { /* there are NO options inside this block; skipping EOO option */ if (verbose >= 1) printf("[*] No Options inside -> no need for End of Options...\n"); break; } /* there have been other options before this corruption, we need EOO option */ if (verbose >= 1) printf("[*] %u Options inside -> Finishing with End of Options...\n", count); /* adjust option header to end of options */ oh.option_code = 0x00; oh.option_length = 0x00; } /* copy options header into repaired block */ memcpy(new_block+block_pos, &oh, sizeof(oh)); block_pos += sizeof(oh); /* end of options? -> do not write any further */ if (oh.option_code == 0x00 && oh.option_length == 0x00) break; /* read data of current option */ data = malloc(padding); bytes = fread(data, padding, 1, pcap); left -= padding; /* copy option data to repaired block */ memcpy(new_block+block_pos, data, padding); block_pos += padding; /* clean up memory */ free(data); count++; } break; /* Simple Packet Block */ case TYPE_SPB: packets++; /* check for the mandatory SBH that MUST be before any packet! */ if (shb_num == 0) { /* no SBH before this packet, we NEED to create one */ printf("[-] No Section Block header found ==> CREATING.\n"); write_shb(pcap_fix, writebuffer, &writepos); /* increase counters */ shb_num++; fixes++; } if (verbose >= 1) printf("[*] FOUND Packet #%u: Simple Packet Block at position %" PRIu64 " (%u bytes)\n", packets, pos, bh.total_length); /* read simple packet block */ bytes = fread(&spb, sizeof(spb), 1, pcap); if (bytes != 1) return -3; left -= sizeof(spb); /* output data */ if (verbose >= 1) printf("[*] SPB original packet length: %u bytes\n", spb.len); /* copy simple packet block into repaired file */ memcpy(new_block+block_pos, &spb, sizeof(spb)); block_pos += sizeof(spb); /* calculate padding for packet data */ /* spb.len is NOT the length of packet inside file (origlen != caplen); we need to calculate caplen using block length (left) */ /* decrease by two to avoid oversize padding */ padding = left-2; if (padding % 4 != 0) padding += (4 - left % 4); /* read packet data from input file */ data = malloc(padding); bytes = fread(data, padding, 1, pcap); left -= padding; /* copy packet data into repaired block */ memcpy(new_block+block_pos, data, padding); block_pos += padding; /* clean up memory */ free(data); break; /* Interface Description Block */ case TYPE_IDB: /* check for the mandatory SBH that MUST be before any packet! */ if (shb_num == 0) { /* no SBH before this packet, we NEED to create one */ printf("[-] No Section Block header found ==> CREATING.\n"); write_shb(pcap_fix, writebuffer, &writepos); /* increase counters */ shb_num++; fixes++; } if (verbose >= 1) printf("[*] FOUND: Interface Description Block (%u bytes)\n", bh.total_length); /* read interface description block */ bytes = fread(&idb, sizeof(idb), 1, pcap); /* read first bytes of input file into struct */ if (bytes != 1) return -3; left -= sizeof(idb); /* copy interface description block into repaired block */ memcpy(new_block+block_pos, &idb, sizeof(idb)); block_pos += sizeof(idb); /* options */ count = 0; while (left > 0) { /* read options header */ bytes = fread(&oh, sizeof(oh), 1, pcap); if (bytes != 1) return -3; left -= sizeof(oh); /* which option did we get? */ switch (oh.option_code) { /* End of Options */ case 0x00: if (verbose >= 2) printf("[+] OPTION: End of Options... (%u bytes)\n", oh.option_length); break; /* Comment Option */ case 0x01: if (verbose >= 2) printf("[+] OPTION: Comment... (%u bytes)\n", oh.option_length); break; /* Interface Name */ case 0x02: if (verbose >= 2) printf("[+] OPTION: Interface Name... (%u bytes)\n", oh.option_length); break; /* Interface Description */ case 0x03: if (verbose >= 2) printf("[+] OPTION: Interface Description... (%u bytes)\n", oh.option_length); break; /* IPv4 Address of Interface */ case 0x04: if (verbose >= 2) printf("[+] OPTION: IPv4 Address... (%u bytes)\n", oh.option_length); break; /* IPv6 Address of Interface */ case 0x05: if (verbose >= 2) printf("[+] OPTION: IPv6 Address... (%u bytes)\n", oh.option_length); break; /* MAC Address of Interface */ case 0x06: if (verbose >= 2) printf("[+] OPTION: MAC Address... (%u bytes)\n", oh.option_length); break; /* EUI Address of Interface */ case 0x07: if (verbose >= 2) printf("[+] OPTION: EUI Address... (%u bytes)\n", oh.option_length); break; /* Interface Speed */ case 0x08: if (verbose >= 2) printf("[+] OPTION: Interface Speed... (%u bytes)\n", oh.option_length); break; /* Resolution of Timestamps */ case 0x09: if (verbose >= 2) printf("[+] OPTION: Resolution of Timestamps... (%u bytes)\n", oh.option_length); break; /* Timezone */ case 0x0a: if (verbose >= 2) printf("[+] OPTION: Timezone... (%u bytes)\n", oh.option_length); break; /* Filter expression used */ case 0x0b: if (verbose >= 2) printf("[+] OPTION: Filter expression... (%u bytes)\n", oh.option_length); break; /* Operating System */ case 0x0c: if (verbose >= 2) printf("[+] OPTION: Operating System... (%u bytes)\n", oh.option_length); break; /* Frame Check Sequence Length */ case 0x0d: if (verbose >= 2) printf("[+] OPTION: Frame Check Sequence Length... (%u bytes)\n", oh.option_length); break; /* Timestamp Offset */ case 0x0e: if (verbose >= 2) printf("[+] OPTION: Timestamp Offset... (%u bytes)\n", oh.option_length); break; } /* Invalid Option? */ if (oh.option_code > 0x0e) { printf("[-] Unknown option code: 0x%04x (%u bytes) ==> SKIPPING.\n", oh.option_code, oh.option_length); /* increase corruptions counter */ fixes++; /* is this the first option we check? */ if (count == 0) { /* there are NO options inside this block; skipping EOO option */ if (verbose >= 1) printf("[*] No Options inside -> no need for End of Options...\n"); break; } /* there have been other options before this corruption, we need EOO option */ if (verbose >= 1) printf("[*] %u Options inside -> Finishing with End of Options...\n", count); /* adjust option header to end of options */ oh.option_code = 0x00; oh.option_length = 0x00; } /* option is valid */ /* calculate padding for current option value */ padding = oh.option_length; if (oh.option_length%4 != 0) padding += (4-oh.option_length%4); /* check oversize */ if (padding > (unsigned)left) { printf("[-] Option size (%" PRIu64 ") exceeds remaining block space (%" PRId64 "). ==> SKIPPING OPTION.\n", padding, left); fixes++; /* because this block oversizes, there should not be any further option */ /* is this the first option we check? */ if (count == 0) { /* there are NO options inside this block; skipping EOO option */ if (verbose >= 1) printf("[*] No Options inside -> no need for End of Options...\n"); break; } /* there have been other options before this corruption, we need EOO option */ if (verbose >= 1) printf("[*] %u Options inside -> Finishing with End of Options...\n", count); /* adjust option header to end of options */ oh.option_code = 0x00; oh.option_length = 0x00; } /* copy options header into repaired block */ memcpy(new_block+block_pos, &oh, sizeof(oh)); block_pos += sizeof(oh); /* end of options? -> do not write any further*/ if (oh.option_code == 0x00 && oh.option_length == 0x00) break; /* read option data */ data = malloc(padding); bytes = fread(data, padding, 1, pcap); left -= padding; /* write option data into repaired block */ memcpy(new_block+block_pos, data, padding); block_pos += padding; /* clean up memory */ free(data); count++; } break; /* Name Resolution Block */ case TYPE_NRB: /* check for the mandatory SBH that MUST be before any packet! */ if (shb_num == 0) { /* no SBH before this packet, we NEED to create one */ printf("[-] No Section Block header found ==> CREATING.\n"); write_shb(pcap_fix, writebuffer, &writepos); /* increase counters */ shb_num++; fixes++; } if (verbose >= 1) printf("[*] FOUND: Name Resolution Block at position %" PRIu64 " (%u bytes)\n", pos, bh.total_length); /* process records */ count = 0; while (left > 0) { /* read name resolution block */ bytes = fread(&nrb, sizeof(nrb), 1, pcap); /* read first bytes of input file into struct */ if (bytes != 1) return -3; left -= sizeof(nrb); /* which type of record did we get? */ switch (nrb.record_type) { /* End of Records */ case 0x00: if (verbose >= 2) printf("[+] RECORD: End of Records... (%u bytes)\n", nrb.record_length); break; /* IPv4 Record */ case 0x01: if (verbose >= 2) printf("[+] RECORD: IPv4 Record... (%u bytes)\n", nrb.record_length); break; /* IPv6 Record */ case 0x02: if (verbose >= 2) printf("[+] RECORD: IPv6 Record... (%u bytes)\n", nrb.record_length); break; } /* Invalid Record? */ if (nrb.record_type > 0x02) { printf("[-] Unknown record type: 0x%04x (%u bytes) ==> SKIPPING.\n", nrb.record_type, nrb.record_length); /* increase corruptions counter */ fixes++; /* is this the first record we check? */ if (count == 0) { /* there are NO records inside this block; skipping EOR record */ if (verbose >= 1) printf("[*] No Records inside -> no need for End of Records...\n"); break; } /* there have been other records before this corruption, we need EOR record */ if (verbose >= 1) printf("[*] %u Records inside -> Finishing with End of Records...\n", count); /* adjust option header to end of options */ nrb.record_type = 0x00; nrb.record_length = 0x00; } /* record is valid */ /* write name resolution block into repaired block */ memcpy(new_block+block_pos, &nrb, sizeof(nrb)); block_pos += sizeof(nrb); /* end of records? -> do not write any further */ if (nrb.record_type == 0x00 && nrb.record_length == 0x00) break; /* calculate padding for current record value */ padding = nrb.record_length; if (nrb.record_length % 4 != 0) padding += (4 - nrb.record_length % 4); /* read record value from input file */ data = malloc(padding); bytes = fread(data, padding, 1, pcap); left -= padding; /* copy record value into repaired buffer */ memcpy(new_block+block_pos, data, padding); block_pos += padding; /* clean up memory */ free(data); count++; } /* options */ count = 0; while (left > 0) { /* read options header */ bytes = fread(&oh, sizeof(oh), 1, pcap); if (bytes != 1) return -3; left -= sizeof(oh); /* which option did we get? */ switch (oh.option_code) { /* End of Options */ case 0x00: if (verbose >= 2) printf("[+] OPTION: End of Options... (%u bytes)\n", oh.option_length); break; /* Comment Option */ case 0x01: if (verbose >= 2) printf("[+] OPTION: Comment... (%u bytes)\n", oh.option_length); break; /* DNS Server Name */ case 0x02: if (verbose >= 2) printf("[+] OPTION: DNS Server... (%u bytes)\n", oh.option_length); break; /* DNS Server IPv4 Address */ case 0x03: if (verbose >= 2) printf("[+] OPTION: IPv4 Address of DNS Server... (%u bytes)\n", oh.option_length); break; /* DNS Server IPv6 Address */ case 0x04: if (verbose >= 2) printf("[+] OPTION: IPv6 Address of DNS Server... (%u bytes)\n", oh.option_length); break; } /* Invalid Option? */ if (oh.option_code > 0x04) { printf("[-] Unknown option code: 0x%04x (%u bytes) ==> SKIPPING.\n", oh.option_code, oh.option_length); /* increase corruptions counter */ fixes++; /* is this the first option we check? */ if (count == 0) { /* there are NO options inside this block; skipping EOO option */ if (verbose >= 1) printf("[*] No Options inside -> no need for End of Options...\n"); break; } /* there have been other options before this corruption, we need EOO option */ if (verbose >= 1) printf("[*] %u Options inside -> Finishing with End of Options...\n", count); /* adjust option header to end of options */ oh.option_code = 0x00; oh.option_length = 0x00; } /* option is valid */ /* calculate padding for current option value */ padding = oh.option_length; if (oh.option_length%4 != 0) padding += (4-oh.option_length%4); /* check oversize */ if (padding > (unsigned)left) { printf("[-] Option size (%" PRIu64 ") exceeds remaining block space (%" PRId64 "). ==> SKIPPING OPTION.\n", padding, left); fixes++; /* because this block oversizes, there should not be any further option */ /* is this the first option we check? */ if (count == 0) { /* there are NO options inside this block; skipping EOO option */ if (verbose >= 1) printf("[*] No Options inside -> no need for End of Options...\n"); break; } /* there have been other options before this corruption, we need EOO option */ if (verbose >= 1) printf("[*] %u Options inside -> Finishing with End of Options...\n", count); /* adjust option header to end of options */ oh.option_code = 0x00; oh.option_length = 0x00; } /* copy option header into repaired block */ memcpy(new_block+block_pos, &oh, sizeof(oh)); block_pos += sizeof(oh); /* end of options? -> do not write any further */ if (oh.option_code == 0x00 && oh.option_length == 0x00) break; /* read option value from input file */ data = malloc(padding); bytes = fread(data, padding, 1, pcap); left -= padding; /* copy option value into repaired block */ memcpy(new_block+block_pos, data, padding); block_pos += padding; /* clean up memory */ free(data); count++; } break; /* Interface Statistics Block */ case TYPE_ISB: /* check for the mandatory SBH that MUST be before any packet! */ if (shb_num == 0) { /* no SBH before this packet, we NEED to create one */ printf("[-] No Section Block header found ==> CREATING.\n"); write_shb(pcap_fix, writebuffer, &writepos); /* increase counters */ shb_num++; fixes++; } if (verbose >= 1) printf("[*] FOUND: Interface Statistics Block at position %" PRIu64 " (%u bytes)\n", pos, bh.total_length); /* read interface statistics block */ bytes = fread(&isb, sizeof(isb), 1, pcap); if (bytes != 1) return -3; left -= sizeof(isb); /* copy interface statistics block into repaired block */ memcpy(new_block+block_pos, &isb, sizeof(isb)); block_pos += sizeof(isb); /* options */ count = 0; while (left > 0) { /* read options header */ bytes = fread(&oh, sizeof(oh), 1, pcap); if (bytes != 1) return -3; left -= sizeof(oh); /* which option did we get? */ switch (oh.option_code) { /* End of Options */ case 0x00: if (verbose >= 2) printf("[+] OPTION: End of Options... (%u bytes)\n", oh.option_length); break; /* Comment Option */ case 0x01: if (verbose >= 2) printf("[+] OPTION: Comment... (%u bytes)\n", oh.option_length); break; /* Capture Start Time */ case 0x02: if (verbose >= 2) printf("[+] OPTION: Capture Start Time... (%u bytes)\n", oh.option_length); break; /* Capture End Time */ case 0x03: if (verbose >= 2) printf("[+] OPTION: Capture End Time... (%u bytes)\n", oh.option_length); break; /* Packets received */ case 0x04: if (verbose >= 2) printf("[+] OPTION: Packets received... (%u bytes)\n", oh.option_length); break; /* Packets dropped */ case 0x05: if (verbose >= 2) printf("[+] OPTION: Packets dropped... (%u bytes)\n", oh.option_length); break; /* Packets accepted by Filter */ case 0x06: if (verbose >= 2) printf("[+] OPTION: Filter packets accepted... (%u bytes)\n", oh.option_length); break; /* Packets dropped by Operating System */ case 0x07: if (verbose >= 2) printf("[+] OPTION: Packets dropped by OS... (%u bytes)\n", oh.option_length); break; /* Packets delivered to user */ case 0x08: if (verbose >= 2) printf("[+] OPTION: Packets delivered to user... (%u bytes)\n", oh.option_length); break; } /* Invalid Option? */ if (oh.option_code > 0x08) { printf("[-] Unknown option code: 0x%04x (%u bytes) ==> SKIPPING.\n", oh.option_code, oh.option_length); /* increase corruptions counter */ fixes++; /* is this the first option we check? */ if (count == 0) { /* there are NO options inside this block; skipping EOO option */ if (verbose >= 1) printf("[*] No Options inside -> no need for End of Options...\n"); break; } /* there have been other options before this corruption, we need EOO option */ if (verbose >= 1) printf("[*] %u Options inside -> Finishing with End of Options...\n", count); /* adjust option header to end of options */ oh.option_code = 0x00; oh.option_length = 0x00; } /* option is valid */ /* calculate padding for current option value */ padding = oh.option_length; if (oh.option_length%4 != 0) padding += (4-oh.option_length%4); /* check oversize */ if (padding > (unsigned)left) { printf("[-] Option size (%" PRIu64 ") exceeds remaining block space (%" PRId64 "). ==> SKIPPING OPTION.\n", padding, left); fixes++; /* because this block oversizes, there should not be any further option */ /* is this the first option we check? */ if (count == 0) { /* there are NO options inside this block; skipping EOO option */ if (verbose >= 1) printf("[*] No Options inside -> no need for End of Options...\n"); break; } /* there have been other options before this corruption, we need EOO option */ if (verbose >= 1) printf("[*] %u Options inside -> Finishing with End of Options...\n", count); /* adjust option header to end of options */ oh.option_code = 0x00; oh.option_length = 0x00; } /* copy options header into repaired block */ memcpy(new_block+block_pos, &oh, sizeof(oh)); block_pos += sizeof(oh); /* end of options? -> do not write any further */ if (oh.option_code == 0x00 && oh.option_length == 0x00) break; /* read option value from input file */ data = malloc(padding); bytes = fread(data, padding, 1, pcap); left -= padding; /* copy option value into repaired block */ memcpy(new_block+block_pos, data, padding); block_pos += padding; /* clean up memory */ free(data); count++; } break; /* Enhanced Packet Block */ case TYPE_EPB: packets++; /* check for the mandatory SBH that MUST be before any packet! */ if (shb_num == 0) { /* no SBH before this packet, we NEED to create one */ printf("[-] No Section Block header found ==> CREATING.\n"); write_shb(pcap_fix, writebuffer, &writepos); /* increase counters */ shb_num++; fixes++; } if (verbose >= 1) printf("[*] FOUND Packet #%u: Enhanced Packet Block at position %" PRIu64 " (%u bytes)\n", packets, pos, bh.total_length); /* read enhanced packet block */ bytes = fread(&epb, sizeof(epb), 1, pcap); if (bytes != 1) return -3; left -= sizeof(epb); /* pre-check too large interface number (1024) */ if (epb.interface_id > 1024) { /* interface id is unusal high --> this field is probably corrupted */ printf("[-] Probably corrupted Interface ID #%u (too high?) ==> CORRECTED.\n", epb.interface_id); epb.interface_id = 1; fixes++; } /* check for the mandatory IDB that MUST identify every packets interface_id */ while (epb.interface_id >= idb_num) { /* no IDB identifying this packet, we need to create one - until the ID is reached */ printf("[-] Missing IDB for Interface #%u ==> CREATING (#%u).\n", epb.interface_id, idb_num); write_idb(pcap_fix, writebuffer, &writepos); /* increase counters */ idb_num++; fixes++; } /* check if packet capture size exceeds packet length */ if (epb.caplen > epb.len) { printf("[-] Enhanced packet data exceeds packet capture length (%u > %u) ==> CORRECTED.\n", epb.caplen, epb.len); epb.caplen = epb.len; fixes++; } /* check if packet capture size exceeds packet length */ if (epb.caplen > left) { printf("[-] Enhanced packet data exceeds total packet size (%u > %" PRIu64 ") ==> CORRECTED.\n", epb.caplen, left); epb.caplen = left; fixes++; } /* copy enhanced packet block into repaired buffer */ memcpy(new_block+block_pos, &epb, sizeof(epb)); block_pos += sizeof(epb); /* check for zero capture length */ if (epb.caplen != 0) { /* calculate padding for packet data */ padding = epb.caplen; if (epb.caplen % 4 != 0) padding += (4 - epb.caplen % 4); /* read packet data from input file */ data = malloc(padding); bytes = fread(data, padding, 1, pcap); if (bytes != 1) return -3; left -= padding; /* copy packet data into repaired block */ memcpy(new_block+block_pos, data, padding); block_pos += padding; /* clean up memory */ free(data); } /* options */ count = 0; while (left > 0) { /* read option header */ bytes = fread(&oh, sizeof(oh), 1, pcap); if (bytes != 1) return -3; left -= sizeof(oh); /* which option did we get? */ switch (oh.option_code) { /* End of Options */ case 0x00: if (verbose >= 2) printf("[+] OPTION: End of Options... (%u bytes)\n", oh.option_length); break; /* Comment Option */ case 0x01: if (verbose >= 2) printf("[+] OPTION: Comment... (%u bytes)\n", oh.option_length); break; /* Link Layer Flags */ case 0x02: if (verbose >= 2) printf("[+] OPTION: Link Layer Flags... (%u bytes)\n", oh.option_length); break; /* Packet Hash */ case 0x03: if (verbose >= 2) printf("[+] OPTION: Packet Hash... (%u bytes)\n", oh.option_length); break; /* Dropped Packets */ case 0x04: if (verbose >= 2) printf("[+] OPTION: Dropped Packets Counter... (%u bytes)\n", oh.option_length); break; } /* Invalid Option? */ if (oh.option_code > 0x04) { printf("[-] Unknown option code: 0x%04x (%u bytes) ==> SKIPPING.\n", oh.option_code, oh.option_length); /* increase corruptions counter */ fixes++; /* is this the first option we check? */ if (count == 0) { /* there are NO options inside this block; skipping EOO option */ if (verbose >= 1) printf("[*] No Options inside -> no need for End of Options...\n"); break; } /* there have been other options before this corruption, we need EOO option */ if (verbose >= 1) printf("[*] %u Options inside -> Finishing with End of Options...\n", count); /* adjust option header to end of options */ oh.option_code = 0x00; oh.option_length = 0x00; } /* option is valid */ /* calculate padding for current option value */ padding = oh.option_length; if (oh.option_length%4 != 0) padding += (4-oh.option_length%4); /* check oversize */ if (padding > (unsigned)left) { printf("[-] Option size (%" PRIu64 ") exceeds remaining block space (%" PRId64 "). ==> SKIPPING OPTION.\n", padding, left); fixes++; /* because this block oversizes, there should not be any further option */ /* is this the first option we check? */ if (count == 0) { /* there are NO options inside this block; skipping EOO option */ if (verbose >= 1) printf("[*] No Options inside -> no need for End of Options...\n"); break; } /* there have been other options before this corruption, we need EOO option */ if (verbose >= 1) printf("[*] %u Options inside -> Finishing with End of Options...\n", count); /* adjust option header to end of options */ oh.option_code = 0x00; oh.option_length = 0x00; } /* copy option header into repaired block */ memcpy(new_block+block_pos, &oh, sizeof(oh)); block_pos += sizeof(oh); /* end of options? -> do not write any further */ if (oh.option_code == 0x00 && oh.option_length == 0x00) break; /* read option value from input file */ data = malloc(padding); bytes = fread(data, padding, 1, pcap); left -= padding; /* copy option value into repaired block */ memcpy(new_block+block_pos, data, padding); block_pos += padding; /* clean up memory */ free(data); count++; } break; } /* end of switch - block header */ /* check for invalid block header type */ if ((bh.block_type != TYPE_SHB && bh.block_type > TYPE_EPB) || bh.block_type == 0x00000000) { /* this block type is ńot know */ printf("[-] Unknown block type!: 0x%08x ==> SKIPPING.\n", bh.block_type); /* increase corruption counter */ fixes++; } else { /* this block type is valid */ /* write sizes of block header to correct positions */ block_pos += sizeof(bh.total_length); memcpy(new_block+4, &block_pos, sizeof(bh.total_length)); memcpy(new_block+block_pos-4, &block_pos, sizeof(bh.total_length)); /* check wether the real size matches the size formerly specified in block header */ if (block_pos != bh.total_length) { /* specified size in block header does NOT match the real block size (maybe due to fixed corruptions) */ if (verbose >= 1) printf("[*] Block size adjusted (%u --> %u).\n", bh.total_length, block_pos); /* increase corruption counter */ fixes++; } /* write repaired block into output file */ if (verbose >= 2) printf("[*] Writing block to buffer (%u bytes).\n", block_pos); // do we need to write the buffer to the file? if (writepos + block_pos > 1024000) { bytes = fwrite(writebuffer, writepos, 1, pcap_fix); writepos = 0; } // put new bytes into write buffer memcpy(writebuffer+writepos, new_block, block_pos); writepos += block_pos; free(new_block); /* increate SHB / IDB counters */ if (bh.block_type == TYPE_SHB) shb_num++; if (bh.block_type == TYPE_IDB) idb_num++; } /* did we process all bytes of the block - given by block length */ if (left == 0) { /* all bytes processed */ if (verbose >= 2) printf("[+] End of Block reached... byte counter is correct!\n"); } else { /* we did not read until end of block - maybe due to option skipping */ if (verbose >= 1) printf("[-] Did not hit the end of the block! (%" PRId64 " bytes left)\n", left); } /* check for correct block end (block size) */ bytes = fread(&check, sizeof(check), 1, pcap); /* read the second block length field and check first block size field */ if (check == bh.total_length) { /* first and second block header size do match */ if (verbose >= 2) printf("[+] Block size matches (%u)!\n", check); } else { /* block header sizes do not match! */ printf("[-] Block size mismatch (0x%08x != 0x%08x) ==> CORRECTED.\n", check, bh.total_length); fixes++; /* we did not hit the end of block - need to search for next one */ /* remeber current position to know how much bytes have been skipped */ bytes = ftello(pcap); if (bytes != filesize) { /* search for next valid block */ if (verbose >= 1) printf("[*] Trying to align next block...\n"); res = find_valid_block(pcap, filesize); /* output information about overlapped/skipped bytes */ if (ftello(pcap) > (unsigned)bytes) printf("[-] Found %" PRId64 " bytes of unknown data ==> SKIPPING.\n", ftello(pcap)-bytes); else printf("[-] Packet overlapps with %" PRId64 " bytes ==> CORRECTED.\n", bytes-ftello(pcap)); /* increase corruption counter */ fixes++; /* did we find a next block at all? */ if (res == -1) { /* EOF reached while searching --> no more blocks */ if (verbose >= 1) printf("[*] No more valid blocks found inside file! (maybe it was the last one)\n"); break; } } } /* set positon of next block */ pos = ftello(pcap); } // write remaining data into buffer bytes = fwrite(writebuffer, writepos, 1, pcap_fix); writepos = 0; /* FILE HAS BEEN COMPLETELY CHECKED */ /* did we write any SHB blocks at all? * if not this seems to be no pcapng file! */ if (shb_num == 0) return(-1); /* everything successfull - return number of fixes */ return(fixes); } /* * Function: find_valid_block * --------------------------- * searches for the next valid block beginning at current file pointer position * * pcap: file pointer to input file * filesize: size of input file in bytes * * returns: 0 success (next block header has been found, file pointer is set to start of block) * -1 error (reached EOF without finding a valid block) * */ int find_valid_block(FILE *pcap, uint64_t filesize) { uint64_t i; unsigned int bytes; unsigned int check; /* variable to check end of blocks sizes */ struct block_header bh; /* block header */ struct packet_block pb; /* Packet Block */ struct name_resolution_block nrb; /* Name Resolution Block */ struct simple_packet_block spb; /* Simple Packet Block */ /* bytewise processing of input file */ for (i=ftello(pcap)-4; i= 12 && bh.block_type >= TYPE_IDB && bh.block_type <= TYPE_EPB) { /* block header might be valid */ /* perform some block specific checks */ /* Packet Block Checks: * - interface id <= 1024 */ if (bh.block_type == TYPE_PB) { bytes = fread(&pb, sizeof(pb), 1, pcap); if (bytes != 1) return(-1); /* interface id check */ if (pb.interface_id > 1024) continue; } /* Simple Packet Block Checks: * - max size <= MAX_SNAPLEN */ if (bh.block_type == TYPE_SPB) { /* max size check */ if (bh.total_length > PCAPNG_MAX_SNAPLEN) continue; bytes = fread(&spb, sizeof(spb), 1, pcap); if (bytes != 1) return(-1); /* check original packet lengths <= MAX_SNAPLEN */ if (spb.len > PCAPNG_MAX_SNAPLEN) continue; } /* Name Resolution Block Checks: * - min size >= 16 - record size < block length - record type ipv4,ipv6 or eeo */ if (bh.block_type == TYPE_NRB) { bytes = fread(&nrb, sizeof(nrb), 1, pcap); if (bytes != 1) return(-1); /* max length check */ if (bh.total_length < 16) continue; /* record length check */ if (nrb.record_length > bh.total_length) continue; /* record type check (max is 0x02) */ if (nrb.record_type > 0x02) continue; } /* check if the second size value is valid too */ fseeko(pcap, i+bh.total_length-4, SEEK_SET); bytes = fread(&check, sizeof(check), 1, pcap); if (check == bh.total_length) { /* also the second block size value is correct! */ if (verbose >= 1) printf("[+] FOUND: Block (Type: 0x%08x) at Position %" PRIu64 "\n", bh.block_type, i); /* set pointer to next block position */ fseeko(pcap, i, SEEK_SET); return(0); } } } /* finished loop without success -> no more blocks inside file */ return(-1); } /* * Function: write_shb * -------------------- * creates a raw section header block (SHB) and writes it into output file * (there will be no information inside except that it has been added by pcapfix) * * pcap_fix: file pointer to output file * * returns: 0 success (new shb has been written to output file) * -1 error (cannot write to output file) * */ int write_shb(FILE *pcap_fix, char* writebuffer, uint64_t* writepos) { struct block_header bh; /* block header */ struct section_header_block shb; /* section header block */ struct option_header oh; /* options header */ uint64_t bytes; /* written bytes/blocks counter */ unsigned int size = 0; /* size of whole block */ unsigned int padding; /* padding of data */ unsigned char *data; /* data buffer */ /* this comment will be added to options to indicate that block has been arbitrary added * we pad string with max of 4 zero bytes to ahjust memory alignment */ char comment[] = "Added by pcapfix.\x00\x00\x00\x00"; /* set block type to section header block */ bh.block_type = TYPE_SHB; /* increase total size by block header size */ size += sizeof(struct block_header); /* fill section header block with valid values */ shb.byte_order_magic = BYTE_ORDER_MAGIC; /* we use a non-swapped BYTE_ORDER */ shb.major_version = 1; /* major pcapng version is 1 */ shb.minor_version = 0; /* minor pcapng version is 0 */ /* increase total size by section header block size */ size += sizeof(struct section_header_block); /* prepare options header */ oh.option_code = 0x01; /* this is a comment option */ oh.option_length = strlen(comment); /* size equals the definied comment */ /* increase total size by options header size */ size += sizeof(struct option_header); /* calculate padding for this options data */ padding = oh.option_length; if (oh.option_length % 4 != 0) padding += (4 - oh.option_length % 4); /* increase total size by options data size (including padding) */ size += padding; /* increase size by 4 (end of options) */ size += 4; /* increase size by 4 (second block_length field) */ size += 4; /* set final size into block header field */ bh.total_length = size; /* reserve memory for whole section header block (including block header) */ data = malloc(size); /* store block header into buffer */ memcpy(data, &bh, sizeof(bh)); /* store section header block (header) into buffer */ memcpy(data+sizeof(bh), &shb, sizeof(shb)); /* store options header into buffer */ memcpy(data+sizeof(bh)+sizeof(shb), &oh, sizeof(oh)); /* store option data into buffer */ memcpy(data+sizeof(bh)+sizeof(shb)+sizeof(oh), comment, padding); /* store end of options into buffer */ memset(data+sizeof(bh)+sizeof(shb)+sizeof(oh)+padding, 0, 4); /* store second block_length field into buffer */ memcpy(data+sizeof(bh)+sizeof(shb)+sizeof(oh)+padding+4, &size, sizeof(size)); /* write whole buffer (new SHB) into buffer */ // check if there is enough space in buffer if (*writepos + size > 1024000) { bytes = fwrite(writebuffer, *writepos, 1, pcap_fix); if (bytes != 1) return(-1); *writepos = 0; } // put new bytes into write buffer memcpy(writebuffer+(*writepos), data, size); *writepos += size; /* clean up memory */ free(data); /* success */ return(0); } /* * Function: write_idb * -------------------- * creates a raw interface description block (IDB) and writes it into output file * (there will be no information inside except that it has been added by pcapfix) * * pcap_fix: file pointer to output file * * returns: 0 success (new shb has been written to output file) * -1 error (cannot write to output file) * */ int write_idb(FILE *pcap_fix, char* writebuffer, uint64_t* writepos) { struct block_header bh; /* block header */ struct interface_description_block idb; /* interface description block */ struct option_header oh; /* options header */ uint64_t bytes; /* written bytes/blocks counter */ unsigned int size = 0; /* size of whole block */ unsigned int padding; /* padding of data */ unsigned char *data; /* data buffer */ /* this comment will be added to options to indicate that block has been arbitrary added * we pad string with max of 4 zero bytes to ahjust memory alignment */ char comment[] = "Added by pcapfix.\x00\x00\x00\x00"; /* set block type to interface description block */ bh.block_type = TYPE_IDB; /* increase total size by block header size */ size += sizeof(struct block_header); /* fill interface description block with valid values */ /* data link type */ if (data_link_type != -1) { idb.linktype = data_link_type; /* link layter type as set by user */ } else { idb.linktype = 1; /* link layter type to default (1 == ETHERNET) */ } /* reserved is always zero */ idb.reserved = 0; /* we set snaplen to maximum */ idb.snaplen = PCAPNG_MAX_SNAPLEN; /* increase total size by interface desciption block (header) */ size += sizeof(struct interface_description_block); /* prepare options header */ oh.option_code = 0x01; /* this is a comment option */ oh.option_length = strlen(comment); /* size equals the definied comment */ /* increase total size by options header size */ size += sizeof(struct option_header); /* calculate padding for this options data */ padding = oh.option_length; if (oh.option_length % 4 != 0) padding += (4 - oh.option_length % 4); /* increase total size by options data size (including padding) */ size += padding; /* increase size by 4 (end of options) */ size += 4; /* increase size by 4 (second block_length field) */ size += 4; /* set final size into block header field */ bh.total_length = size; /* reserve memory for whole section header block (including block header) */ data = malloc(size); /* store block header into buffer */ memcpy(data, &bh, sizeof(bh)); /* store interface description block (header) into buffer */ memcpy(data+sizeof(bh), &idb, sizeof(idb)); /* store options header into buffer */ memcpy(data+sizeof(bh)+sizeof(idb), &oh, sizeof(oh)); /* store option data into buffer */ memcpy(data+sizeof(bh)+sizeof(idb)+sizeof(oh), comment, padding); /* store end of options into buffer */ memset(data+sizeof(bh)+sizeof(idb)+sizeof(oh)+padding, 0, 4); /* store second block_length field into buffer */ memcpy(data+sizeof(bh)+sizeof(idb)+sizeof(oh)+padding+4, &size, sizeof(size)); /* write whole buffer (new SHB) into output file */ // check if there is enough space in buffer if (*writepos + size > 1024000) { bytes = fwrite(writebuffer, *writepos, 1, pcap_fix); if (bytes != 1) return(-1); *writepos = 0; } // put new bytes into write buffer memcpy(writebuffer+(*writepos), data, size); *writepos += size; /* clean up memory */ free(data); /* success */ return(0); } pcapfix-1.1.4/pcapng.h000066400000000000000000000066111342160275100145750ustar00rootroot00000000000000/******************************************************************************* * * Copyright (c) 2012-2019 Robert Krause (ruport@f00l.de) * * This file is part of Pcapfix. * * Pcapfix 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 3 of the License, or any later version. * * Pcapfix 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 * Pcapfix. If not, see http://www.gnu.org/licenses/. * ******************************************************************************/ #ifndef PF_PCAPNG #define PF_PCAPNG /* http://www.winpcap.org/ntar/draft/PCAP-DumpFileFormat.html */ /* http://wiki.wireshark.org/Development/PcapNg */ #define BYTE_ORDER_MAGIC 0x1a2b3c4d /* pcapng default byte order magic - non swapped */ #define TYPE_SHB 0x0A0D0D0A /* Section Header Block */ #define TYPE_IDB 0x00000001 /* Interface Description Block */ #define TYPE_PB 0x00000002 /* Packet Block */ #define TYPE_SPB 0x00000003 /* Simple Packet Block */ #define TYPE_NRB 0x00000004 /* Name Resolution Block */ #define TYPE_ISB 0x00000005 /* Interface Statistics Block */ #define TYPE_EPB 0x00000006 /* Enhanced Packet Block */ #define PCAPNG_MAX_SNAPLEN 262144 /* maximum snap length */ /* * Function: fix_pcapng * --------------------- * tries to fix a pcapng file * * pcap: file pointer to input file * pcap_fix: file pointer to output file * * returns: >0 success (number of corruptions fixed) * 0 success (nothing to fix) * -1 error (not a pcap file) * -2 error (unable to repair) * -3 error (EOF while reading input file) * */ int fix_pcapng(FILE *pcap, FILE *pcap_fix); /* * Function: find_valid_block * --------------------------- * searches for the next valid block beginning at current file pointer position * * pcap: file pointer to input file * filesize: size of input file in bytes * * returns: 0 success (next block header has been found, file pointer is set to start of block) * -1 error (reached EOF without finding a valid block) * */ int find_valid_block(FILE *pcap, uint64_t filesize); /* * Function: write_shb * -------------------- * creates a raw section header block (SHB) and writes it into output file * (there will be no information inside except that it has been added by pcapfix) * * pcap_fix: file pointer to output file * * returns: 0 success (new shb has been written to output file) * -1 error (cannot write to output file) * */ int write_shb(FILE *pcap_fix, char* writebuffer, uint64_t* writepos); /* * Function: write_idb * -------------------- * creates a raw interface description block (IDB) and writes it into output file * (there will be no information inside except that it has been added by pcapfix) * * pcap_fix: file pointer to output file * * returns: 0 success (new shb has been written to output file) * -1 error (cannot write to output file) * */ int write_idb(FILE *pcap_fix, char* writebuffer, uint64_t* writepos); #endif