| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Thu, 22 Nov 2012 08:06:39 -0800 | |
| branch | s11-update |
| changeset 2431 | a172bfccb116 |
| permissions | -rw-r--r-- |
|
2431
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
See: |
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
|
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7784 |
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=44511 |
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
|
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
--- epan/dissectors/packet-dtls.c 2012/08/14 22:12:31 44510 |
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
+++ epan/dissectors/packet-dtls.c 2012/08/15 06:14:10 44511 |
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
@@ -2724,7 +2724,6 @@ |
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
|
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
register_dissector("dtls", dissect_dtls, proto_dtls);
|
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
dtls_handle = find_dissector("dtls");
|
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
- dissector_add_uint("sctp.ppi", DIAMETER_DTLS_PROTOCOL_ID, dtls_handle);
|
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
dtls_associations = g_tree_new(ssl_association_cmp); |
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
|
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
register_init_routine(dtls_init); |
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
@@ -2750,8 +2749,10 @@ |
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
dtls_parse_uat(); |
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
dtls_parse_old_keys(); |
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
|
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
- if (initialized == FALSE) |
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
+ if (initialized == FALSE) {
|
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
heur_dissector_add("udp", dissect_dtls_heur, proto_dtls);
|
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
+ dissector_add_uint("sctp.ppi", DIAMETER_DTLS_PROTOCOL_ID, find_dissector("dtls"));
|
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
+ } |
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
|
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
initialized = TRUE; |
|
a172bfccb116
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
} |