Fix up copyrights and whitespace.

svn path=/trunk/; revision=18981

diff --git a/airpcap_loader.c b/airpcap_loader.c
index bdd7a5f99aa26227095b3dbd6458be3a6ec29dd0..0eb4298f8f134cc9d6bf934136ec618e05ec712a 100644 (file)
--- a/airpcap_loader.c
+++ b/airpcap_loader.c
@@ -2,7 +2,8 @@
  *
  * $Id$
  *
- * Ulf Lamping <ulf.lamping@web.de>
+ * Giorgio Tino <giorgio.tino@cacetech.com>
+ * Copyright (c) CACE Technologies, LLC 2006
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>

diff --git a/airpcap_loader.h b/airpcap_loader.h
index 0c5feec5fa90cf2ef0385765303f92a24d3f68e3..14489b90496ff24978bca038683033eb6c2da3b1 100644 (file)
--- a/airpcap_loader.h
+++ b/airpcap_loader.h
@@ -3,6 +3,9 @@
  *
  * $Id$
  *
+ * Giorgio Tino <giorgio.tino@cacetech.com>
+ * Copyright (c) CACE Technologies, LLC 2006
+ *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -46,23 +49,23 @@ typedef BOOL (*AirpcapGetReadEventHandler)(PAirpcapHandle AdapterHandle, HANDLE*
 typedef BOOL (*AirpcapReadHandler)(PAirpcapHandle AdapterHandle, PBYTE Buffer, UINT BufSize, PUINT PReceievedBytes);
 typedef BOOL (*AirpcapGetStatsHandler)(PAirpcapHandle AdapterHandle, PAirpcapStats PStats);
 typedef BOOL (*AirpcapTurnLedOnHandler)(PAirpcapHandle  AdapterHandle, UINT  LedNumber);
-typedef BOOL (*AirpcapTurnLedOffHandler)(PAirpcapHandle  AdapterHandle, UINT  LedNumber);  
-typedef BOOL (*AirpcapSetDeviceChannelHandler)(PAirpcapHandle  AdapterHandle, UINT  Channel); 
-typedef BOOL (*AirpcapGetDeviceChannelHandler)(PAirpcapHandle  AdapterHandle, PUINT PChannel);  
-typedef BOOL (*AirpcapSetFcsPresenceHandler)(PAirpcapHandle  AdapterHandle, BOOL  IsFcsPresent); 
-typedef BOOL (*AirpcapGetFcsPresenceHandler)(PAirpcapHandle  AdapterHandle, PBOOL PIsFcsPresent);  
-typedef BOOL (*AirpcapSetFcsValidationHandler)(PAirpcapHandle  AdapterHandle, AirpcapValidationType ValidationType); 
-typedef BOOL (*AirpcapGetFcsValidationHandler)(PAirpcapHandle  AdapterHandle, PAirpcapValidationType PValidationType);  
-typedef BOOL (*AirpcapSetDeviceKeysHandler)(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection); 
-typedef BOOL (*AirpcapGetDeviceKeysHandler)(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection, PUINT PKeysCollectionSize); 
-typedef BOOL (*AirpcapSetDecryptionStateHandler)(PAirpcapHandle AdapterHandle, AirpcapDecryptionState Enable); 
-typedef BOOL (*AirpcapGetDecryptionStateHandler)(PAirpcapHandle AdapterHandle, PAirpcapDecryptionState PEnable); 
+typedef BOOL (*AirpcapTurnLedOffHandler)(PAirpcapHandle  AdapterHandle, UINT  LedNumber);
+typedef BOOL (*AirpcapSetDeviceChannelHandler)(PAirpcapHandle  AdapterHandle, UINT  Channel);
+typedef BOOL (*AirpcapGetDeviceChannelHandler)(PAirpcapHandle  AdapterHandle, PUINT PChannel);
+typedef BOOL (*AirpcapSetFcsPresenceHandler)(PAirpcapHandle  AdapterHandle, BOOL  IsFcsPresent);
+typedef BOOL (*AirpcapGetFcsPresenceHandler)(PAirpcapHandle  AdapterHandle, PBOOL PIsFcsPresent);
+typedef BOOL (*AirpcapSetFcsValidationHandler)(PAirpcapHandle  AdapterHandle, AirpcapValidationType ValidationType);
+typedef BOOL (*AirpcapGetFcsValidationHandler)(PAirpcapHandle  AdapterHandle, PAirpcapValidationType PValidationType);
+typedef BOOL (*AirpcapSetDeviceKeysHandler)(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection);
+typedef BOOL (*AirpcapGetDeviceKeysHandler)(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection, PUINT PKeysCollectionSize);
+typedef BOOL (*AirpcapSetDecryptionStateHandler)(PAirpcapHandle AdapterHandle, AirpcapDecryptionState Enable);
+typedef BOOL (*AirpcapGetDecryptionStateHandler)(PAirpcapHandle AdapterHandle, PAirpcapDecryptionState PEnable);
 typedef BOOL (*AirpcapStoreCurConfigAsAdapterDefaultHandler)(PAirpcapHandle AdapterHandle);
 /*
  * The list of interfaces returned by "get_airpcap_interface_list()" is
  * a list of these structures.
  */
-typedef struct {       
+typedef struct {
        char                                    *name;                          /* e.g. "eth0" */
        char                                    *description;           /* from OS, e.g. "Local Area Connection" or NULL */
        GSList                                  *ip_addr;                       /* containing address values of if_addr_t */
@@ -102,7 +105,7 @@ gchar*
 airpcap_get_if_string_number_from_description(gchar* description);
 
 /*
- * Function used to free the airpcap interface list 
+ * Function used to free the airpcap interface list
  */
 void
 free_airpcap_interface_list(GList *if_list);
@@ -122,55 +125,55 @@ airpcap_if_store_cur_config_as_adapter_default(PAirpcapHandle ah);
 /*
  * Function used to load the WEP keys for a selected interface
  */
-BOOL 
+BOOL
 airpcap_if_load_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info);
 
 /*
  * Function used to save the WEP keys for a selected interface
  */
-void 
+void
 airpcap_if_save_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info);
 
 /*
  * Airpcap wrapper, used to get the fcs validation of an airpcap adapter
  */
-BOOL 
+BOOL
 airpcap_if_get_fcs_validation(PAirpcapHandle ah, PAirpcapValidationType val);
 
 /*
  * Airpcap wrapper, used to set the fcs validation of an airpcap adapter
  */
-BOOL 
+BOOL
 airpcap_if_set_fcs_validation(PAirpcapHandle ah, AirpcapValidationType val);
 
 /*
  * Airpcap wrapper, used to get the decryption enabling of an airpcap adapter
  */
-BOOL 
+BOOL
 airpcap_if_get_decryption_state(PAirpcapHandle ah, PAirpcapDecryptionState val);
 
 /*
  * Airpcap wrapper, used to set the decryption enabling of an airpcap adapter
  */
-BOOL 
+BOOL
 airpcap_if_set_decryption_state(PAirpcapHandle ah, AirpcapDecryptionState val);
 
 /*
  * Airpcap wrapper, used to get the fcs presence of an airpcap adapter
  */
-BOOL 
+BOOL
 airpcap_if_get_fcs_presence(PAirpcapHandle ah, PBOOL ch);
 
 /*
  * Airpcap wrapper, used to set the fcs presence of an airpcap adapter
  */
-BOOL 
+BOOL
 airpcap_if_set_fcs_presence(PAirpcapHandle ah, BOOL ch);
 
 /*
  * Airpcap wrapper, used to get the link type of an airpcap adapter
  */
-BOOL 
+BOOL
 airpcap_if_get_link_type(PAirpcapHandle ah, PAirpcapLinkType lt);
 
 /*
@@ -182,13 +185,13 @@ airpcap_if_set_link_type(PAirpcapHandle ah, AirpcapLinkType lt);
 /*
  * Airpcap wrapper, used to get the channel of an airpcap adapter
  */
-BOOL 
+BOOL
 airpcap_if_get_device_channel(PAirpcapHandle ah, PUINT ch);
 
 /*
  * Airpcap wrapper, used to set the channel of an airpcap adapter
  */
-BOOL 
+BOOL
 airpcap_if_set_device_channel(PAirpcapHandle ah, UINT ch);
 
 /*
@@ -219,8 +222,8 @@ airpcap_if_info_t* airpcap_if_info_new(char *name, char *description);
 /* HAVE_AIRPCAP_API */
 
 /*
- *  Used to dinamically load the airpcap library in order link it only when 
- *  it's present on the system. 
+ *  Used to dinamically load the airpcap library in order link it only when
+ *  it's present on the system.
  */
 BOOL load_airpcap(void);
 
@@ -241,7 +244,7 @@ get_airpcap_interface_list(int *err, char *err_str);
 /*
  * Returns the ASCII string of a key given the key bites
  */
-gchar* 
+gchar*
 airpcap_get_key_string(AirpcapKey key);
 
 /*
@@ -260,14 +263,14 @@ airpcap_save_selected_if_configuration(airpcap_if_info_t* if_info);
  * Used to retrieve the name of the interface given the description
  * (the name is used in AirpcapOpen, the description is put in the combo box)
  */
-gchar* 
+gchar*
 get_airpcap_name_from_description(GList* if_list, gchar* description);
 
 /*
- * Used to retrieve the airpcap_if_info_t of the selected interface given the 
+ * Used to retrieve the airpcap_if_info_t of the selected interface given the
  * description (that is the entry of the combo box).
  */
-gpointer 
+gpointer
 get_airpcap_if_from_description(GList* if_list, const gchar* description);
 
 /*
@@ -277,7 +280,7 @@ gchar*
 airpcap_get_if_string_number(airpcap_if_info_t* if_info);
 
 /*
- * Returns the default airpcap interface of a list, NULL if list is empty 
+ * Returns the default airpcap interface of a list, NULL if list is empty
  */
 airpcap_if_info_t*
 airpcap_get_default_if(GList* airpcap_if_list);

diff --git a/gtk/airpcap_dlg.c b/gtk/airpcap_dlg.c
index e17795687059e7b33fee4d6160ee5da4c261b012..aed0fc738934232ab8abdd1047a8b8fe35258ba7 100644 (file)
--- a/gtk/airpcap_dlg.c
+++ b/gtk/airpcap_dlg.c
@@ -2,7 +2,8 @@
  *
  * $Id$
  *
- * Ulf Lamping <ulf.lamping@web.de>
+ * Giorgio Tino <giorgio.tino@cacetech.com>
+ * Copyright (c) CACE Technologies, LLC 2006
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>

diff --git a/gtk/airpcap_dlg.h b/gtk/airpcap_dlg.h
index ea4a90448138e4a852e8472fa3c3a16133fbd875..3e1ff0bf4f0ac4b1624db533f4ddaf4ceccf7c81 100644 (file)
--- a/gtk/airpcap_dlg.h
+++ b/gtk/airpcap_dlg.h
@@ -3,6 +3,9 @@
  *
  * $Id$
  *
+ * Giorgio Tino <giorgio.tino@cacetech.com>
+ * Copyright (c) CACE Technologies, LLC 2006
+ *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -52,8 +55,8 @@ airpcap_ask_for_save(GtkWidget *entry _U_, gpointer data);
 
 /*
  * Function used to change the selected interface and advanced dialog box
- */ 
-void 
+ */
+void
 airpcap_change_if(GtkWidget *entry _U_, gpointer data);
 
 /*
@@ -106,12 +109,12 @@ key_sel_list_cb(GtkWidget *l, gpointer data _U_);
 
 /*
  * Callback function for WEP key list
- */ 
+ */
 static gint
 key_sel_list_button_cb(GtkWidget *widget, GdkEventButton *event,gpointer func_data);
 
 /*
- * Activate callback for the adapter combobox 
+ * Activate callback for the adapter combobox
  */
 static void
 combo_if_activate_cb(GtkWidget *w _U_, gpointer data);
@@ -123,7 +126,7 @@ static void
 airpcap_advanced_combo_if_changed_cb(GtkWidget *w _U_, gpointer data);
 
 /*
- * Pop-up window that appears when user confirms the "Save settings..." dialog 
+ * Pop-up window that appears when user confirms the "Save settings..." dialog
  */
 static void
 airpcap_dialog_save_cb(GtkWidget* dialog _U_, gint btn, gpointer data);

diff --git a/gtk/airpcap_gui_utils.c b/gtk/airpcap_gui_utils.c
index 69a61bef4455dcb33fdd0e2bebbb3a724e0d8577..d6bc5bcba33f26678ca524113af37687d58e336a 100755 (executable)
--- a/gtk/airpcap_gui_utils.c
+++ b/gtk/airpcap_gui_utils.c
@@ -2,7 +2,8 @@
  *
  * $Id$
  *
- * Ulf Lamping <ulf.lamping@web.de>
+ * Giorgio Tino <giorgio.tino@cacetech.com>
+ * Copyright (c) CACE Technologies, LLC 2006
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>

diff --git a/gtk/airpcap_gui_utils.h b/gtk/airpcap_gui_utils.h
index b69fa48f318b56e0a842c1a2e3004eb5888186a0..f4c74fe9520fca9bbfe013fe3a74309cd3f3c60b 100755 (executable)
--- a/gtk/airpcap_gui_utils.h
+++ b/gtk/airpcap_gui_utils.h
@@ -3,6 +3,9 @@
  *
  * $Id$
  *
+ * Giorgio Tino <giorgio.tino@cacetech.com>
+ * Copyright (c) CACE Technologies, LLC 2006
+ *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -34,14 +37,14 @@
 #define AIRPCAP_LINK_TYPE_NAME_802_11_PLUS_RADIO       "802.11 + Radio"
 #define AIRPCAP_LINK_TYPE_NAME_UNKNOWN                                 "Unknown"
 
-/* 
+/*
  * set up the airpcap toolbar for the new capture interface
  */
-void 
+void
 airpcap_set_toolbar_start_capture(airpcap_if_info_t* if_info);
 
 /*
- * Set up the airpcap toolbar for the new capture interface 
+ * Set up the airpcap toolbar for the new capture interface
  */
 void
 airpcap_set_toolbar_stop_capture(airpcap_if_info_t* if_info);
@@ -53,7 +56,7 @@ void
 airpcap_add_key_to_list(GtkWidget *keylist, gchar* s);
 
 /*
- * Fill the list with the keys 
+ * Fill the list with the keys
  */
 void
 airpcap_fill_key_list(GtkWidget *keylist,airpcap_if_info_t* if_info);
@@ -71,7 +74,7 @@ gchar*
 airpcap_get_validation_name(AirpcapValidationType vt);
 
 /*
- * Returns the AirpcapLinkType corresponding to the given string name. 
+ * Returns the AirpcapLinkType corresponding to the given string name.
  */
 AirpcapLinkType
 airpcap_get_link_type(const gchar* name);