git.samba.org / metze / wireshark / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2fd0b97)
Fix the FSF address in the license header for the new ASN.1 dissectors.
authorEvan Huus <eapache@gmail.com>
Sat, 7 Sep 2013 22:12:24 +0000 (22:12 -0000)
committerEvan Huus <eapache@gmail.com>
Sat, 7 Sep 2013 22:12:24 +0000 (22:12 -0000)
svn path=/trunk/; revision=51830

asn1/atn-cm/packet-atn-cm-template.c patch | blob | history
asn1/atn-cpdlc/packet-atn-cpdlc-template.c patch | blob | history
asn1/atn-ulcs/packet-atn-ulcs-template.c patch | blob | history
asn1/atn-ulcs/packet-atn-ulcs-template.h patch | blob | history
epan/dissectors/packet-atn-cm.c patch | blob | history
epan/dissectors/packet-atn-cpdlc.c patch | blob | history
epan/dissectors/packet-atn-ulcs.c patch | blob | history
epan/dissectors/packet-atn-ulcs.h patch | blob | history

diff --git a/asn1/atn-cm/packet-atn-cm-template.c b/asn1/atn-cm/packet-atn-cm-template.c
index 4571aa92f2ae3e80346a8c590a24fe4e266b3005..869e2991094d89e9fd9fd6437f09a1ccf3b159ec 100644 (file)
--- a/asn1/atn-cm/packet-atn-cm-template.c
+++ b/asn1/atn-cm/packet-atn-cm-template.c
@@ -23,7 +23,7 @@
  * We are dealing with ATN/CPDLC aka ICAO Doc 9705 Ed2 here
  * (CPDLC may also be transmitted via ACARS/AOA aka "FANS-1/A ").
 
- 
+
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -40,7 +40,7 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "config.h"
diff --git a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c
index 2f9b0ab11d02f469d1e5229213f1a09e5353bd98..a8c18d1c77becc89050a85596bb46e6bea35a30f 100644 (file)
--- a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c
+++ b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c
@@ -19,7 +19,7 @@
  * note:
  * We are dealing with ATN/CPDLC aka ICAO Doc 9705 Ed2 here
  * (CPDLC may also be transmitted via ACARS/AOA aka "FANS-1/A ").
- 
+
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -37,7 +37,7 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /*
diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.c b/asn1/atn-ulcs/packet-atn-ulcs-template.c
index 9ce3d6bcbda5d4f9683cf7acec4a6e209bd8c8be..c6c1bd02bc7cce40e7ec98be0d4dc2f9842ec9af 100644 (file)
--- a/asn1/atn-ulcs/packet-atn-ulcs-template.c
+++ b/asn1/atn-ulcs/packet-atn-ulcs-template.c
@@ -23,7 +23,7 @@
  * details see:
  * http://en.wikipedia.org/wiki/CPDLC
  * http://members.optusnet.com.au/~cjr/introduction.htm
- 
+
  * standards:
  * http://legacy.icao.int/anb/panels/acp/repository.cfm
 
@@ -31,10 +31,6 @@
  * We are dealing with ATN/ULCS aka ICAO Doc 9705 Ed2 here
  * (don't think there is an ULCS equivalent for "FANS-1/A ").
 
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.h b/asn1/atn-ulcs/packet-atn-ulcs-template.h
index 7b09f8d283da397c5b906ed049d11c184c0ce1d7..85a4412d1dd76496bc3de1f95cbc911aadebe8c0 100644 (file)
--- a/asn1/atn-ulcs/packet-atn-ulcs-template.h
+++ b/asn1/atn-ulcs/packet-atn-ulcs-template.h
@@ -6,7 +6,7 @@
 /* packet-atn-ulcs.h
  * Definitions for atn packet disassembly structures and routines
  *
- * 
+ *
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -24,7 +24,7 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #ifndef PACKET_ATN_ULCS_H
 #define PACKET_ATN_ULCS_H
diff --git a/epan/dissectors/packet-atn-cm.c b/epan/dissectors/packet-atn-cm.c
index 75075633f82f43fe73ddf56b5888a5612a1523cc..6d430fa4a7734d111ad58f0a87bafd045fac8e44 100644 (file)
--- a/epan/dissectors/packet-atn-cm.c
+++ b/epan/dissectors/packet-atn-cm.c
@@ -31,7 +31,7 @@
  * We are dealing with ATN/CPDLC aka ICAO Doc 9705 Ed2 here
  * (CPDLC may also be transmitted via ACARS/AOA aka "FANS-1/A ").
 
- 
+
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -48,7 +48,7 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "config.h"
diff --git a/epan/dissectors/packet-atn-cpdlc.c b/epan/dissectors/packet-atn-cpdlc.c
index 00af473b1c6f8482172642184f6df311b6280057..400b5c1bd144cadfbbbcbbba9fac55b97790ae3b 100644 (file)
--- a/epan/dissectors/packet-atn-cpdlc.c
+++ b/epan/dissectors/packet-atn-cpdlc.c
@@ -27,7 +27,7 @@
  * note:
  * We are dealing with ATN/CPDLC aka ICAO Doc 9705 Ed2 here
  * (CPDLC may also be transmitted via ACARS/AOA aka "FANS-1/A ").
- 
+
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -45,7 +45,7 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /*
diff --git a/epan/dissectors/packet-atn-ulcs.c b/epan/dissectors/packet-atn-ulcs.c
index 602ed2ed0fc022dcabb9b014cf66839933842841..14a000b33155f6a21286a6eed9469bfb9ff161f1 100644 (file)
--- a/epan/dissectors/packet-atn-ulcs.c
+++ b/epan/dissectors/packet-atn-ulcs.c
@@ -31,7 +31,7 @@
  * details see:
  * http://en.wikipedia.org/wiki/CPDLC
  * http://members.optusnet.com.au/~cjr/introduction.htm
- 
+
  * standards:
  * http://legacy.icao.int/anb/panels/acp/repository.cfm
 
@@ -39,10 +39,6 @@
  * We are dealing with ATN/ULCS aka ICAO Doc 9705 Ed2 here
  * (don't think there is an ULCS equivalent for "FANS-1/A ").
 
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -278,7 +274,7 @@ static int hf_atn_ulcs_ACSE_requirements_authentication = -1;
 static int hf_atn_ulcs_ACSE_requirements_application_context_negotiation = -1;
 
 /*--- End of included file: packet-atn-ulcs-hf.c ---*/
