diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c index 9191dc4f44..703632900f 100644 --- a/asn1/s1ap/packet-s1ap-template.c +++ b/asn1/s1ap/packet-s1ap-template.c @@ -2,7 +2,7 @@ * Routines for E-UTRAN S1 Application Protocol (S1AP) packet dissection * Copyright 2007, Anders Broman * - * $Id: packet-s1ap-template.c 22778 2007-09-03 16:40:51Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff --git a/epan/dfilter/sttype-function.h b/epan/dfilter/sttype-function.h index 7324e97a9b..d8cfa38b11 100644 --- a/epan/dfilter/sttype-function.h +++ b/epan/dfilter/sttype-function.h @@ -1,5 +1,5 @@ /* - * $Id: sttype-test.h 11400 2004-07-18 00:24:25Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff --git a/epan/dissectors/packet-bctp.c b/epan/dissectors/packet-bctp.c index 06ef184899..b76082d69d 100644 --- a/epan/dissectors/packet-bctp.c +++ b/epan/dissectors/packet-bctp.c @@ -1,121 +1,121 @@ -/* - * packet-bctp.c - * Q.1990 BICC bearer control tunnelling protocol - * - * (c) 2007, Luis E. Garcia Ontanon - * - * $Id: $ - * - * Wireshark - Network traffic analyzer - * By Gerald Combs - * Copyright 1998 Gerald Combs - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * Ref ITU-T Rec. Q.1990 (07/2001) - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -#define PNAME "BCTP Q.1990" -#define PSNAME "BCTP" -#define PFNAME "bctp" - -static int proto_bctp = -1; -static int hf_bctp_bvei = -1; -static int hf_bctp_bvi = -1; -static int hf_bctp_tpei = -1; -static int hf_bctp_tpi = -1; - -static gint ett_bctp = -1; -static dissector_table_t bctp_dissector_table; -static dissector_handle_t data_handle; -static dissector_handle_t text_handle; - -/* -static const range_string tpi_vals[] = { - {0x00,0x17,"spare (binary encoded protocols)"}, - {0x18,0x1f,"reserved for national use (binary encoded protocols)"}, - {0x20,0x20,"IPBCP (text encoded)"}, - {0x21,0x21,"spare (text encoded protocol)"}, - {0x22,0x22,"not used"}, - {0x23,0x37,"spare (text encoded protocols)"}, - {0x38,0x3f,"reserved for national use (text encoded protocols)"}, - {0,0,NULL} -}; -*/ - -static const value_string bvei_vals[] = { - {0,"No indication"}, - {0,"Version Error Indication, BCTP version not supported"}, - {0,NULL} -}; - - -static void dissect_bctp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) { - proto_item* pi = proto_tree_add_item(tree, proto_bctp, tvb,0,2, FALSE); - proto_tree* pt = proto_item_add_subtree(pi,ett_bctp); - tvbuff_t* sub_tvb = tvb_new_subset(tvb, 2, -1, -1); - guint8 tpi = tvb_get_guint8(tvb,1) & 0x3f; - - proto_tree_add_item(pt, hf_bctp_bvei, tvb,0,2, FALSE); - proto_tree_add_item(pt, hf_bctp_bvi, tvb,0,2, FALSE); - proto_tree_add_item(pt, hf_bctp_tpei, tvb,0,2, FALSE); - proto_tree_add_item(pt, hf_bctp_tpi, tvb,0,2, FALSE); - - if ( dissector_try_port(bctp_dissector_table, tpi, sub_tvb, pinfo, tree) ) { - return; - } else if (tpi <= 0x22) { - call_dissector(data_handle,sub_tvb, pinfo, tree); - } else { - /* tpi > 0x22 */ - call_dissector(text_handle,sub_tvb, pinfo, tree); - } -} - -void -proto_register_bctp (void) -{ - static hf_register_info hf[] = { - {&hf_bctp_bvei, {"BVEI", "bctp.bvei", FT_UINT16, BASE_HEX, VALS(bvei_vals), 0x4000, "BCTP Version Error Indicator", HFILL }}, - {&hf_bctp_bvi, {"BVI", "bctp.bvi", FT_UINT16, BASE_HEX, NULL, 0x1F00, "BCTP Version Indicator", HFILL }}, - {&hf_bctp_tpei, {"TPEI", "bctp.tpei", FT_UINT16, BASE_HEX, NULL, 0x0040, "Tunnelled Protocol Error Indicator", HFILL }}, - {&hf_bctp_tpi, {"TPI", "bctp.tpi", FT_UINT16, BASE_HEX, NULL, 0x003F, "Tunnelled Protocol Indicator", HFILL }}, - }; - static gint *ett[] = { - &ett_bctp - }; - - proto_bctp = proto_register_protocol(PNAME, PSNAME, PFNAME); - proto_register_field_array(proto_bctp, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); - - register_dissector("bctp", dissect_bctp, proto_bctp); - - bctp_dissector_table = register_dissector_table("bctp.tpi", "BCTP Tunnelled Protocol Indicator", FT_UINT32, BASE_DEC); -} - -void -proto_reg_handoff_bctp(void) -{ - data_handle = find_dissector("data"); - text_handle = find_dissector("data-text-lines"); -} - +/* + * packet-bctp.c + * Q.1990 BICC bearer control tunnelling protocol + * + * (c) 2007, Luis E. Garcia Ontanon + * + * $Id$ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Ref ITU-T Rec. Q.1990 (07/2001) + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include + +#define PNAME "BCTP Q.1990" +#define PSNAME "BCTP" +#define PFNAME "bctp" + +static int proto_bctp = -1; +static int hf_bctp_bvei = -1; +static int hf_bctp_bvi = -1; +static int hf_bctp_tpei = -1; +static int hf_bctp_tpi = -1; + +static gint ett_bctp = -1; +static dissector_table_t bctp_dissector_table; +static dissector_handle_t data_handle; +static dissector_handle_t text_handle; + +/* +static const range_string tpi_vals[] = { + {0x00,0x17,"spare (binary encoded protocols)"}, + {0x18,0x1f,"reserved for national use (binary encoded protocols)"}, + {0x20,0x20,"IPBCP (text encoded)"}, + {0x21,0x21,"spare (text encoded protocol)"}, + {0x22,0x22,"not used"}, + {0x23,0x37,"spare (text encoded protocols)"}, + {0x38,0x3f,"reserved for national use (text encoded protocols)"}, + {0,0,NULL} +}; +*/ + +static const value_string bvei_vals[] = { + {0,"No indication"}, + {0,"Version Error Indication, BCTP version not supported"}, + {0,NULL} +}; + + +static void dissect_bctp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) { + proto_item* pi = proto_tree_add_item(tree, proto_bctp, tvb,0,2, FALSE); + proto_tree* pt = proto_item_add_subtree(pi,ett_bctp); + tvbuff_t* sub_tvb = tvb_new_subset(tvb, 2, -1, -1); + guint8 tpi = tvb_get_guint8(tvb,1) & 0x3f; + + proto_tree_add_item(pt, hf_bctp_bvei, tvb,0,2, FALSE); + proto_tree_add_item(pt, hf_bctp_bvi, tvb,0,2, FALSE); + proto_tree_add_item(pt, hf_bctp_tpei, tvb,0,2, FALSE); + proto_tree_add_item(pt, hf_bctp_tpi, tvb,0,2, FALSE); + + if ( dissector_try_port(bctp_dissector_table, tpi, sub_tvb, pinfo, tree) ) { + return; + } else if (tpi <= 0x22) { + call_dissector(data_handle,sub_tvb, pinfo, tree); + } else { + /* tpi > 0x22 */ + call_dissector(text_handle,sub_tvb, pinfo, tree); + } +} + +void +proto_register_bctp (void) +{ + static hf_register_info hf[] = { + {&hf_bctp_bvei, {"BVEI", "bctp.bvei", FT_UINT16, BASE_HEX, VALS(bvei_vals), 0x4000, "BCTP Version Error Indicator", HFILL }}, + {&hf_bctp_bvi, {"BVI", "bctp.bvi", FT_UINT16, BASE_HEX, NULL, 0x1F00, "BCTP Version Indicator", HFILL }}, + {&hf_bctp_tpei, {"TPEI", "bctp.tpei", FT_UINT16, BASE_HEX, NULL, 0x0040, "Tunnelled Protocol Error Indicator", HFILL }}, + {&hf_bctp_tpi, {"TPI", "bctp.tpi", FT_UINT16, BASE_HEX, NULL, 0x003F, "Tunnelled Protocol Indicator", HFILL }}, + }; + static gint *ett[] = { + &ett_bctp + }; + + proto_bctp = proto_register_protocol(PNAME, PSNAME, PFNAME); + proto_register_field_array(proto_bctp, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + + register_dissector("bctp", dissect_bctp, proto_bctp); + + bctp_dissector_table = register_dissector_table("bctp.tpi", "BCTP Tunnelled Protocol Indicator", FT_UINT32, BASE_DEC); +} + +void +proto_reg_handoff_bctp(void) +{ + data_handle = find_dissector("data"); + text_handle = find_dissector("data-text-lines"); +} + diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index dc062c827a..d08914073f 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -4,7 +4,7 @@ * CIGI - http://cigi.sourceforge.net/ * Copyright (c) 2005 The Boeing Company * - * $Id: README.developer 15753 2005-09-10 19:43:41Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff --git a/epan/dissectors/packet-dcp.h b/epan/dissectors/packet-dcp.h index 77010a00b9..2f66bf3bc6 100644 --- a/epan/dissectors/packet-dcp.h +++ b/epan/dissectors/packet-dcp.h @@ -6,7 +6,7 @@ * * Francesco Fondelli * - * $Id: README.developer 11973 2004-09-11 23:10:14Z guy $ + * $Id$ * * template taken from packet-udp.c * diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c index 52b8de0793..daeee6b105 100644 --- a/epan/dissectors/packet-drda.c +++ b/epan/dissectors/packet-drda.c @@ -3,7 +3,7 @@ * * metatech * - * $Id: packet-drda.c 18196 2006-05-21 04:49:01Z sahlberg $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index 085e89b70c..69a01b9202 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.c @@ -1,6 +1,8 @@ /* packet-erf.c * Routines for ERF encapsulation dissection * + * $Id$ + * * Wireshark - Network traffic analyzer * By Gerald Combs * Copyright 1998 Gerald Combs diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c index 72e3d44bce..0eb319b747 100644 --- a/epan/dissectors/packet-ncp-sss.c +++ b/epan/dissectors/packet-ncp-sss.c @@ -4,7 +4,7 @@ * Greg Morris * Copyright (c) Novell, Inc. 2002-2003 * - * $Id: packet-ncp-sss.c,v 1.00 2003/06/26 11:36:14 guy Exp $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff --git a/epan/dissectors/packet-ncp-sss.h b/epan/dissectors/packet-ncp-sss.h index a88edd8506..b0f261791e 100644 --- a/epan/dissectors/packet-ncp-sss.h +++ b/epan/dissectors/packet-ncp-sss.h @@ -3,7 +3,7 @@ * Greg Morris * Copyright (c) Novell, Inc. 2002-2004 * - * $Id: packet-ncp-sss.h,v 1.0 2004/02/29 08:01:22 guy Exp $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff --git a/epan/dissectors/packet-telkonet.c b/epan/dissectors/packet-telkonet.c index 309c29e7ee..653660e5f0 100644 --- a/epan/dissectors/packet-telkonet.c +++ b/epan/dissectors/packet-telkonet.c @@ -1,7 +1,7 @@ /* packet-telkonet.c * Routines for ethertype 0x88A1 tunneling dissection * - * $Id: packet-telkonet.c 18196 2006-05-21 04:49:01Z sahlberg $ + * $Id$ * * Copyright 2006 Joerg Mayer (see AUTHORS file) * diff --git a/gtk/conversations_ncp.c b/gtk/conversations_ncp.c index 5479f57f13..d0bd37ea73 100644 --- a/gtk/conversations_ncp.c +++ b/gtk/conversations_ncp.c @@ -1,7 +1,7 @@ /* conversations_ncp.c 2005 Greg Morris * modified from conversations_eth.c 2003 Ronnie Sahlberg * - * $Id: conversations_wlan.c 15501 2005-08-21 19:24:11Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff --git a/gtk/conversations_rsvp.c b/gtk/conversations_rsvp.c index 8e8772c621..70503b50c0 100644 --- a/gtk/conversations_rsvp.c +++ b/gtk/conversations_rsvp.c @@ -1,6 +1,8 @@ /* conversations_rsvp.c * conversations_rsvp.c August 2005, Manu Pathak * + * $Id$ + * * Wireshark - Network traffic analyzer * By Gerald Combs * Copyright 1998 Gerald Combs diff --git a/gtk/hostlist_rsvp.c b/gtk/hostlist_rsvp.c index 1a3ceb0def..9168ccf31f 100644 --- a/gtk/hostlist_rsvp.c +++ b/gtk/hostlist_rsvp.c @@ -1,6 +1,8 @@ /* hostlist_rsvp.c * hostlist_rsvp.c August 2005, Manu Pathak * + * $Id$ + * * Wireshark - Network traffic analyzer * By Gerald Combs * Copyright 1998 Gerald Combs diff --git a/gtk/ncp_stat.c b/gtk/ncp_stat.c index f3eed24eca..4459f05058 100644 --- a/gtk/ncp_stat.c +++ b/gtk/ncp_stat.c @@ -1,7 +1,7 @@ /* ncp_stat.c * ncp_stat 2005 Greg Morris * - * $Id: ncp_stat.c 00000 2005-09-22 11:09:36Z xxx $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c index 53c5104a7b..bc640311f8 100644 --- a/gtk/scsi_stat.c +++ b/gtk/scsi_stat.c @@ -1,7 +1,7 @@ /* scsi_stat.c * scsi_stat 2006 Ronnie Sahlberg * - * $Id: scsi_stat.c 17252 2006-02-11 13:05:24Z lego $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff --git a/update.c b/update.c index 05f8dbefee..223ef11b44 100644 --- a/update.c +++ b/update.c @@ -1,352 +1,352 @@ -/* update.c - * - * $Id: update.c 19935 2006-11-19 23:23:53Z gerald $ - * - * Wireshark - Network traffic analyzer - * By Gerald Combs - * Copyright 1998 Gerald Combs - * - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include - -#include -#include -#include - -#include "simple_dialog.h" -#include "version_info.h" - -#ifdef HAVE_LIBPCAP -#include "capture-pcap-util.h" -#endif - -#include "file_util.h" - -#include -#include "nio-ie5.h" - - -/* update information about a single component */ -typedef struct update_info_s { - char *prefix; /* prefix of the update file keys */ - gboolean needs_update; /* does this component need an update */ - char *version_installed; /* the version currently installed */ - - char *title; /* the component title (name) */ - char *description; /* description of the component */ - char *version_recommended; /* the version recommended */ - char *url; /* the URL for an update */ - char *md5; /* md5 checksum for that update */ - char *size; /* size of that update */ -} update_info_t; - - -/* download a complete file from the internet */ -int -download_file(const char *url, const char *filename) { - netio_ie5_t * conn; - char buf[100]; - int chunk_len; - int fd; - int stream_len; - int ret = 0; - - - /* open output file */ - fd = eth_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644); - if(fd == -1) { - g_warning("Couldn't open output file %s!", filename); - return -1; - } - - /* connect to url */ - conn = netio_ie5_connect (url); - if (conn == NULL) { - g_warning("Couldn't connect to %s!", url); - return -1; - } - - do { - /* XXX - maybe add a progress bar here */ - - /* read some bytes from the url */ - chunk_len = netio_ie5_read (conn, buf, sizeof(buf)); - - /* write bytes to the output file */ - stream_len = eth_write( fd, buf, chunk_len); - if(stream_len != chunk_len) { - g_warning("output failed: stream_len %u != chunk_len %u", stream_len, chunk_len); - ret = -1; - break; - } - } while(chunk_len > 0); - - netio_ie5_disconnect(conn); - - eth_close(fd); - - return ret; -} - -update_info_t * -update_info_new(void) -{ - return g_malloc0(sizeof(update_info_t)); -} - -void -update_info_delete(update_info_t *update_info) -{ - if(update_info->prefix) - g_free(update_info->prefix); - if(update_info->version_installed) - g_free(update_info->version_installed); - - if(update_info->title) - g_free(update_info->title); - if(update_info->description) - g_free(update_info->description); - if(update_info->version_recommended) - g_free(update_info->version_recommended); - if(update_info->url) - g_free(update_info->url); - if(update_info->md5) - g_free(update_info->md5); - if(update_info->size) - g_free(update_info->size); - - g_free(update_info); -} - -/* check a single key value pair */ -static void -update_pref_check(gchar *pref_name, gchar *value, char *check_prefix, char *check_name, char **check_value) -{ - GString *check = g_string_new(check_prefix); - - g_string_append(check, check_name); - - if(strcmp(pref_name, check->str) == 0) { - if(*check_value) - /* there shouldn't be a duplicate entry in the update file */ - g_warning("Duplicate of %s: current %s former %s", pref_name, value, *check_value); - else - *check_value = g_strdup(value); - } - - g_string_free(check, TRUE); -} - -/* a new key value pair from the update file */ -static prefs_set_pref_e -update_pref(gchar *pref_name, gchar *value, void *private_data) -{ - update_info_t *update_info = private_data; - - update_pref_check(pref_name, value, update_info->prefix, "title", &update_info->title); - update_pref_check(pref_name, value, update_info->prefix, "description", &update_info->description); - update_pref_check(pref_name, value, update_info->prefix, "version", &update_info->version_recommended); - update_pref_check(pref_name, value, update_info->prefix, "update.url", &update_info->url); - update_pref_check(pref_name, value, update_info->prefix, "update.md5", &update_info->md5); - update_pref_check(pref_name, value, update_info->prefix, "update.size", &update_info->size); - - return PREFS_SET_OK; -} - -/* display an update_info */ -static void -update_info_display(update_info_t *update_info) -{ - GString *overview; - - - overview = g_string_new(""); - - if(update_info->title) { - g_string_append_printf(overview, "%s%s%s", - simple_dialog_primary_start(), update_info->title, simple_dialog_primary_end()); - } else { - g_string_append_printf(overview, "%sComponent%s", - simple_dialog_primary_start(), simple_dialog_primary_end()); - } - - g_string_append(overview, "\n\n"); - - if(update_info->description) - g_string_append_printf(overview, "%s\n\n", update_info->description); - - g_string_append_printf(overview, "Installed: %s\n", update_info->version_installed); - - if(update_info->version_recommended) - g_string_append_printf(overview, "Recommended: %s\n", update_info->version_recommended); - else - g_string_append(overview, "Recommenced: unknown\n"); - - if(update_info->version_recommended && update_info->url) - g_string_append_printf(overview, "From: %s\n", update_info->url); - - if(update_info->size) - g_string_append_printf(overview, "Size: %s", update_info->size); - - simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK, overview->str); - - g_string_free(overview, TRUE); - -} - -/* check the version of the wireshark program */ -static update_info_t * -update_check_wireshark(const char *local_file) -{ - FILE *pf; - update_info_t *update_info = update_info_new(); - - - update_info->version_installed = g_strdup(VERSION); - update_info->prefix = "wireshark.setup."; - - pf = eth_fopen(local_file, "r"); - if(pf != NULL) { - /* read in update_info of Wireshark */ - read_prefs_file(local_file, pf, update_pref, update_info); - fclose(pf); - - /* check if Wireshark needs an update */ - if(update_info->version_installed && update_info->version_recommended && - strcmp(update_info->version_installed, update_info->version_recommended) != 0) - { - update_info->needs_update = TRUE; - } - } else { - g_warning("Could not open %s", local_file); - } - - return update_info; -} - -/* check the version of winpcap */ -static update_info_t * -update_check_winpcap(const char *local_file) -{ - FILE *pf; - update_info_t * update_info = update_info_new(); - GString *pcap_version_tmp; - char *pcap_version = NULL; - char *pcap_vstart; - char *pcap_vend; - - - update_info->prefix = "winpcap."; - - pf = eth_fopen(local_file, "r"); - if(pf != NULL) { - /* read in update_info of WinPcap */ - read_prefs_file(local_file, pf, update_pref, update_info); - fclose(pf); - - /* get WinPcap version */ - /* XXX - what's the "approved" method to get the WinPcap version? */ - pcap_version_tmp = g_string_new(""); - get_runtime_pcap_version(pcap_version_tmp); - - /* cut out real version from "combined" version string */ - pcap_vstart = strstr(pcap_version_tmp->str, "with WinPcap version "); - if(pcap_vstart != NULL) { - pcap_vstart += sizeof("with WinPcap version"); - pcap_vend = strstr(pcap_vstart, " "); - if(pcap_vend != NULL) { - pcap_vend[0] = 0; - pcap_version = g_strdup(pcap_vstart); - } - } - - update_info->version_installed = g_strdup(pcap_version); - - if(pcap_version && update_info->version_recommended && - strcmp(pcap_version, update_info->version_recommended) != 0) - { - update_info->needs_update = TRUE; - } - } else { - g_warning("Could not open %s", local_file); - } - - g_string_free(pcap_version_tmp, TRUE); - if(pcap_version) - g_free(pcap_version); - - return update_info; -} - - -/* check for all updates */ -void -update_check(gboolean interactive) -{ - char *local_file; - const char *url_file = "http://127.0.0.1/wsupdate"; /* XXX - build the URL depending on platform, versions, ... */ - update_info_t *update_info_wireshark; - update_info_t *update_info_winpcap; - - - /* build update file name */ - /* XXX - using the personal path, use temp dir instead? */ - local_file = get_persconffile_path("wsupdate", FALSE, TRUE /*for_writing*/); - if(local_file == NULL) { - g_warning("Couldn't create output path!"); - return; - } - - /* download update file */ - if(download_file(url_file, local_file) == -1) { - g_warning("Couldn't download update file: %s", local_file); - g_free(local_file); - return; - } - - /* check wireshark */ - update_info_wireshark = update_check_wireshark(local_file); - - /* check winpcap */ - update_info_winpcap = update_check_winpcap(local_file); - - /* display results */ - if(update_info_wireshark->needs_update || update_info_winpcap->needs_update) { - if(update_info_wireshark->needs_update) - update_info_display(update_info_wireshark); - if(update_info_winpcap->needs_update) - update_info_display(update_info_winpcap); - } else { - if(interactive) { - simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK, "No updates available"); - } - } - - /* cleanup */ - update_info_delete(update_info_wireshark); - update_info_delete(update_info_winpcap); - - g_free(local_file); -} - +/* update.c + * + * $Id$ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs + * Copyright 1998 Gerald Combs + * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include + +#include +#include +#include + +#include "simple_dialog.h" +#include "version_info.h" + +#ifdef HAVE_LIBPCAP +#include "capture-pcap-util.h" +#endif + +#include "file_util.h" + +#include +#include "nio-ie5.h" + + +/* update information about a single component */ +typedef struct update_info_s { + char *prefix; /* prefix of the update file keys */ + gboolean needs_update; /* does this component need an update */ + char *version_installed; /* the version currently installed */ + + char *title; /* the component title (name) */ + char *description; /* description of the component */ + char *version_recommended; /* the version recommended */ + char *url; /* the URL for an update */ + char *md5; /* md5 checksum for that update */ + char *size; /* size of that update */ +} update_info_t; + + +/* download a complete file from the internet */ +int +download_file(const char *url, const char *filename) { + netio_ie5_t * conn; + char buf[100]; + int chunk_len; + int fd; + int stream_len; + int ret = 0; + + + /* open output file */ + fd = eth_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644); + if(fd == -1) { + g_warning("Couldn't open output file %s!", filename); + return -1; + } + + /* connect to url */ + conn = netio_ie5_connect (url); + if (conn == NULL) { + g_warning("Couldn't connect to %s!", url); + return -1; + } + + do { + /* XXX - maybe add a progress bar here */ + + /* read some bytes from the url */ + chunk_len = netio_ie5_read (conn, buf, sizeof(buf)); + + /* write bytes to the output file */ + stream_len = eth_write( fd, buf, chunk_len); + if(stream_len != chunk_len) { + g_warning("output failed: stream_len %u != chunk_len %u", stream_len, chunk_len); + ret = -1; + break; + } + } while(chunk_len > 0); + + netio_ie5_disconnect(conn); + + eth_close(fd); + + return ret; +} + +update_info_t * +update_info_new(void) +{ + return g_malloc0(sizeof(update_info_t)); +} + +void +update_info_delete(update_info_t *update_info) +{ + if(update_info->prefix) + g_free(update_info->prefix); + if(update_info->version_installed) + g_free(update_info->version_installed); + + if(update_info->title) + g_free(update_info->title); + if(update_info->description) + g_free(update_info->description); + if(update_info->version_recommended) + g_free(update_info->version_recommended); + if(update_info->url) + g_free(update_info->url); + if(update_info->md5) + g_free(update_info->md5); + if(update_info->size) + g_free(update_info->size); + + g_free(update_info); +} + +/* check a single key value pair */ +static void +update_pref_check(gchar *pref_name, gchar *value, char *check_prefix, char *check_name, char **check_value) +{ + GString *check = g_string_new(check_prefix); + + g_string_append(check, check_name); + + if(strcmp(pref_name, check->str) == 0) { + if(*check_value) + /* there shouldn't be a duplicate entry in the update file */ + g_warning("Duplicate of %s: current %s former %s", pref_name, value, *check_value); + else + *check_value = g_strdup(value); + } + + g_string_free(check, TRUE); +} + +/* a new key value pair from the update file */ +static prefs_set_pref_e +update_pref(gchar *pref_name, gchar *value, void *private_data) +{ + update_info_t *update_info = private_data; + + update_pref_check(pref_name, value, update_info->prefix, "title", &update_info->title); + update_pref_check(pref_name, value, update_info->prefix, "description", &update_info->description); + update_pref_check(pref_name, value, update_info->prefix, "version", &update_info->version_recommended); + update_pref_check(pref_name, value, update_info->prefix, "update.url", &update_info->url); + update_pref_check(pref_name, value, update_info->prefix, "update.md5", &update_info->md5); + update_pref_check(pref_name, value, update_info->prefix, "update.size", &update_info->size); + + return PREFS_SET_OK; +} + +/* display an update_info */ +static void +update_info_display(update_info_t *update_info) +{ + GString *overview; + + + overview = g_string_new(""); + + if(update_info->title) { + g_string_append_printf(overview, "%s%s%s", + simple_dialog_primary_start(), update_info->title, simple_dialog_primary_end()); + } else { + g_string_append_printf(overview, "%sComponent%s", + simple_dialog_primary_start(), simple_dialog_primary_end()); + } + + g_string_append(overview, "\n\n"); + + if(update_info->description) + g_string_append_printf(overview, "%s\n\n", update_info->description); + + g_string_append_printf(overview, "Installed: %s\n", update_info->version_installed); + + if(update_info->version_recommended) + g_string_append_printf(overview, "Recommended: %s\n", update_info->version_recommended); + else + g_string_append(overview, "Recommenced: unknown\n"); + + if(update_info->version_recommended && update_info->url) + g_string_append_printf(overview, "From: %s\n", update_info->url); + + if(update_info->size) + g_string_append_printf(overview, "Size: %s", update_info->size); + + simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK, overview->str); + + g_string_free(overview, TRUE); + +} + +/* check the version of the wireshark program */ +static update_info_t * +update_check_wireshark(const char *local_file) +{ + FILE *pf; + update_info_t *update_info = update_info_new(); + + + update_info->version_installed = g_strdup(VERSION); + update_info->prefix = "wireshark.setup."; + + pf = eth_fopen(local_file, "r"); + if(pf != NULL) { + /* read in update_info of Wireshark */ + read_prefs_file(local_file, pf, update_pref, update_info); + fclose(pf); + + /* check if Wireshark needs an update */ + if(update_info->version_installed && update_info->version_recommended && + strcmp(update_info->version_installed, update_info->version_recommended) != 0) + { + update_info->needs_update = TRUE; + } + } else { + g_warning("Could not open %s", local_file); + } + + return update_info; +} + +/* check the version of winpcap */ +static update_info_t * +update_check_winpcap(const char *local_file) +{ + FILE *pf; + update_info_t * update_info = update_info_new(); + GString *pcap_version_tmp; + char *pcap_version = NULL; + char *pcap_vstart; + char *pcap_vend; + + + update_info->prefix = "winpcap."; + + pf = eth_fopen(local_file, "r"); + if(pf != NULL) { + /* read in update_info of WinPcap */ + read_prefs_file(local_file, pf, update_pref, update_info); + fclose(pf); + + /* get WinPcap version */ + /* XXX - what's the "approved" method to get the WinPcap version? */ + pcap_version_tmp = g_string_new(""); + get_runtime_pcap_version(pcap_version_tmp); + + /* cut out real version from "combined" version string */ + pcap_vstart = strstr(pcap_version_tmp->str, "with WinPcap version "); + if(pcap_vstart != NULL) { + pcap_vstart += sizeof("with WinPcap version"); + pcap_vend = strstr(pcap_vstart, " "); + if(pcap_vend != NULL) { + pcap_vend[0] = 0; + pcap_version = g_strdup(pcap_vstart); + } + } + + update_info->version_installed = g_strdup(pcap_version); + + if(pcap_version && update_info->version_recommended && + strcmp(pcap_version, update_info->version_recommended) != 0) + { + update_info->needs_update = TRUE; + } + } else { + g_warning("Could not open %s", local_file); + } + + g_string_free(pcap_version_tmp, TRUE); + if(pcap_version) + g_free(pcap_version); + + return update_info; +} + + +/* check for all updates */ +void +update_check(gboolean interactive) +{ + char *local_file; + const char *url_file = "http://127.0.0.1/wsupdate"; /* XXX - build the URL depending on platform, versions, ... */ + update_info_t *update_info_wireshark; + update_info_t *update_info_winpcap; + + + /* build update file name */ + /* XXX - using the personal path, use temp dir instead? */ + local_file = get_persconffile_path("wsupdate", FALSE, TRUE /*for_writing*/); + if(local_file == NULL) { + g_warning("Couldn't create output path!"); + return; + } + + /* download update file */ + if(download_file(url_file, local_file) == -1) { + g_warning("Couldn't download update file: %s", local_file); + g_free(local_file); + return; + } + + /* check wireshark */ + update_info_wireshark = update_check_wireshark(local_file); + + /* check winpcap */ + update_info_winpcap = update_check_winpcap(local_file); + + /* display results */ + if(update_info_wireshark->needs_update || update_info_winpcap->needs_update) { + if(update_info_wireshark->needs_update) + update_info_display(update_info_wireshark); + if(update_info_winpcap->needs_update) + update_info_display(update_info_winpcap); + } else { + if(interactive) { + simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK, "No updates available"); + } + } + + /* cleanup */ + update_info_delete(update_info_wireshark); + update_info_delete(update_info_winpcap); + + g_free(local_file); +} +