From 5017ab675ca0bcb25e5933d05383e80ce2956787 Mon Sep 17 00:00:00 2001 From: Kaian Date: Sun, 23 Dec 2018 10:55:47 +0100 Subject: [PATCH] core: fix headers coments and remove OpenSSL stuff --- LICENSE.OpenSSL | 54 ------------------------- doc/sngrep.8 | 2 +- src/attribute.c | 2 +- src/capture/capture.h | 2 +- src/capture/capture_hep.c | 2 +- src/capture/capture_hep.h | 2 +- src/capture/capture_pcap.c | 2 +- src/capture/capture_pcap.h | 2 +- src/capture/capture_txt.c | 2 +- src/message.c | 2 +- src/ncurses/keybinding.c | 2 +- src/ncurses/keybinding.h | 2 +- src/ncurses/manager.c | 2 +- src/ncurses/window.c | 2 +- src/ncurses/windows/call_raw_win.h | 2 +- src/ncurses/windows/column_select_win.c | 2 +- src/ncurses/windows/column_select_win.h | 2 +- src/ncurses/windows/msg_diff_win.c | 2 +- src/ncurses/windows/stats_win.c | 2 +- src/ncurses/windows/stats_win.h | 2 +- src/packet/dissector.c | 2 +- src/packet/dissectors/packet_link.c | 2 +- src/packet/dissectors/packet_tls.h | 13 ------ src/storage.c | 2 +- src/stream.c | 2 +- 25 files changed, 23 insertions(+), 90 deletions(-) delete mode 100644 LICENSE.OpenSSL diff --git a/LICENSE.OpenSSL b/LICENSE.OpenSSL deleted file mode 100644 index 86b6398..0000000 --- a/LICENSE.OpenSSL +++ /dev/null @@ -1,54 +0,0 @@ -/* ==================================================================== - * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - diff --git a/doc/sngrep.8 b/doc/sngrep.8 index 75d7f48..c515864 100644 --- a/doc/sngrep.8 +++ b/doc/sngrep.8 @@ -3,7 +3,7 @@ .\" Copyright (c) 2013-2018 Ivan Alonso .\" Copyright (c) 2013-2018 Irontec S.L. -.TH SNGREP 8 "September 2017" "sngrep 1.4.5" +.TH SNGREP 8 "September 2017" "sngrep 2.0.0" .SH NAME diff --git a/src/attribute.c b/src/attribute.c index ad5ba32..879866b 100644 --- a/src/attribute.c +++ b/src/attribute.c @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file attribute.c.c + * @file attribute.c * @author Ivan Alonso [aka Kaian] * * @brief Source of functions defined in attribute.h diff --git a/src/capture/capture.h b/src/capture/capture.h index b8a508d..6e9dca4 100644 --- a/src/capture/capture.h +++ b/src/capture/capture.h @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file capture_manager.h + * @file capture.h * @author Ivan Alonso [aka Kaian] * * @brief Functions to manage captures diff --git a/src/capture/capture_hep.c b/src/capture/capture_hep.c index 4939281..8dcb00f 100644 --- a/src/capture/capture_hep.c +++ b/src/capture/capture_hep.c @@ -21,7 +21,7 @@ ** ****************************************************************************/ /** - * @file capture.c + * @file capture_hep.c * * @author Ivan Alonso [aka Kaian] * @author Alexandr Dubovikov diff --git a/src/capture/capture_hep.h b/src/capture/capture_hep.h index daaa5df..808e7aa 100644 --- a/src/capture/capture_hep.h +++ b/src/capture/capture_hep.h @@ -21,7 +21,7 @@ ** ****************************************************************************/ /** - * @file capture.h + * @file capture_hep.h * * @author Ivan Alonso [aka Kaian] * @author Alexandr Dubovikov diff --git a/src/capture/capture_pcap.c b/src/capture/capture_pcap.c index ccf9b83..8d42dc1 100644 --- a/src/capture/capture_pcap.c +++ b/src/capture/capture_pcap.c @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file capture.c + * @file capture_pcap.c * @author Ivan Alonso [aka Kaian] * * @brief Source of functions defined in pcap.h diff --git a/src/capture/capture_pcap.h b/src/capture/capture_pcap.h index c894db0..e0941dd 100644 --- a/src/capture/capture_pcap.h +++ b/src/capture/capture_pcap.h @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file capture.h + * @file capture_pcap.h * @author Ivan Alonso [aka Kaian] * * @brief Functions to manage pcap files diff --git a/src/capture/capture_txt.c b/src/capture/capture_txt.c index 0707885..e4027f5 100644 --- a/src/capture/capture_txt.c +++ b/src/capture/capture_txt.c @@ -19,7 +19,7 @@ ** ****************************************************************************/ /** - * @file capture.c + * @file capture_txt.c * @author Ivan Alonso [aka Kaian] * * @brief Source of functions defined in pcap.h diff --git a/src/message.c b/src/message.c index 3f6611c..582318a 100644 --- a/src/message.c +++ b/src/message.c @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file sip_msg.c + * @file message.c * @author Ivan Alonso [aka Kaian] * * @brief Functions to manage SIP call data diff --git a/src/ncurses/keybinding.c b/src/ncurses/keybinding.c index 640676f..439643c 100644 --- a/src/ncurses/keybinding.c +++ b/src/ncurses/keybinding.c @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file group.c + * @file keybinding.c * @author Ivan Alonso [aka Kaian] * * @brief Source code of functions defined in keybinding.h diff --git a/src/ncurses/keybinding.h b/src/ncurses/keybinding.h index 2a6a419..d34e99b 100644 --- a/src/ncurses/keybinding.h +++ b/src/ncurses/keybinding.h @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file option.h + * @file keybinding.h * @author Ivan Alonso [aka Kaian] * * @brief Functions to manage keybindings diff --git a/src/ncurses/manager.c b/src/ncurses/manager.c index 3187f88..795257d 100644 --- a/src/ncurses/manager.c +++ b/src/ncurses/manager.c @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file ui_manager.c + * @file manager.c * @author Ivan Alonso [aka Kaian] * * @brief Source of functions defined in ui_manager.h diff --git a/src/ncurses/window.c b/src/ncurses/window.c index b26aec3..0aa275b 100644 --- a/src/ncurses/window.c +++ b/src/ncurses/window.c @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file ui_panel.c + * @file window.c * @author Ivan Alonso [aka Kaian] * * @brief Source of functions defined in ui_panel.h diff --git a/src/ncurses/windows/call_raw_win.h b/src/ncurses/windows/call_raw_win.h index 5e5daf9..94a0b6e 100644 --- a/src/ncurses/windows/call_raw_win.h +++ b/src/ncurses/windows/call_raw_win.h @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file call_raw.h + * @file call_raw_win.h * @author Ivan Alonso [aka Kaian] * * @brief Functions to manage Raw output screen of Sip messages diff --git a/src/ncurses/windows/column_select_win.c b/src/ncurses/windows/column_select_win.c index 879ab79..f911f38 100644 --- a/src/ncurses/windows/column_select_win.c +++ b/src/ncurses/windows/column_select_win.c @@ -21,7 +21,7 @@ ****************************************************************************/ /** - * @file ui_column_select.c + * @file column_select_win.c * @author Ivan Alonso [aka Kaian] * * @brief Source of functions defined in ui_column_select.h diff --git a/src/ncurses/windows/column_select_win.h b/src/ncurses/windows/column_select_win.h index e944c98..e1187f3 100644 --- a/src/ncurses/windows/column_select_win.h +++ b/src/ncurses/windows/column_select_win.h @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file column_select.h + * @file column_select_win.h * @author Ivan Alonso [aka Kaian] * * @brief Functions to manage columns select panel diff --git a/src/ncurses/windows/msg_diff_win.c b/src/ncurses/windows/msg_diff_win.c index fc567b0..b10f8f6 100644 --- a/src/ncurses/windows/msg_diff_win.c +++ b/src/ncurses/windows/msg_diff_win.c @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file ui_msg_diff.c + * @file msg_diff_win.c * @author Ivan Alonso [aka Kaian] * * @brief Source of functions defined in ui_msg_diff.h diff --git a/src/ncurses/windows/stats_win.c b/src/ncurses/windows/stats_win.c index 79f6eda..76100e3 100644 --- a/src/ncurses/windows/stats_win.c +++ b/src/ncurses/windows/stats_win.c @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file stats.c + * @file stats_win.c * @author Ivan Alonso [aka Kaian] * * @brief Source of functions defined in stats.h diff --git a/src/ncurses/windows/stats_win.h b/src/ncurses/windows/stats_win.h index c4c830c..a15fc5e 100644 --- a/src/ncurses/windows/stats_win.h +++ b/src/ncurses/windows/stats_win.h @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file stats.h + * @file stats_win.h * @author Ivan Alonso [aka Kaian] * * @brief Functions to manage ui window for capture stats display diff --git a/src/packet/dissector.c b/src/packet/dissector.c index 9408e7d..2c72e0b 100644 --- a/src/packet/dissector.c +++ b/src/packet/dissector.c @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file packet_parser.c + * @file dissector.c * @author Ivan Alonso [aka Kaian] * * @brief Functions to manage captured packet dissectors diff --git a/src/packet/dissectors/packet_link.c b/src/packet/dissectors/packet_link.c index 077f30d..27fc3ed 100644 --- a/src/packet/dissectors/packet_link.c +++ b/src/packet/dissectors/packet_link.c @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file packet_rtcp.c + * @file packet_link.c * @author Ivan Alonso [aka Kaian] * * @brief Source of functions defined in packet_link.h diff --git a/src/packet/dissectors/packet_tls.h b/src/packet/dissectors/packet_tls.h index 553cabc..4389998 100644 --- a/src/packet/dissectors/packet_tls.h +++ b/src/packet/dissectors/packet_tls.h @@ -18,19 +18,6 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . ** - ** In addition, as a special exception, the copyright holders give - ** permission to link the code of portions of this program with the - ** OpenSSL library under certain conditions as described in each - ** individual source file, and distribute linked combinations - ** including the two. - ** You must obey the GNU General Public License in all respects - ** for all of the code used other than OpenSSL. If you modify - ** file(s) with this exception, you may extend this exception to your - ** version of the file(s), but you are not obligated to do so. If you - ** do not wish to do so, delete this exception statement from your - ** version. If you delete this exception statement from all source - ** files in the program, then also delete it here. - ** ****************************************************************************/ /** * @file capture_tls.h diff --git a/src/storage.c b/src/storage.c index fdb86bc..8c70c94 100644 --- a/src/storage.c +++ b/src/storage.c @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file sip.c + * @file storage.c * @author Ivan Alonso [aka Kaian] * * @brief Source of functions defined in storage.h diff --git a/src/stream.c b/src/stream.c index 6687e9b..e0e28e3 100644 --- a/src/stream.c +++ b/src/stream.c @@ -20,7 +20,7 @@ ** ****************************************************************************/ /** - * @file rtp.c + * @file stream.c * @author Ivan Alonso [aka Kaian] * * @brief Functions to manage RTP captured packets