-#line 196 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
+#line 192 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
 
 
 /*--- Included file: packet-atn-ulcs-ett.c ---*/
@@ -310,7 +306,7 @@ static gint ett_atn_ulcs_RelativeDistinguishedName = -1;
 static gint ett_atn_ulcs_AttributeTypeAndValue = -1;
 
 /*--- End of included file: packet-atn-ulcs-ett.c ---*/
-#line 198 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
+#line 194 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
 static gint ett_atn_ulcs = -1;
 static gint ett_atn_acse = -1;
 
@@ -1588,7 +1584,7 @@ static void dissect_ACSE_apdu_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
 
 
 /*--- End of included file: packet-atn-ulcs-fn.c ---*/
-#line 202 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
+#line 198 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
 
 /* re-implementing external data: packet-per.c */
 static const value_string per_External_encoding_vals[] = {
@@ -2489,7 +2485,7 @@ void proto_register_atn_ulcs (void)
         NULL, HFILL }},
 
 /*--- End of included file: packet-atn-ulcs-hfarr.c ---*/
-#line 810 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
+#line 806 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
                                {&hf_atn_ses_type,
                                { "SPDU Type",
                                        "atn-ulcs.ses.type",
@@ -2569,7 +2565,7 @@ void proto_register_atn_ulcs (void)
     &ett_atn_ulcs_AttributeTypeAndValue,
 
 /*--- End of included file: packet-atn-ulcs-ettarr.c ---*/
-#line 860 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
+#line 856 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
                                &ett_atn_ses,
                                &ett_atn_pres,
                                &ett_atn_acse,
diff --git a/epan/dissectors/packet-atn-ulcs.h b/epan/dissectors/packet-atn-ulcs.h
index 060f8f870a955c6c50f384448da6f14728c8972f..5d815072333d53508e3f92ffcafca0246d6bcf42 100644 (file)
--- a/epan/dissectors/packet-atn-ulcs.h
+++ b/epan/dissectors/packet-atn-ulcs.h
@@ -14,7 +14,7 @@
 /* packet-atn-ulcs.h
  * Definitions for atn packet disassembly structures and routines
  *
- * 
+ *
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -32,7 +32,7 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #ifndef PACKET_ATN_ULCS_H
 #define PACKET_ATN_ULCS_H
Unnamed repository; edit this file to name it for gitweb.