API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jun 11th, 2010
9,151
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 464.56 KB | None | 0 0
raw download clone embed print report
  1. diff -urN wireshark-1.2.8/asn1/sabp/packet-sabp-template.c wireshark-1.2.9/asn1/sabp/packet-sabp-template.c
  2. --- wireshark-1.2.8/asn1/sabp/packet-sabp-template.c 2010-05-05 10:11:41.000000000 -0700
  3. +++ wireshark-1.2.9/asn1/sabp/packet-sabp-template.c 2010-06-08 16:25:54.000000000 -0700
  4. @@ -2,7 +2,7 @@
  5. * Routines for UTRAN Iu-BC Interface: Service Area Broadcast Protocol (SBAP) packet dissection
  6. * Copyright 2007, Tomas Kukosa <tomas.kukosa@siemens.com>
  7. *
  8. - * $Id: packet-sabp-template.c 27390 2009-02-07 14:33:47Z wmeier $
  9. + * $Id: packet-sabp-template.c 33115 2010-06-06 22:13:16Z gerald $
  10. *
  11. * Wireshark - Network traffic analyzer
  12. * By Gerald Combs <gerald@wireshark.org>
  13. @@ -22,7 +22,7 @@
  14. * along with this program; if not, write to the Free Software
  15. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  16. *
  17. - * Ref: 3GPP TS 25.419 version 7.7.0 (2006-03)
  18. + * Ref: 3GPP TS 25.419 version V9.0.0 (2009-12)
  19. */
  20.  
  21. #ifdef HAVE_CONFIG_H
  22. @@ -43,11 +43,6 @@
  23. #include "packet-gsm_map.h"
  24. #include "packet-gsm_sms.h"
  25.  
  26. -#ifdef _MSC_VER
  27. -/* disable: "warning C4146: unary minus operator applied to unsigned type, result still unsigned" */
  28. -#pragma warning(disable:4146)
  29. -#endif
  30. -
  31. #define PNAME "UTRAN IuBC interface SABP signaling"
  32. #define PSNAME "SABP"
  33. #define PFNAME "sabp"
  34. @@ -132,7 +127,15 @@
  35. /* Get the length of the sabp packet. offset in bits */
  36. offset = dissect_per_length_determinant(tvb, bit_offset, &asn1_ctx, NULL, -1, &type_length);
  37.  
  38. - /* return the remaining length of the PDU */
  39. + /*
  40. + * Return the length of the PDU
  41. + * which is 3 + the length of the length, we only care about lenght up to 16K
  42. + * ("n" less than 128) a single octet containing "n" with bit 8 set to zero;
  43. + * ("n" less than 16K) two octets containing "n" with bit 8 of the first octet set to 1 and bit 7 set to zero;
  44. + */
  45. + if (type_length < 128)
  46. + return type_length+4;
  47. +
  48. return type_length+5;
  49. }
  50.  
  51. diff -urN wireshark-1.2.8/capture.c wireshark-1.2.9/capture.c
  52. --- wireshark-1.2.8/capture.c 2010-05-05 10:13:10.000000000 -0700
  53. +++ wireshark-1.2.9/capture.c 2010-06-08 16:27:42.000000000 -0700
  54. @@ -1,7 +1,7 @@
  55. /* capture.c
  56. * Routines for packet capture
  57. *
  58. - * $Id: capture.c 32655 2010-05-04 00:20:39Z gerald $
  59. + * $Id: capture.c 33123 2010-06-07 01:58:57Z gerald $
  60. *
  61. * Wireshark - Network traffic analyzer
  62. * By Gerald Combs <gerald@wireshark.org>
  63. @@ -435,6 +435,7 @@
  64. /* increase the capture file packet counter by the number of incoming packets */
  65. cf_set_packet_count(capture_opts->cf,
  66. cf_get_packet_count(capture_opts->cf) + to_read);
  67. + cf_fake_continue_tail(capture_opts->cf);
  68.  
  69. capture_callback_invoke(capture_cb_capture_fixed_continue, capture_opts);
  70. }
  71. diff -urN wireshark-1.2.8/ChangeLog wireshark-1.2.9/ChangeLog
  72. --- wireshark-1.2.8/ChangeLog 2010-05-05 10:13:10.000000000 -0700
  73. +++ wireshark-1.2.9/ChangeLog 2010-06-08 16:27:42.000000000 -0700
  74. @@ -1,827 +1,22 @@
  75. ------------------------------------------------------------------------
  76. -r31300 | gerald | 2009-12-17 13:17:43 -0800 (Thu, 17 Dec 2009) | 2 lines
  77. -Changed paths:
  78. - M /trunk-1.2/config.nmake
  79. - M /trunk-1.2/configure.in
  80. - M /trunk-1.2/debian/changelog
  81. - M /trunk-1.2/docbook/release-notes.xml
  82. - M /trunk-1.2/version.conf
  83. -
  84. -Bump everything to 1.2.6.
  85. -
  86. -------------------------------------------------------------------------
  87. -r31368 | gerald | 2009-12-27 13:55:24 -0800 (Sun, 27 Dec 2009) | 1 line
  88. -Changed paths:
  89. - M /trunk-1.2/manuf
  90. -
  91. -[Automatic manuf and enterprise-numbers update for 2009-12-27]
  92. -------------------------------------------------------------------------
  93. -r31437 | gerald | 2010-01-03 08:04:37 -0800 (Sun, 03 Jan 2010) | 1 line
  94. -Changed paths:
  95. - M /trunk-1.2/epan/enterprise-numbers
  96. - M /trunk-1.2/manuf
  97. -
  98. -[Automatic manuf and enterprise-numbers update for 2010-01-03]
  99. -------------------------------------------------------------------------
  100. -r31457 | gerald | 2010-01-06 10:34:48 -0800 (Wed, 06 Jan 2010) | 16 lines
  101. -Changed paths:
  102. - M /trunk-1.2/Makefile.nmake
  103. -
  104. -Copy over r31370 from the trunk in order to appease the new Windows
  105. -build slave.
  106. -
  107. -------------------------------------------------------------------------
  108. -r31370 | wmeier | 2009-12-27 17:47:10 -0800 (Sun, 27 Dec 2009) | 6 lines
  109. -Changed paths:
  110. - M /trunk/Makefile.nmake
  111. -
  112. -From Jim Young: Fix for "nmake call to cygwin 1.7.1 bash fails if win32 style backslash path delimiters".
  113. -
  114. -Note the change seems to also work AOK for cygwin1.5.?.
  115. -
  116. -See Bug #4359. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4359
  117. -------------------------------------------------------------------------
  118. -
  119. -
  120. -------------------------------------------------------------------------
  121. -r31479 | gerald | 2010-01-10 08:04:36 -0800 (Sun, 10 Jan 2010) | 1 line
  122. -Changed paths:
  123. - M /trunk-1.2/epan/enterprise-numbers
  124. - M /trunk-1.2/manuf
  125. -
  126. -[Automatic manuf and enterprise-numbers update for 2010-01-10]
  127. -------------------------------------------------------------------------
  128. -r31539 | gerald | 2010-01-15 17:02:51 -0800 (Fri, 15 Jan 2010) | 173 lines
  129. -Changed paths:
  130. - M /trunk-1.2/Makefile.nmake
  131. - M /trunk-1.2/airpcap_loader.c
  132. - M /trunk-1.2/asn1/spnego/packet-spnego-template.c
  133. - M /trunk-1.2/capture-wpcap.c
  134. - M /trunk-1.2/config.h.win32
  135. - M /trunk-1.2/config.nmake
  136. - M /trunk-1.2/docbook/Makefile.common
  137. - M /trunk-1.2/docbook/README.txt
  138. - M /trunk-1.2/docbook/developer-guide.xml
  139. - M /trunk-1.2/docbook/release-notes.xml
  140. - M /trunk-1.2/docbook/user-guide.xml
  141. - M /trunk-1.2/docbook/wsdg_src/WSDG_chapter_quick_setup.xml
  142. - M /trunk-1.2/docbook/wsdg_src/WSDG_chapter_sources.xml
  143. - M /trunk-1.2/docbook/wsdg_src/WSDG_chapter_tools.xml
  144. - M /trunk-1.2/docbook/wsug_graphics/note.png
  145. - M /trunk-1.2/docbook/wsug_graphics/tip.png
  146. - M /trunk-1.2/docbook/wsug_graphics/warning.png
  147. - M /trunk-1.2/docbook/wsug_graphics/ws-analyze-menu.png
  148. - M /trunk-1.2/docbook/wsug_graphics/ws-bytes-pane-tabs.png
  149. - M /trunk-1.2/docbook/wsug_graphics/ws-bytes-pane.png
  150. - M /trunk-1.2/docbook/wsug_graphics/ws-capture-info.png
  151. - M /trunk-1.2/docbook/wsug_graphics/ws-capture-interface-details.png
  152. - M /trunk-1.2/docbook/wsug_graphics/ws-capture-interfaces-win32.png
  153. - M /trunk-1.2/docbook/wsug_graphics/ws-capture-interfaces.png
  154. - M /trunk-1.2/docbook/wsug_graphics/ws-capture-menu.png
  155. - M /trunk-1.2/docbook/wsug_graphics/ws-capture-options.png
  156. - M /trunk-1.2/docbook/wsug_graphics/ws-capture-preferences.png
  157. - M /trunk-1.2/docbook/wsug_graphics/ws-choose-color-rule.png
  158. - M /trunk-1.2/docbook/wsug_graphics/ws-coloring-fields.png
  159. - M /trunk-1.2/docbook/wsug_graphics/ws-coloring-rules-dialog.png
  160. - M /trunk-1.2/docbook/wsug_graphics/ws-decode-as-show.png
  161. - M /trunk-1.2/docbook/wsug_graphics/ws-decode-as.png
  162. - M /trunk-1.2/docbook/wsug_graphics/ws-details-pane-popup-menu.png
  163. - M /trunk-1.2/docbook/wsug_graphics/ws-details-pane.png
  164. - M /trunk-1.2/docbook/wsug_graphics/ws-display-filter-tcp.png
  165. - M /trunk-1.2/docbook/wsug_graphics/ws-edit-color-rule-dialog.png
  166. - M /trunk-1.2/docbook/wsug_graphics/ws-edit-menu.png
  167. - M /trunk-1.2/docbook/wsug_graphics/ws-enabled-protocols.png
  168. - M /trunk-1.2/docbook/wsug_graphics/ws-expert-colored-tree.png
  169. - M /trunk-1.2/docbook/wsug_graphics/ws-expert-column.png
  170. - M /trunk-1.2/docbook/wsug_graphics/ws-expert-infos.png
  171. - M /trunk-1.2/docbook/wsug_graphics/ws-export-objects.png
  172. - M /trunk-1.2/docbook/wsug_graphics/ws-export-pdml.png
  173. - M /trunk-1.2/docbook/wsug_graphics/ws-export-plain.png
  174. - M /trunk-1.2/docbook/wsug_graphics/ws-export-ps.png
  175. - M /trunk-1.2/docbook/wsug_graphics/ws-export-psml.png
  176. - M /trunk-1.2/docbook/wsug_graphics/ws-export-selected.png
  177. - M /trunk-1.2/docbook/wsug_graphics/ws-file-menu.png
  178. - M /trunk-1.2/docbook/wsug_graphics/ws-file-set-dialog.png
  179. - M /trunk-1.2/docbook/wsug_graphics/ws-filter-add-expression.png
  180. - M /trunk-1.2/docbook/wsug_graphics/ws-filter-toolbar.png
  181. - M /trunk-1.2/docbook/wsug_graphics/ws-filters.png
  182. - M /trunk-1.2/docbook/wsug_graphics/ws-find-packet.png
  183. - M /trunk-1.2/docbook/wsug_graphics/ws-follow-stream.png
  184. - M /trunk-1.2/docbook/wsug_graphics/ws-go-menu.png
  185. - M /trunk-1.2/docbook/wsug_graphics/ws-goto-packet.png
  186. - M /trunk-1.2/docbook/wsug_graphics/ws-gui-colors-preferences.png
  187. - M /trunk-1.2/docbook/wsug_graphics/ws-gui-columns-preferences.png
  188. - M /trunk-1.2/docbook/wsug_graphics/ws-gui-config-profiles.png
  189. - M /trunk-1.2/docbook/wsug_graphics/ws-gui-font-preferences.png
  190. - M /trunk-1.2/docbook/wsug_graphics/ws-gui-interface-options.png
  191. - M /trunk-1.2/docbook/wsug_graphics/ws-gui-layout-preferences.png
  192. - M /trunk-1.2/docbook/wsug_graphics/ws-gui-preferences.png
  193. - M /trunk-1.2/docbook/wsug_graphics/ws-help-menu.png
  194. - M /trunk-1.2/docbook/wsug_graphics/ws-list-pane.png
  195. - M /trunk-1.2/docbook/wsug_graphics/ws-logo.png
  196. - M /trunk-1.2/docbook/wsug_graphics/ws-main-toolbar.png
  197. - M /trunk-1.2/docbook/wsug_graphics/ws-main.png
  198. - M /trunk-1.2/docbook/wsug_graphics/ws-menu.png
  199. - M /trunk-1.2/docbook/wsug_graphics/ws-merge-gtk20.png
  200. - M /trunk-1.2/docbook/wsug_graphics/ws-merge-gtk24.png
  201. - M /trunk-1.2/docbook/wsug_graphics/ws-merge-win32.png
  202. - M /trunk-1.2/docbook/wsug_graphics/ws-nameresolution-preferences.png
  203. - M /trunk-1.2/docbook/wsug_graphics/ws-open-gtk20.png
  204. - M /trunk-1.2/docbook/wsug_graphics/ws-open-gtk24.png
  205. - M /trunk-1.2/docbook/wsug_graphics/ws-open-win32.png
  206. - M /trunk-1.2/docbook/wsug_graphics/ws-packet-format.png
  207. - M /trunk-1.2/docbook/wsug_graphics/ws-packet-pane-popup-menu.png
  208. - M /trunk-1.2/docbook/wsug_graphics/ws-packet-range.png
  209. - M /trunk-1.2/docbook/wsug_graphics/ws-packet-selected.png
  210. - M /trunk-1.2/docbook/wsug_graphics/ws-packet-sep-win.png
  211. - M /trunk-1.2/docbook/wsug_graphics/ws-print.png
  212. - M /trunk-1.2/docbook/wsug_graphics/ws-printing-preferences.png
  213. - M /trunk-1.2/docbook/wsug_graphics/ws-save-as-gtk20.png
  214. - M /trunk-1.2/docbook/wsug_graphics/ws-save-as-gtk24.png
  215. - M /trunk-1.2/docbook/wsug_graphics/ws-save-as-win32.png
  216. - M /trunk-1.2/docbook/wsug_graphics/ws-statistics-menu.png
  217. - M /trunk-1.2/docbook/wsug_graphics/ws-stats-conversations.png
  218. - M /trunk-1.2/docbook/wsug_graphics/ws-stats-endpoints.png
  219. - M /trunk-1.2/docbook/wsug_graphics/ws-stats-hierarchy.png
  220. - M /trunk-1.2/docbook/wsug_graphics/ws-stats-iographs.png
  221. - M /trunk-1.2/docbook/wsug_graphics/ws-stats-lte-mac-traffic.png
  222. - M /trunk-1.2/docbook/wsug_graphics/ws-stats-srt-dcerpc-filter.png
  223. - M /trunk-1.2/docbook/wsug_graphics/ws-stats-srt-dcerpc.png
  224. - M /trunk-1.2/docbook/wsug_graphics/ws-stats-summary.png
  225. - M /trunk-1.2/docbook/wsug_graphics/ws-stats-wlan-traffic.png
  226. - M /trunk-1.2/docbook/wsug_graphics/ws-statusbar-empty.png
  227. - M /trunk-1.2/docbook/wsug_graphics/ws-statusbar-filter.png
  228. - M /trunk-1.2/docbook/wsug_graphics/ws-statusbar-loaded.png
  229. - M /trunk-1.2/docbook/wsug_graphics/ws-statusbar-profile.png
  230. - M /trunk-1.2/docbook/wsug_graphics/ws-statusbar-selected.png
  231. - A /trunk-1.2/docbook/wsug_graphics/ws-tel-rtpstream-analysis.png
  232. - M /trunk-1.2/docbook/wsug_graphics/ws-time-reference.png
  233. - M /trunk-1.2/docbook/wsug_graphics/ws-view-menu.png
  234. - M /trunk-1.2/docbook/wsug_src/WSUG_chapter_statistics.xml
  235. - A /trunk-1.2/docbook/wsug_src/WSUG_chapter_telephony.xml
  236. - M /trunk-1.2/docbook/wsug_src/WSUG_chapter_use.xml
  237. - M /trunk-1.2/epan/dissectors/packet-bootp.c
  238. - M /trunk-1.2/epan/dissectors/packet-kerberos.c
  239. - M /trunk-1.2/epan/dissectors/packet-kerberos.h
  240. - M /trunk-1.2/epan/dissectors/packet-kink.c
  241. - M /trunk-1.2/epan/dissectors/packet-spnego.c
  242. - M /trunk-1.2/epan/dissectors/packet-ssl-utils.c
  243. - M /trunk-1.2/epan/follow.c
  244. - M /trunk-1.2/epan/wslua/wslua_tree.c
  245. - M /trunk-1.2/epan/wslua/wslua_tvb.c
  246. - M /trunk-1.2/gtk/capture_dlg.c
  247. - M /trunk-1.2/gtk/capture_dlg.h
  248. - M /trunk-1.2/gtk/main_welcome.c
  249. - M /trunk-1.2/gtk/rtp_player.c
  250. - M /trunk-1.2/gtk/uat_gui.c
  251. - M /trunk-1.2/plugins/opcua/opcua.c
  252. - M /trunk-1.2/print.c
  253. - M /trunk-1.2/tap-rtp-common.c
  254. -
  255. -Copy over revisions from the trunk:
  256. -
  257. -------------------------------------------------------------------------
  258. -r29401 | kukosa | 2009-08-13 03:36:53 -0700 (Thu, 13 Aug 2009) | 1 line
  259. -Changed paths:
  260. - M /trunk/epan/dissectors/packet-ssl-utils.c
  261. -
  262. -use G_GSIZE_MODIFIER instead of %zd which is not supported by MSVC
  263. -------------------------------------------------------------------------
  264. -r30695 | gerald | 2009-10-25 10:05:08 -0700 (Sun, 25 Oct 2009) | 2 lines
  265. -Changed paths:
  266. - M /trunk/epan/dissectors/packet-bootp.c
  267. -
  268. -Option 2 (Time Offset) is signed.
  269. -------------------------------------------------------------------------
  270. -r31294 | wmeier | 2009-12-17 08:22:50 -0800 (Thu, 17 Dec 2009) | 4 lines
  271. -Changed paths:
  272. - M /trunk/plugins/opcua/opcua.c
  273. -
  274. -From Martin Lutz: Patch tvb_memeql return check;
  275. - ... tvb_memeql returns 0 for truth.
  276. -See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3986#c7
  277. -------------------------------------------------------------------------
  278. -r31297 | jake | 2009-12-17 09:59:46 -0800 (Thu, 17 Dec 2009) | 1 line
  279. -Changed paths:
  280. - M /trunk/gtk/rtp_player.c
  281. -
  282. -Squelch a GTK warning on the RTP player spinner control.
  283. -------------------------------------------------------------------------
  284. -r31298 | jake | 2009-12-17 11:58:57 -0800 (Thu, 17 Dec 2009) | 1 line
  285. -Changed paths:
  286. - M /trunk/gtk/rtp_player.c
  287. -
  288. -Squelch GTK warnings on the RTP player progress bar when resizeing the window.
  289. -------------------------------------------------------------------------
  290. -r31315 | gerald | 2009-12-18 11:44:10 -0800 (Fri, 18 Dec 2009) | 2 lines
  291. -Changed paths:
  292. - M /trunk/airpcap_loader.c
  293. -
  294. -Don't try to free a static pointer.
  295. -------------------------------------------------------------------------
  296. -r31316 | gerald | 2009-12-18 12:36:36 -0800 (Fri, 18 Dec 2009) | 3 lines
  297. -Changed paths:
  298. - M /trunk/Makefile.nmake
  299. - M /trunk/capture-wpcap.c
  300. - M /trunk/config.h.win32
  301. - M /trunk/config.nmake
  302. -
  303. -Use the WinPcap version of pcap_datalink_val_to_description if it's
  304. -present. Add an entry for DLT_PPI in case it's not.
  305. -------------------------------------------------------------------------
  306. -r31317 | jake | 2009-12-18 15:14:26 -0800 (Fri, 18 Dec 2009) | 1 line
  307. -Changed paths:
  308. - M /trunk/docbook/user-guide.xml
  309. - M /trunk/docbook/wsug_graphics/ws-menu.png
  310. - M /trunk/docbook/wsug_graphics/ws-statistics-menu.png
  311. - A /trunk/docbook/wsug_graphics/ws-telephony-menu.png
  312. - M /trunk/docbook/wsug_src/WSUG_chapter_use.xml
  313. -
  314. -Update the User Guide to show the current menu.
  315. -------------------------------------------------------------------------
  316. -r31318 | jake | 2009-12-18 15:26:12 -0800 (Fri, 18 Dec 2009) | 3 lines
  317. -Changed paths:
  318. - M /trunk/gtk/rtp_player.c
  319. -
  320. -PortAudio doesn't make sure that a default device is even available on the default Host API (go figure).
  321. -Therefore opening the default stream may fail in the precense of usable devices, on other Host API's.
  322. -If the default stream fails to open iterate among the Host API's to find one with a default device.
  323. -------------------------------------------------------------------------
  324. -r31331 | jake | 2009-12-20 15:22:21 -0800 (Sun, 20 Dec 2009) | 3 lines
  325. -Changed paths:
  326. - M /trunk/tap-rtp-common.c
  327. -
  328. -Fix for bug 4340:
  329. -Reset statistics variable when restart statistics gathering.
  330. -------------------------------------------------------------------------
  331. -r31334 | sake | 2009-12-20 22:47:32 -0800 (Sun, 20 Dec 2009) | 4 lines
  332. -Changed paths:
  333. - M /trunk/epan/follow.c
  334. -
  335. -Fix some [-XX bytes missing in capture file] messages when doing
  336. -follow TCP stream.
  337. -------------------------------------------------------------------------
  338. -r31364 | jake | 2009-12-27 05:26:00 -0800 (Sun, 27 Dec 2009) | 2 lines
  339. -Changed paths:
  340. - M /trunk/gtk/uat_gui.c
  341. -
  342. -Fix for bug 4354:
  343. -Set Edit and Delete button sensitivity when deleting a row.
  344. -------------------------------------------------------------------------
  345. -r31393 | stig | 2009-12-30 11:21:21 -0800 (Wed, 30 Dec 2009) | 2 lines
  346. -Changed paths:
  347. - M /trunk/gtk/capture_dlg.c
  348. - M /trunk/gtk/capture_dlg.h
  349. - M /trunk/gtk/main_welcome.c
  350. -
  351. -Set correct linktype when starting capture from the welcome page.
  352. -------------------------------------------------------------------------
  353. -r31395 | sfisher | 2009-12-31 11:08:59 -0800 (Thu, 31 Dec 2009) | 10 lines
  354. -Changed paths:
  355. - M /trunk/print.c
  356. -
  357. -Fix bug #1564: PSML - structure context node missing [when not displaying
  358. -packet #1 from the capture file]
  359. -
  360. -This change keeps track of whether the <structure></structure> elements
  361. -and information in between have been shown yet, and if not, it shows them
  362. -once. The previous behavior would only show it if packet #1 from the
  363. -capture file was being shown.
  364. -------------------------------------------------------------------------
  365. -r31401 | stig | 2010-01-01 10:49:38 -0800 (Fri, 01 Jan 2010) | 2 lines
  366. -Changed paths:
  367. - M /trunk/epan/wslua/wslua_tree.c
  368. -
  369. -Use correct length for FT_STRINGZ when adding the item to the tree.
  370. -------------------------------------------------------------------------
  371. -
  372. -
  373. -Copy over with manual intervention:
  374. -
  375. -------------------------------------------------------------------------
  376. -r29213 | sahlberg | 2009-07-28 06:01:41 -0700 (Tue, 28 Jul 2009) | 15 lines
  377. -Changed paths:
  378. - M /trunk/asn1/spnego/packet-spnego-template.c
  379. - M /trunk/epan/dissectors/packet-kerberos.c
  380. - M /trunk/epan/dissectors/packet-kerberos.h
  381. - M /trunk/epan/dissectors/packet-kink.c
  382. - M /trunk/epan/dissectors/packet-spnego.c
  383. -
  384. -When we passed the crytobuffer to krb5_c_decrypt() we never actually
  385. -verified that we did have enough data in the buffer/tvb, which could
  386. -lead to a SEGV.
  387. -(for example if we enable KRB5 decryption but we do NOT use TCP
  388. -reassembly, and the encrypted data goes beyong the end of the current
  389. -segment)
  390. -
  391. -
  392. -Change the signature to decrypt_krb5_data() to take a TVB instead of a
  393. -buffer+length.
  394. -Actually check that we do have the entire encrypted PDU before calling
  395. -out to the kerberos libraries.
  396. -------------------------------------------------------------------------
  397. -r31326 | jake | 2009-12-20 06:49:49 -0800 (Sun, 20 Dec 2009) | 2 lines
  398. -Changed paths:
  399. - M /trunk/docbook/README.txt
  400. - M /trunk/docbook/developer-guide.xml
  401. - M /trunk/docbook/wsdg_src/WSDG_chapter_quick_setup.xml
  402. - M /trunk/docbook/wsdg_src/WSDG_chapter_sources.xml
  403. - M /trunk/docbook/wsdg_src/WSDG_chapter_tools.xml
  404. -
  405. -Clean up the docbook source code, apply proper tags, update references.
  406. -Update readme information, add some editing information for authors.
  407. -------------------------------------------------------------------------
  408. -r31369 | jake | 2009-12-27 14:20:03 -0800 (Sun, 27 Dec 2009) | 1 line
  409. -Changed paths:
  410. - M /trunk/docbook/Makefile.common
  411. - M /trunk/docbook/user-guide.xml
  412. - A /trunk/docbook/wsug_graphics/ws-tel-rtpstream-analysis.png
  413. - M /trunk/docbook/wsug_src/WSUG_chapter_statistics.xml
  414. - A /trunk/docbook/wsug_src/WSUG_chapter_telephony.xml
  415. - M /trunk/docbook/wsug_src/WSUG_chapter_use.xml
  416. -
  417. -Start Telephony statistics chapter.
  418. -------------------------------------------------------------------------
  419. -r31398 | stig | 2010-01-01 07:57:14 -0800 (Fri, 01 Jan 2010) | 3 lines
  420. -Changed paths:
  421. - M /trunk/epan/wslua/wslua_tvb.c
  422. -
  423. -Add missing stringz tvbrange method.
  424. -This fixes bug 2244.
  425. -------------------------------------------------------------------------
  426. -
  427. -
  428. -------------------------------------------------------------------------
  429. -r31551 | gerald | 2010-01-17 08:04:37 -0800 (Sun, 17 Jan 2010) | 1 line
  430. -Changed paths:
  431. - M /trunk-1.2/epan/enterprise-numbers
  432. - M /trunk-1.2/manuf
  433. -
  434. -[Automatic manuf and enterprise-numbers update for 2010-01-17]
  435. -------------------------------------------------------------------------
  436. -r31581 | gerald | 2010-01-19 17:02:36 -0800 (Tue, 19 Jan 2010) | 57 lines
  437. -Changed paths:
  438. - M /trunk-1.2/docbook/release-notes.xml
  439. - M /trunk-1.2/epan/addr_resolv.c
  440. - M /trunk-1.2/epan/addr_resolv.h
  441. - M /trunk-1.2/epan/dissectors/packet-ip.c
  442. - M /trunk-1.2/epan/dissectors/packet-kerberos.c
  443. - M /trunk-1.2/epan/wslua/wslua_proto.c
  444. - M /trunk-1.2/gtk/main.c
  445. -
  446. -Copy over revisions from the trunk. ADNS changes have not been tested:
  447. -
  448. -------------------------------------------------------------------------
  449. -r31361 | gerald | 2009-12-24 09:21:02 -0800 (Thu, 24 Dec 2009) | 3 lines
  450. -Changed paths:
  451. - M /trunk/epan/addr_resolv.c
  452. - M /trunk/epan/addr_resolv.h
  453. -
  454. -Have get_host_ipaddr and get_host_ipaddr6 return FALSE if network name
  455. -resolution is disabled. Fix some indentation.
  456. -------------------------------------------------------------------------
  457. -r31449 | stig | 2010-01-05 07:37:45 -0800 (Tue, 05 Jan 2010) | 2 lines
  458. -Changed paths:
  459. - M /trunk/epan/wslua/wslua_proto.c
  460. -
  461. -Use correct field types for signed integer.
  462. -------------------------------------------------------------------------
  463. -
  464. -
  465. -Copy over with manual intervention:
  466. -
  467. -------------------------------------------------------------------------
  468. -r31350 | gerald | 2009-12-22 12:01:06 -0800 (Tue, 22 Dec 2009) | 4 lines
  469. -Changed paths:
  470. - M /trunk/epan/addr_resolv.c
  471. - M /trunk/epan/addr_resolv.h
  472. - M /trunk/gtk/main.c
  473. -
  474. -Change host_name_lookup_process to return TRUE if anything new has been
  475. -resolved since the last time it was called. Use this to redraw the packet
  476. -list and detail any time we have newly-resolved objects.
  477. -------------------------------------------------------------------------
  478. -r31360 | gerald | 2009-12-23 16:58:31 -0800 (Wed, 23 Dec 2009) | 3 lines
  479. -Changed paths:
  480. - M /trunk/epan/addr_resolv.c
  481. - M /trunk/epan/addr_resolv.h
  482. -
  483. -If we're using c-ares, have get_host_ipaddr and get_host_ipaddr6 time
  484. -out after 250ms. This should fix the annoying freeze in bug 658.
  485. -------------------------------------------------------------------------
  486. -r31400 | wmeier | 2010-01-01 09:11:38 -0800 (Fri, 01 Jan 2010) | 3 lines
  487. -Changed paths:
  488. - M /trunk/epan/dissectors/packet-kerberos.c
  489. -
  490. -Fix Bug #4363: wireshark decodes kerberos AS-REQ PADATA incorrectly.
  491. -See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4363
  492. -
  493. -------------------------------------------------------------------------
  494. -r31471 | wmeier | 2010-01-08 15:53:46 -0800 (Fri, 08 Jan 2010) | 2 lines
  495. -Changed paths:
  496. - M /trunk/epan/dissectors/packet-ip.c
  497. -
  498. -Fix Bug #4177: Analyze ! Expert... doesn't show IP "Bad Checksum" errors.
  499. -------------------------------------------------------------------------
  500. -
  501. -Update the release notes.
  502. -
  503. -------------------------------------------------------------------------
  504. -r31596 | gerald | 2010-01-20 14:53:59 -0800 (Wed, 20 Jan 2010) | 73 lines
  505. -Changed paths:
  506. - M /trunk-1.2/asn1/pkcs12/packet-pkcs12-template.c
  507. - M /trunk-1.2/doc/README.developer
  508. - M /trunk-1.2/docbook/release-notes.xml
  509. - M /trunk-1.2/epan/dissectors/packet-bjnp.c
  510. - M /trunk-1.2/epan/dissectors/packet-dmp.c
  511. - M /trunk-1.2/epan/dissectors/packet-fip.c
  512. - M /trunk-1.2/epan/dissectors/packet-ieee80211.c
  513. - M /trunk-1.2/epan/dissectors/packet-ldss.c
  514. - M /trunk-1.2/epan/dissectors/packet-lwres.c
  515. - M /trunk-1.2/epan/dissectors/packet-pkcs12.c
  516. - M /trunk-1.2/epan/dissectors/packet-sctp.c
  517. - M /trunk-1.2/epan/dissectors/pidl/mapi/request.cnf.c
  518. - M /trunk-1.2/epan/dissectors/pidl/mapi/response.cnf.c
  519. -
  520. -Copy over revisions from the trunk:
  521. -
  522. -------------------------------------------------------------------------
  523. -r31498 | wmeier | 2010-01-11 07:26:39 -0800 (Mon, 11 Jan 2010) | 3 lines
  524. -Changed paths:
  525. - M /trunk/epan/dissectors/packet-ieee80211.c
  526. -
  527. -Fix Bug 4183: "Wireshark can't decrypt WPA(2)-PSK when passphrase is 63 bytes".
  528. -See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4183
  529. -------------------------------------------------------------------------
  530. -r31499 | etxrab | 2010-01-11 08:14:26 -0800 (Mon, 11 Jan 2010) | 2 lines
  531. -Changed paths:
  532. - M /trunk/asn1/pkcs12/packet-pkcs12-template.c
  533. - M /trunk/epan/dissectors/packet-dmp.c
  534. - M /trunk/epan/dissectors/packet-ldss.c
  535. - M /trunk/epan/dissectors/packet-pkcs12.c
  536. - M /trunk/epan/dissectors/pidl/mapi/request.cnf.c
  537. - M /trunk/epan/dissectors/pidl/mapi/response.cnf.c
  538. -
  539. -Fix part of Bug 3917 "tvb_new_real_data is prone to memory leak"
  540. -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3917
  541. -------------------------------------------------------------------------
  542. -r31522 | tuexen | 2010-01-13 13:31:24 -0800 (Wed, 13 Jan 2010) | 2 lines
  543. -Changed paths:
  544. - M /trunk/epan/dissectors/packet-sctp.c
  545. -
  546. -Display correct chunk type for unknown chunks.
  547. -------------------------------------------------------------------------
  548. -r31524 | gerald | 2010-01-13 17:22:00 -0800 (Wed, 13 Jan 2010) | 6 lines
  549. -Changed paths:
  550. - M /trunk/epan/dissectors/packet-lwres.c
  551. -
  552. -Fix several buffer overflows found by babi babi. Replace a lot of manual
  553. -fetching and displaying with proto_tree_add_item().
  554. -
  555. -Use get_dns_name() instead of lwres_get_dns_name(), which fixes a separate
  556. -issue.
  557. -------------------------------------------------------------------------
  558. -
  559. -
  560. -Copy over with manual intervention:
  561. -
  562. -------------------------------------------------------------------------
  563. -r31472 | sfisher | 2010-01-09 12:15:02 -0800 (Sat, 09 Jan 2010) | 6 lines
  564. -Changed paths:
  565. - M /trunk/epan/dissectors/packet-bjnp.c
  566. -
  567. -
  568. -Change col_set_str() call to col_add_str() since the string being passed
  569. -to it is freed right afterwards. This fixes an issue reported to
  570. -wireshark-users by Ershov Pavel on Jan 9, 2010 (in the U.S.).
  571. -------------------------------------------------------------------------
  572. -r31560 | guy | 2010-01-18 15:21:13 -0800 (Mon, 18 Jan 2010) | 8 lines
  573. -Changed paths:
  574. - M /trunk/doc/README.developer
  575. -
  576. -Rewrite the bit about null vs. non-null "tree" dissector arguments a
  577. -bit, so as not to imply that there's some form of global "mode"
  578. -Wireshark is in when it passes a null or non-null pointer (there isn't),
  579. -and to explicitly note that there is *no* guarantee about the value of
  580. -"tree" on the first call to the dissector. (I.e., please do not build a
  581. -mental model of how Wireshark works in that regard, and write your
  582. -dissector based on that mental model - you *will* be wrong.)
  583. -------------------------------------------------------------------------
  584. -r31534 | stig | 2010-01-15 05:40:14 -0800 (Fri, 15 Jan 2010) | 3 lines
  585. -Changed paths:
  586. - M /trunk/epan/dissectors/packet-fip.c
  587. -
  588. -Change col_set_str() call to col_add_str() since the string being passed
  589. -can be a ep_alloc from val_to_str().
  590. -------------------------------------------------------------------------
  591. -
  592. -
  593. -------------------------------------------------------------------------
  594. -r31600 | gerald | 2010-01-21 08:22:46 -0800 (Thu, 21 Jan 2010) | 2 lines
  595. -Changed paths:
  596. - M /trunk-1.2/epan/addr_resolv.c
  597. -
  598. -Fix compilation on machines without c-ares.
  599. -
  600. -------------------------------------------------------------------------
  601. -r31601 | etxrab | 2010-01-21 08:31:05 -0800 (Thu, 21 Jan 2010) | 1 line
  602. -Changed paths:
  603. - M /trunk-1.2/diameter/TGPPGmb.xml
  604. - M /trunk-1.2/diameter/dictionary.xml
  605. - M /trunk-1.2/diameter/imscxdx.xml
  606. -
  607. -Update Diameter files.
  608. -------------------------------------------------------------------------
  609. -r31604 | gerald | 2010-01-21 09:02:35 -0800 (Thu, 21 Jan 2010) | 10 lines
  610. -Changed paths:
  611. - M /trunk-1.2/epan/addr_resolv.c
  612. -
  613. -Copy over r30773 with manual intervention.
  614. -
  615. -------------------------------------------------------------------------
  616. -r30773 | jake | 2009-10-30 14:57:43 -0700 (Fri, 30 Oct 2009) | 1 line
  617. -Changed paths:
  618. - M /trunk/epan/addr_resolv.c
  619. -
  620. -Prepare for c-ares 1.6.1 release.
  621. -------------------------------------------------------------------------
  622. -
  623. -------------------------------------------------------------------------
  624. -r31605 | gerald | 2010-01-21 09:30:45 -0800 (Thu, 21 Jan 2010) | 36 lines
  625. -Changed paths:
  626. - M /trunk-1.2/config.nmake
  627. - M /trunk-1.2/configure.in
  628. - M /trunk-1.2/docbook/release-notes.xml
  629. - M /trunk-1.2/epan/dfilter/semcheck.c
  630. - M /trunk-1.2/epan/ftypes/ftype-bytes.c
  631. - M /trunk-1.2/epan/ftypes/ftype-pcre.c
  632. - M /trunk-1.2/epan/ftypes/ftype-string.c
  633. - M /trunk-1.2/epan/ftypes/ftype-tvbuff.c
  634. - M /trunk-1.2/epan/ftypes/ftypes-int.h
  635. - M /trunk-1.2/epan/ftypes/ftypes.h
  636. - M /trunk-1.2/gtk/dfilter_expr_dlg.c
  637. - M /trunk-1.2/version_info.c
  638. -
  639. -Copy over revisions from the trunk:
  640. -
  641. -------------------------------------------------------------------------
  642. -r31302 | gerald | 2009-12-17 17:15:08 -0800 (Thu, 17 Dec 2009) | 3 lines
  643. -Changed paths:
  644. - M /trunk/configure.in
  645. - M /trunk/epan/dfilter/semcheck.c
  646. - M /trunk/epan/ftypes/ftype-bytes.c
  647. - M /trunk/epan/ftypes/ftype-pcre.c
  648. - M /trunk/epan/ftypes/ftype-string.c
  649. - M /trunk/epan/ftypes/ftype-tvbuff.c
  650. - M /trunk/epan/ftypes/ftypes-int.h
  651. - M /trunk/epan/ftypes/ftypes.h
  652. - M /trunk/gtk/dfilter_expr_dlg.c
  653. - M /trunk/version_info.c
  654. -
  655. -If we don't have PCRE and we do have GLib >= 2.14, use GRegexes for the
  656. -"matches" operator.
  657. -------------------------------------------------------------------------
  658. -r31303 | gerald | 2009-12-17 17:25:46 -0800 (Thu, 17 Dec 2009) | 2 lines
  659. -Changed paths:
  660. - M /trunk/epan/ftypes/ftype-bytes.c
  661. - M /trunk/epan/ftypes/ftype-tvbuff.c
  662. -
  663. -Fix our match flags.
  664. -------------------------------------------------------------------------
  665. -r31304 | gerald | 2009-12-17 17:29:56 -0800 (Thu, 17 Dec 2009) | 3 lines
  666. -Changed paths:
  667. - M /trunk/config.nmake
  668. -
  669. -Disable PCRE in the Win32 build. GRegex uses a newer version than we do
  670. -and this matches the Win64 configuration.
  671. -------------------------------------------------------------------------
  672. -
  673. -Update the release notes.
  674. -
  675. -------------------------------------------------------------------------
  676. -r31606 | gerald | 2010-01-21 12:03:21 -0800 (Thu, 21 Jan 2010) | 2 lines
  677. -Changed paths:
  678. - M /trunk-1.2/image/wiresharkdoc.ico
  679. - M /trunk-1.2/packaging/macosx/Resources/wsicondoc.icns
  680. -
  681. -Copy over the latest document icons from the trunk.
  682. -
  683. -------------------------------------------------------------------------
  684. -r31607 | gerald | 2010-01-21 13:13:41 -0800 (Thu, 21 Jan 2010) | 2 lines
  685. -Changed paths:
  686. - M /trunk-1.2/Makefile.nmake
  687. - M /trunk-1.2/config.nmake
  688. - M /trunk-1.2/packaging/nsis/Makefile.nmake
  689. - M /trunk-1.2/packaging/nsis/wireshark.nsi
  690. -
  691. -Prep for a bunch of library updates. This will break the build for a while.
  692. -
  693. -------------------------------------------------------------------------
  694. -r31608 | gerald | 2010-01-21 13:32:51 -0800 (Thu, 21 Jan 2010) | 32 lines
  695. -Changed paths:
  696. - M /trunk-1.2/Makefile.nmake
  697. - M /trunk-1.2/asn1/pkcs12/packet-pkcs12-template.c
  698. - M /trunk-1.2/asn1/snmp/packet-snmp-template.c
  699. - M /trunk-1.2/config.h.win32
  700. - M /trunk-1.2/config.nmake
  701. - M /trunk-1.2/epan/dissectors/packet-ipsec.c
  702. - M /trunk-1.2/epan/dissectors/packet-isakmp.c
  703. - M /trunk-1.2/epan/dissectors/packet-mikey.c
  704. - M /trunk-1.2/epan/dissectors/packet-pkcs12.c
  705. - M /trunk-1.2/epan/dissectors/packet-snmp.c
  706. - M /trunk-1.2/epan/dissectors/packet-ssl-utils.c
  707. - M /trunk-1.2/epan/dissectors/packet-ssl-utils.h
  708. - M /trunk-1.2/epan/dissectors/packet-zbee-security.c
  709. - M /trunk-1.2/epan/epan.c
  710. - M /trunk-1.2/packaging/u3/tools/sysdep.h
  711. - M /trunk-1.2/version_info.c
  712. -
  713. -Copy over the latest GNUTLS bundle support with manual intervention.
  714. -
  715. -------------------------------------------------------------------------
  716. -r31341 | gerald | 2009-12-21 13:06:01 -0800 (Mon, 21 Dec 2009) | 5 lines
  717. -Changed paths:
  718. - M /trunk/Makefile.nmake
  719. - M /trunk/asn1/pkcs12/packet-pkcs12-template.c
  720. - M /trunk/asn1/snmp/packet-snmp-template.c
  721. - M /trunk/capinfos.c
  722. - M /trunk/config.h.win32
  723. - M /trunk/config.nmake
  724. - M /trunk/epan/dissectors/packet-ipsec.c
  725. - M /trunk/epan/dissectors/packet-isakmp.c
  726. - M /trunk/epan/dissectors/packet-mikey.c
  727. - M /trunk/epan/dissectors/packet-pkcs12.c
  728. - M /trunk/epan/dissectors/packet-snmp.c
  729. - M /trunk/epan/dissectors/packet-ssl-utils.c
  730. - M /trunk/epan/dissectors/packet-ssl-utils.h
  731. - M /trunk/epan/dissectors/packet-zbee-security.c
  732. - M /trunk/epan/epan.c
  733. - M /trunk/packaging/u3/tools/sysdep.h
  734. - M /trunk/tools/win32-setup.sh
  735. - M /trunk/tools/win64-setup.sh
  736. - M /trunk/version_info.c
  737. -
  738. -Switch to using a bundled version of the openSUSE Build Service packages
  739. -for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no
  740. -longer have winposixtype.h, so remove its #includes and add a ssize_t
  741. -typedef to config.h.win32.
  742. -------------------------------------------------------------------------
  743. -
  744. -
  745. -------------------------------------------------------------------------
  746. -r31610 | gerald | 2010-01-21 14:01:15 -0800 (Thu, 21 Jan 2010) | 11 lines
  747. -Changed paths:
  748. - M /trunk-1.2/epan/dissectors/packet-ssl-utils.c
  749. -
  750. -Copy over r31342 from the trunk:
  751. -
  752. -------------------------------------------------------------------------
  753. -r31342 | gerald | 2009-12-21 13:34:18 -0800 (Mon, 21 Dec 2009) | 3 lines
  754. -Changed paths:
  755. - M /trunk/epan/dissectors/packet-ssl-utils.c
  756. -
  757. -Can someone explain why it's a good idea that functions like strlen
  758. -return a size_t and then not define a size_t format specifier for sprintf?
  759. -------------------------------------------------------------------------
  760. -
  761. -------------------------------------------------------------------------
  762. -r31611 | gerald | 2010-01-21 14:13:07 -0800 (Thu, 21 Jan 2010) | 2 lines
  763. -Changed paths:
  764. - M /trunk-1.2/epan/dissectors/packet-ssl-utils.c
  765. -
  766. -Add a cast.
  767. -
  768. -------------------------------------------------------------------------
  769. -r31612 | gerald | 2010-01-21 15:49:06 -0800 (Thu, 21 Jan 2010) | 2 lines
  770. -Changed paths:
  771. - M /trunk-1.2/Makefile.nmake
  772. - M /trunk-1.2/tools/win32-setup.sh
  773. - M /trunk-1.2/tools/win64-setup.sh
  774. -
  775. -Use the latest libs.
  776. -
  777. -------------------------------------------------------------------------
  778. -r31613 | gerald | 2010-01-21 15:55:42 -0800 (Thu, 21 Jan 2010) | 2 lines
  779. -Changed paths:
  780. - M /trunk-1.2/docbook/release-notes.xml
  781. -
  782. -Add a note about the 64-bit installer.
  783. -
  784. -------------------------------------------------------------------------
  785. -r31614 | gerald | 2010-01-21 17:30:59 -0800 (Thu, 21 Jan 2010) | 2 lines
  786. -Changed paths:
  787. - M /trunk-1.2/packaging/nsis/Makefile.nmake
  788. -
  789. -Add missing DLLs.
  790. -
  791. -------------------------------------------------------------------------
  792. -r31627 | gerald | 2010-01-22 14:36:47 -0800 (Fri, 22 Jan 2010) | 11 lines
  793. -Changed paths:
  794. - M /trunk-1.2/epan/dissectors/packet-kerberos.c
  795. -
  796. -Copy over r31626 from the trunk:
  797. -
  798. -------------------------------------------------------------------------
  799. -r31626 | gerald | 2010-01-22 14:36:03 -0800 (Fri, 22 Jan 2010) | 3 lines
  800. -Changed paths:
  801. - M /trunk/epan/dissectors/packet-kerberos.c
  802. -
  803. -In our case, not being able to read the Kerberos configuration file
  804. -isn't a big deal.
  805. -------------------------------------------------------------------------
  806. -
  807. -------------------------------------------------------------------------
  808. -r31643 | gerald | 2010-01-24 08:04:59 -0800 (Sun, 24 Jan 2010) | 1 line
  809. -Changed paths:
  810. - M /trunk-1.2/epan/enterprise-numbers
  811. - M /trunk-1.2/manuf
  812. -
  813. -[Automatic manuf and enterprise-numbers update for 2010-01-24]
  814. -------------------------------------------------------------------------
  815. -r31672 | gerald | 2010-01-25 15:46:42 -0800 (Mon, 25 Jan 2010) | 40 lines
  816. -Changed paths:
  817. - M /trunk-1.2/docbook/release-notes.xml
  818. - M /trunk-1.2/docbook/wsug_src/WSUG_app_tools.xml
  819. - M /trunk-1.2/epan/dissectors/packet-dhcpv6.c
  820. - M /trunk-1.2/epan/dissectors/packet-gprs-llc.c
  821. - M /trunk-1.2/epan/dissectors/packet-zrtp.c
  822. -
  823. -Copy over revisions from the trunk:
  824. -
  825. -------------------------------------------------------------------------
  826. -r31609 | jake | 2010-01-21 13:46:46 -0800 (Thu, 21 Jan 2010) | 3 lines
  827. -Changed paths:
  828. - M /trunk/epan/dissectors/packet-dhcpv6.c
  829. -
  830. -From Alexandre Forget:
  831. -Fix the ORO suboption offset error.
  832. -------------------------------------------------------------------------
  833. -r31615 | guy | 2010-01-21 20:43:07 -0800 (Thu, 21 Jan 2010) | 5 lines
  834. -Changed paths:
  835. - M /trunk/docbook/wsug_src/WSUG_app_tools.xml
  836. -
  837. -Clarify tcpdump's default snapshot length a bit - and recommend 65535 as
  838. -the argument to "-s" (1500 is too small even for Ethernet, as the
  839. -maximum size of packets on Ethernet is 1514 bytes if you don't count the
  840. -FCS and 1518 bytes if you do).
  841. -------------------------------------------------------------------------
  842. -r31667 | etxrab | 2010-01-25 12:14:34 -0800 (Mon, 25 Jan 2010) | 3 lines
  843. -Changed paths:
  844. - M /trunk/epan/dissectors/packet-gprs-llc.c
  845. -
  846. -From Mike Morrin:
  847. -Empty GPRS LLC S frames cause truncated data exception.
  848. -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4417
  849. -------------------------------------------------------------------------
  850. -
  851. -
  852. -Copy over with manual intervention:
  853. -
  854. -------------------------------------------------------------------------
  855. -r31598 | jake | 2010-01-20 23:56:21 -0800 (Wed, 20 Jan 2010) | 2 lines
  856. -Changed paths:
  857. - M /trunk/epan/dissectors/packet-zrtp.c
  858. -
  859. -Add Skein MAC authentication tag types.
  860. -------------------------------------------------------------------------
  861. -
  862. -
  863. -------------------------------------------------------------------------
  864. -r31677 | jake | 2010-01-25 23:27:42 -0800 (Mon, 25 Jan 2010) | 2 lines
  865. +r32663 | gerald | 2010-05-04 14:45:21 -0700 (Tue, 04 May 2010) | 2 lines
  866. Changed paths:
  867. - M /trunk-1.2/debian/changelog
  868. + M /trunk-1.2/docbook/release-notes.xml
  869.  
  870. -Adjust release timestamp.
  871. +Update the DOCSIS fix revisions.
  872.  
  873. ------------------------------------------------------------------------
  874. -r31691 | gerald | 2010-01-26 16:00:53 -0800 (Tue, 26 Jan 2010) | 2 lines
  875. +r32676 | gerald | 2010-05-05 10:05:11 -0700 (Wed, 05 May 2010) | 2 lines
  876. Changed paths:
  877. M /trunk-1.2/ChangeLog
  878. M /trunk-1.2/NEWS
  879. M /trunk-1.2/docbook/release-notes.xml
  880. - M /trunk-1.2/print.c
  881. - M /trunk-1.2/tools/win32-setup.sh
  882. - M /trunk-1.2/tools/win64-setup.sh
  883. -
  884. -Final documentation and library tag updates, plus a bonus bug fix.
  885. -
  886. -------------------------------------------------------------------------
  887. -r31692 | gerald | 2010-01-26 16:01:28 -0800 (Tue, 26 Jan 2010) | 2 lines
  888. -Changed paths:
  889. M /trunk-1.2/version.conf
  890.  
  891. -Build 1.2.6.
  892. -
  893. -------------------------------------------------------------------------
  894. -r31702 | gerald | 2010-01-27 08:04:19 -0800 (Wed, 27 Jan 2010) | 2 lines
  895. -Changed paths:
  896. - M /trunk-1.2/packaging/macosx/Info.plist.in
  897. - M /trunk-1.2/version_info.c
  898. -
  899. -Update the copyright year.
  900. +Release 1.2.8.
  901.  
  902. ------------------------------------------------------------------------
  903. -r31711 | gerald | 2010-01-27 17:24:30 -0800 (Wed, 27 Jan 2010) | 2 lines
  904. +r32682 | gerald | 2010-05-05 14:05:06 -0700 (Wed, 05 May 2010) | 2 lines
  905. Changed paths:
  906. M /trunk-1.2/config.nmake
  907. M /trunk-1.2/configure.in
  908. @@ -829,892 +24,569 @@
  909. M /trunk-1.2/docbook/release-notes.xml
  910. M /trunk-1.2/version.conf
  911.  
  912. -1.2.6 -> 1.2.7.
  913. -
  914. -------------------------------------------------------------------------
  915. -r31719 | gerald | 2010-01-28 09:36:41 -0800 (Thu, 28 Jan 2010) | 2 lines
  916. -Changed paths:
  917. - M /trunk-1.2/Makefile.nmake
  918. -
  919. -Use the right User's Guide version.
  920. -
  921. -------------------------------------------------------------------------
  922. -r31743 | gerald | 2010-01-31 08:05:01 -0800 (Sun, 31 Jan 2010) | 1 line
  923. -Changed paths:
  924. - M /trunk-1.2/epan/enterprise-numbers
  925. - M /trunk-1.2/manuf
  926. -
  927. -[Automatic manuf and enterprise-numbers update for 2010-01-31]
  928. -------------------------------------------------------------------------
  929. -r31801 | jake | 2010-02-05 11:09:46 -0800 (Fri, 05 Feb 2010) | 54 lines
  930. -Changed paths:
  931. - M /trunk-1.2/docbook/Makefile.common
  932. - M /trunk-1.2/docbook/user-guide.xml
  933. - M /trunk-1.2/docbook/wsdg_src/WSDG_chapter_tools.xml
  934. - A /trunk-1.2/docbook/wsug_graphics/ws-capture-options-remote-capture.png
  935. - A /trunk-1.2/docbook/wsug_graphics/ws-capture-options-remote-interface.png
  936. - A /trunk-1.2/docbook/wsug_graphics/ws-capture-options-remote-settings.png
  937. - M /trunk-1.2/docbook/wsug_graphics/ws-capture-options.png
  938. - M /trunk-1.2/docbook/wsug_graphics/ws-menu.png
  939. - M /trunk-1.2/docbook/wsug_graphics/ws-statistics-menu.png
  940. - A /trunk-1.2/docbook/wsug_graphics/ws-telephony-menu.png
  941. - M /trunk-1.2/docbook/wsug_src/WSUG_chapter_capture.xml
  942. -
  943. -Copy over missing files and revisions listed on roadmap from the trunk:
  944. -------------------------------------------------------------------------
  945. -r31317 | jake | 2009-12-19 00:14:26 +0100 (Sat, 19 Dec 2009) | 1 line
  946. -Changed paths:
  947. - M /trunk/docbook/user-guide.xml
  948. - M /trunk/docbook/wsug_graphics/ws-menu.png
  949. - M /trunk/docbook/wsug_graphics/ws-statistics-menu.png
  950. - A /trunk/docbook/wsug_graphics/ws-telephony-menu.png
  951. - M /trunk/docbook/wsug_src/WSUG_chapter_use.xml
  952. -
  953. -Update the User Guide to show the current menu.
  954. -------------------------------------------------------------------------
  955. -r31154 | jake | 2009-12-02 20:33:28 +0100 (Wed, 02 Dec 2009) | 3 lines
  956. -Changed paths:
  957. - M /trunk/docbook/Makefile.common
  958. - M /trunk/docbook/user-guide.xml
  959. - A /trunk/docbook/wsug_graphics/ws-capture-options-remote-capture.png
  960. - A /trunk/docbook/wsug_graphics/ws-capture-options-remote-interface.png
  961. - A /trunk/docbook/wsug_graphics/ws-capture-options-remote-settings.png
  962. - M /trunk/docbook/wsug_graphics/ws-capture-options.png
  963. - M /trunk/docbook/wsug_src/WSUG_chapter_capture.xml
  964. -
  965. -Update User Guide:
  966. -- New Capture Options dialog.
  967. -- Add Remote Capture section.
  968. -------------------------------------------------------------------------
  969. -r30848 | gerald | 2009-11-07 00:57:01 +0100 (Sat, 07 Nov 2009) | 3 lines
  970. -Changed paths:
  971. - M /trunk/docbook/wsdg_src/WSDG_chapter_tools.xml
  972. -
  973. -Fix a warning in a table (which results in an error in Fop 0.95). Reformat
  974. -it slightly while we're at it.
  975. -------------------------------------------------------------------------
  976. -r31325 | guy | 2009-12-19 23:12:36 +0100 (Sat, 19 Dec 2009) | 2 lines
  977. -Changed paths:
  978. - M /trunk/docbook/wsdg_src/WSDG_chapter_tools.xml
  979. -
  980. -Get rid of no-longer-applicable and no-longer-referred-to footnote.
  981. -------------------------------------------------------------------------
  982. -r31326 | jake | 2009-12-20 15:49:49 +0100 (Sun, 20 Dec 2009) | 2 lines
  983. -Changed paths:
  984. - M /trunk/docbook/wsdg_src/WSDG_chapter_tools.xml
  985. -
  986. -Clean up the docbook source code, apply proper tags, update references.
  987. -Update readme information, add some editing information for authors.
  988. -------------------------------------------------------------------------
  989. -r31797 | wmeier | 2010-02-05 04:37:46 +0100 (Fri, 05 Feb 2010) | 4 lines
  990. -Changed paths:
  991. - M /trunk/docbook/wsdg_src/WSDG_chapter_tools.xml
  992. -
  993. -From Chris Maynard: "Wrong download link to vcredist_x86.exe"
  994. -(from me): Change a few additional cases of "2008EE" to "2008EE SP1"
  995. - and indicate that 2008EE SP1 is recommended (rather than 2005EE).
  996. -------------------------------------------------------------------------
  997. -------------------------------------------------------------------------
  998. -r31819 | gerald | 2010-02-07 08:04:37 -0800 (Sun, 07 Feb 2010) | 1 line
  999. -Changed paths:
  1000. - M /trunk-1.2/epan/enterprise-numbers
  1001. - M /trunk-1.2/manuf
  1002. -
  1003. -[Automatic manuf and enterprise-numbers update for 2010-02-07]
  1004. -------------------------------------------------------------------------
  1005. -r31850 | gerald | 2010-02-09 13:07:12 -0800 (Tue, 09 Feb 2010) | 2 lines
  1006. -Changed paths:
  1007. - M /trunk-1.2/Makefile.nmake
  1008. - M /trunk-1.2/config.nmake
  1009. - M /trunk-1.2/tools/win32-setup.sh
  1010. -
  1011. -Switch back to GeoIP 1.4.5 for the Win32 1.2 build.
  1012. -
  1013. -------------------------------------------------------------------------
  1014. -r31872 | gerald | 2010-02-12 16:46:00 -0800 (Fri, 12 Feb 2010) | 9 lines
  1015. -Changed paths:
  1016. - M /trunk-1.2/Makefile.nmake
  1017. - M /trunk-1.2/config.nmake
  1018. - M /trunk-1.2/packaging/nsis/Makefile.nmake
  1019. - M /trunk-1.2/packaging/nsis/wireshark.nsi
  1020. - M /trunk-1.2/packaging/ws-manifest.pl
  1021. - M /trunk-1.2/tools/win32-setup.sh
  1022. -
  1023. -From Jaap:
  1024. -
  1025. -Install the OldCigarettes Windows 2000 XP API Wrapper on Windows 2000.
  1026. -
  1027. -From me:
  1028. -
  1029. -Add the API wrapper to the setup. Exclude it from the U3 and PortableApps
  1030. -packages. Switch back to GeoIP 1.4.6. Update the GTK+ bundle.
  1031. -
  1032. -------------------------------------------------------------------------
  1033. -r31873 | gerald | 2010-02-12 17:22:07 -0800 (Fri, 12 Feb 2010) | 2 lines
  1034. -Changed paths:
  1035. - M /trunk-1.2/config.nmake
  1036. -
  1037. -Try to fix the 64-bit build.
  1038. +1.2.8 -> 1.2.9
  1039.  
  1040. ------------------------------------------------------------------------
  1041. -r31879 | gerald | 2010-02-14 08:04:16 -0800 (Sun, 14 Feb 2010) | 1 line
  1042. +r32730 | gerald | 2010-05-09 08:04:54 -0700 (Sun, 09 May 2010) | 1 line
  1043. Changed paths:
  1044. M /trunk-1.2/epan/enterprise-numbers
  1045. M /trunk-1.2/manuf
  1046.  
  1047. -[Automatic manuf and enterprise-numbers update for 2010-02-14]
  1048. +[Automatic manuf and enterprise-numbers update for 2010-05-09]
  1049. ------------------------------------------------------------------------
  1050. -r31906 | jake | 2010-02-17 12:38:01 -0800 (Wed, 17 Feb 2010) | 1 line
  1051. -Changed paths:
  1052. - M /trunk-1.2/asn1/Makefile.nmake
  1053. -
  1054. -Complete the port of Revision 31175, which was only partially done in Revision 31211.
  1055. -------------------------------------------------------------------------
  1056. -r31940 | gerald | 2010-02-21 08:04:00 -0800 (Sun, 21 Feb 2010) | 1 line
  1057. +r32834 | gerald | 2010-05-16 08:07:36 -0700 (Sun, 16 May 2010) | 1 line
  1058. Changed paths:
  1059. M /trunk-1.2/epan/enterprise-numbers
  1060. M /trunk-1.2/manuf
  1061.  
  1062. -[Automatic manuf and enterprise-numbers update for 2010-02-21]
  1063. -------------------------------------------------------------------------
  1064. -r31996 | gerald | 2010-02-24 15:41:28 -0800 (Wed, 24 Feb 2010) | 2 lines
  1065. -Changed paths:
  1066. - M /trunk-1.2/config.nmake
  1067. - M /trunk-1.2/tools/win32-setup.sh
  1068. - M /trunk-1.2/tools/win64-setup.sh
  1069. -
  1070. -Use the current GTK+ 2.16.6 bundle.
  1071. -
  1072. +[Automatic manuf and enterprise-numbers update for 2010-05-16]
  1073. ------------------------------------------------------------------------
  1074. -r32048 | gerald | 2010-02-28 08:04:55 -0800 (Sun, 28 Feb 2010) | 1 line
  1075. +r32919 | gerald | 2010-05-23 08:04:52 -0700 (Sun, 23 May 2010) | 1 line
  1076. Changed paths:
  1077. M /trunk-1.2/epan/enterprise-numbers
  1078. M /trunk-1.2/manuf
  1079.  
  1080. -[Automatic manuf and enterprise-numbers update for 2010-02-28]
  1081. +[Automatic manuf and enterprise-numbers update for 2010-05-23]
  1082. ------------------------------------------------------------------------
  1083. -r32137 | gerald | 2010-03-07 08:04:39 -0800 (Sun, 07 Mar 2010) | 1 line
  1084. +r33025 | gerald | 2010-05-30 08:04:43 -0700 (Sun, 30 May 2010) | 1 line
  1085. Changed paths:
  1086. M /trunk-1.2/epan/enterprise-numbers
  1087. M /trunk-1.2/manuf
  1088.  
  1089. -[Automatic manuf and enterprise-numbers update for 2010-03-07]
  1090. +[Automatic manuf and enterprise-numbers update for 2010-05-30]
  1091. ------------------------------------------------------------------------
  1092. -r32187 | gerald | 2010-03-14 08:04:48 -0700 (Sun, 14 Mar 2010) | 1 line
  1093. +r33111 | gerald | 2010-06-06 08:04:49 -0700 (Sun, 06 Jun 2010) | 1 line
  1094. Changed paths:
  1095. M /trunk-1.2/epan/enterprise-numbers
  1096. M /trunk-1.2/manuf
  1097.  
  1098. -[Automatic manuf and enterprise-numbers update for 2010-03-14]
  1099. +[Automatic manuf and enterprise-numbers update for 2010-06-06]
  1100. ------------------------------------------------------------------------
  1101. -r32215 | gerald | 2010-03-16 16:22:42 -0700 (Tue, 16 Mar 2010) | 102 lines
  1102. +r33115 | gerald | 2010-06-06 15:13:16 -0700 (Sun, 06 Jun 2010) | 126 lines
  1103. Changed paths:
  1104. - M /trunk-1.2/acinclude.m4
  1105. - M /trunk-1.2/configure.in
  1106. + M /trunk-1.2/asn1/sabp/packet-sabp-template.c
  1107. + M /trunk-1.2/doc/dfilter2pod.pl
  1108. + M /trunk-1.2/docbook/dfilter2xml.pl
  1109. M /trunk-1.2/docbook/release-notes.xml
  1110. - M /trunk-1.2/epan/dissectors/packet-dmp.c
  1111. - M /trunk-1.2/epan/dissectors/packet-gsm_a_bssmap.c
  1112. - M /trunk-1.2/epan/dissectors/packet-gsm_sms.c
  1113. - M /trunk-1.2/epan/dissectors/packet-ldss.c
  1114. - M /trunk-1.2/epan/dissectors/packet-ppp.c
  1115. - M /trunk-1.2/epan/ppptypes.h
  1116. - M /trunk-1.2/epan/wslua/wslua_field.c
  1117. - M /trunk-1.2/epan/wslua/wslua_tree.c
  1118. + M /trunk-1.2/epan/dissectors/packet-http.c
  1119. + M /trunk-1.2/epan/dissectors/packet-igmp.c
  1120. + M /trunk-1.2/epan/dissectors/packet-kerberos.c
  1121. + M /trunk-1.2/epan/dissectors/packet-sabp.c
  1122. + M /trunk-1.2/epan/dissectors/packet-xml.c
  1123. + M /trunk-1.2/epan/ftypes/ftype-bytes.c
  1124. + M /trunk-1.2/epan/ftypes/ftype-guid.c
  1125. + M /trunk-1.2/epan/libwireshark.def
  1126. + M /trunk-1.2/epan/packet.c
  1127. + M /trunk-1.2/file.c
  1128. + M /trunk-1.2/gtk/capture_file_dlg.c
  1129. + M /trunk-1.2/gtk/decode_as_dlg.c
  1130. M /trunk-1.2/gtk/io_stat.c
  1131. - M /trunk-1.2/gtk/main_proto_draw.c
  1132. - M /trunk-1.2/plugins/profinet/packet-dcerpc-pn-io.c
  1133. - M /trunk-1.2/tools/checkAPIs.pl
  1134. + M /trunk-1.2/wiretap/wtap.c
  1135. + M /trunk-1.2/wiretap/wtap.h
  1136.  
  1137. Copy over revisions from the trunk:
  1138.  
  1139. ------------------------------------------------------------------------
  1140. -r30249 | stig | 2009-10-02 09:51:31 -0700 (Fri, 02 Oct 2009) | 3 lines
  1141. -Changed paths:
  1142. - M /trunk/epan/wslua/wslua_field.c
  1143. - M /trunk/epan/wslua/wslua_tree.c
  1144. -
  1145. -From Beth via bug 4049:
  1146. -Add support for FT_BOOLEAN fields to FieldInfo and TreeItem.
  1147. -------------------------------------------------------------------------
  1148. -r30305 | etxrab | 2009-10-04 08:49:52 -0700 (Sun, 04 Oct 2009) | 1 line
  1149. +r30940 | kukosa | 2009-11-12 06:44:40 -0800 (Thu, 12 Nov 2009) | 1 line
  1150. Changed paths:
  1151. - M /trunk/gtk/io_stat.c
  1152. - M /trunk/tools/checkAPIs.pl
  1153. + M /trunk/epan/libwireshark.def
  1154.  
  1155. -Get rid of deprecated symblol gtk_widget_draw().
  1156. +Export more BER functions
  1157. ------------------------------------------------------------------------
  1158. -r30729 | stig | 2009-10-27 06:59:05 -0700 (Tue, 27 Oct 2009) | 2 lines
  1159. +r32068 | stig | 2010-03-01 14:11:20 -0800 (Mon, 01 Mar 2010) | 3 lines
  1160. Changed paths:
  1161. - M /trunk/gtk/io_stat.c
  1162. + M /trunk/epan/dissectors/packet-xml.c
  1163.  
  1164. -Use correct default value in tick interval combo box.
  1165. +From LEGO via bug 4405:
  1166. +Add the dot ('.') to the characters that can compose a name.
  1167. ------------------------------------------------------------------------
  1168. -r31032 | dimeg | 2009-11-20 08:23:18 -0800 (Fri, 20 Nov 2009) | 3 lines
  1169. +r32715 | gerald | 2010-05-07 12:45:47 -0700 (Fri, 07 May 2010) | 5 lines
  1170. Changed paths:
  1171. - M /trunk/epan/dissectors/packet-gsm_a_bssmap.c
  1172. + M /trunk/wiretap/wtap.c
  1173.  
  1174. -When decoding a Cell Identifier, curr_offset is not increased after
  1175. -reading rnc-id
  1176. +EOF in zlib 1.2.5 seems to be sticky. When we're tailing a file and we
  1177. +reach EOF, zlib's file handle seems to stay at EOF even when more data
  1178. +is appended to the file. Add a check for 1.2.5 which calls gzseek in
  1179. +order to unset EOF. Fixes bugs 4708 and 4748.
  1180. ------------------------------------------------------------------------
  1181. -r31659 | stig | 2010-01-25 05:58:07 -0800 (Mon, 25 Jan 2010) | 6 lines
  1182. +r32716 | gerald | 2010-05-07 14:15:24 -0700 (Fri, 07 May 2010) | 3 lines
  1183. Changed paths:
  1184. - M /trunk/epan/dissectors/packet-dmp.c
  1185. - M /trunk/epan/dissectors/packet-ldss.c
  1186. -
  1187. -Change back from tvb_child_uncompress() to tvb_uncompress() when
  1188. -parent is NULL, because this will lead to a DISSECTOR_ASSERT in
  1189. -tvb_set_child_real_data_tvbuff().
  1190. + M /trunk/file.c
  1191. + M /trunk/wiretap/wtap.c
  1192. + M /trunk/wiretap/wtap.h
  1193.  
  1194. -This bug was introduced in revision 31499.
  1195. +Zlib has an officially-sanctioned way of clearing EOF when we're tailing
  1196. +a file. Use it.
  1197. ------------------------------------------------------------------------
  1198. -r31786 | wmeier | 2010-02-04 06:41:22 -0800 (Thu, 04 Feb 2010) | 2 lines
  1199. +r32733 | stig | 2010-05-10 03:48:45 -0700 (Mon, 10 May 2010) | 2 lines
  1200. Changed paths:
  1201. - M /trunk/gtk/main_proto_draw.c
  1202. + M /trunk/gtk/io_stat.c
  1203.  
  1204. -Fix a crash which occurs if a progress bar is displayed while generating a hex bytes pane.
  1205. +Bring back "1 min" and "10 min" in IO Graph Tick interval.
  1206. ------------------------------------------------------------------------
  1207. -r31787 | wmeier | 2010-02-04 07:03:30 -0800 (Thu, 04 Feb 2010) | 2 lines
  1208. +r32756 | jake | 2010-05-11 11:04:03 -0700 (Tue, 11 May 2010) | 2 lines
  1209. Changed paths:
  1210. - M /trunk/gtk/main_proto_draw.c
  1211. + M /trunk/epan/dissectors/packet-igmp.c
  1212.  
  1213. -Fix a typo....
  1214. +Show version as generated field.
  1215. ------------------------------------------------------------------------
  1216. -r31918 | guy | 2010-02-18 16:05:34 -0800 (Thu, 18 Feb 2010) | 2 lines
  1217. +r32765 | jake | 2010-05-11 14:46:17 -0700 (Tue, 11 May 2010) | 2 lines
  1218. Changed paths:
  1219. - M /trunk/configure.in
  1220. + M /trunk/epan/ftypes/ftype-bytes.c
  1221. + M /trunk/epan/ftypes/ftype-guid.c
  1222.  
  1223. -There's an echo in here....
  1224. +Straighten out field type names.
  1225. ------------------------------------------------------------------------
  1226. -r31919 | guy | 2010-02-18 16:15:29 -0800 (Thu, 18 Feb 2010) | 3 lines
  1227. +r32766 | jake | 2010-05-11 14:49:30 -0700 (Tue, 11 May 2010) | 2 lines
  1228. Changed paths:
  1229. - M /trunk/acinclude.m4
  1230. + M /trunk/doc/dfilter2pod.pl
  1231. + M /trunk/docbook/dfilter2xml.pl
  1232.  
  1233. -Don't say "Checking for broken pcap-config" if we don't have a
  1234. -pcap-config to check for brokenness.
  1235. +Update display filter scripts with new field types.
  1236. ------------------------------------------------------------------------
  1237. -r31978 | stig | 2010-02-24 00:22:33 -0800 (Wed, 24 Feb 2010) | 3 lines
  1238. +r32774 | guy | 2010-05-12 12:44:23 -0700 (Wed, 12 May 2010) | 4 lines
  1239. Changed paths:
  1240. - M /trunk/plugins/profinet/packet-dcerpc-pn-io.c
  1241. + M /trunk/gtk/capture_file_dlg.c
  1242.  
  1243. -From Hannes Diethelm via bug 4525:
  1244. -Corrected values for IdentInfo (which was obviously wrong)
  1245. +Don't set the sensitivity of the Open button based on whether we can
  1246. +open the currently-selected file; that button is also used to select the
  1247. +file or directory typed in the location bar. This should fix bug 1791.
  1248. ------------------------------------------------------------------------
  1249. -r31985 | etxrab | 2010-02-24 04:41:01 -0800 (Wed, 24 Feb 2010) | 2 lines
  1250. +r32848 | morriss | 2010-05-17 14:49:09 -0700 (Mon, 17 May 2010) | 1 line
  1251. Changed paths:
  1252. - M /trunk/epan/dissectors/packet-gsm_sms.c
  1253. + M /trunk/epan/dissectors/packet-smb-pipe.c
  1254.  
  1255. -GSM SMS PDU TPVPF wrong interpretation.
  1256. -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4524
  1257. +Don't pass a NULL pointer to what is supposed to be (according to the format) a string: some implementations of vsnprintf() will core on that. (Unfortunately it seems that g_vsnprintf() doesn't protect us from this...)
  1258. ------------------------------------------------------------------------
  1259.  
  1260.  
  1261. Copy over with manual intervention:
  1262. ------------------------------------------------------------------------
  1263. -r30570 | etxrab | 2009-10-16 03:32:06 -0700 (Fri, 16 Oct 2009) | 1 line
  1264. +r32680 | etxrab | 2010-05-05 12:22:28 -0700 (Wed, 05 May 2010) | 1 line
  1265. Changed paths:
  1266. - M /trunk/gtk/io_stat.c
  1267. + M /trunk/asn1/sabp/packet-sabp-template.c
  1268. + M /trunk/epan/dissectors/packet-sabp.c
  1269.  
  1270. -More gtk_option_menu -> gtk_combo_box
  1271. +Calculate correct PDU lenght if the per_length_determinant is one byte long.
  1272. ------------------------------------------------------------------------
  1273. -r31738 | jake | 2010-01-30 02:43:46 -0800 (Sat, 30 Jan 2010) | 2 lines
  1274. +r32723 | sake | 2010-05-08 00:55:12 -0700 (Sat, 08 May 2010) | 3 lines
  1275. Changed paths:
  1276. - M /trunk/epan/dissectors/packet-ppp.c
  1277. - M /trunk/epan/ppptypes.h
  1278. + M /trunk/epan/packet.c
  1279. + M /trunk/gtk/decode_as_dlg.c
  1280.  
  1281. -IANA updates and fixes for PPP types.
  1282. +Enable "Decode As..." for ethertype 0x0000 (fix for bug 4721)
  1283. ------------------------------------------------------------------------
  1284. +r32752 | wmeier | 2010-05-11 07:34:16 -0700 (Tue, 11 May 2010) | 10 lines
  1285. +Changed paths:
  1286. + M /trunk/epan/dissectors/packet-kerberos.c
  1287.  
  1288. +Fix handling of pa-data-type KRB5_PA_PAC_REQUEST (& KRB5_PA_S4U2SELF).
  1289.  
  1290. -Update the release notes.
  1291. +-Define pa-data-type KRB5_PA_PAC_REQUEST properly so that it is recognized.
  1292. + Fixes bug #4752 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4752)
  1293. +-Also revert definition of KRB5_PA_S4U2SELF (to be a positive number).
  1294. +(All of the above reverts part of SVN #31400).
  1295.  
  1296. +-Display pa-data-type as FT_INT32.
  1297. +-Display the value for pa-data-type KRB5_PA_PAC_REQUEST as Boolean (not Int).
  1298. ------------------------------------------------------------------------
  1299. -r32223 | gerald | 2010-03-17 12:14:44 -0700 (Wed, 17 Mar 2010) | 72 lines
  1300. +r32772 | morriss | 2010-05-12 06:24:42 -0700 (Wed, 12 May 2010) | 13 lines
  1301. Changed paths:
  1302. - M /trunk-1.2/asn1/pres/packet-pres-template.c
  1303. - M /trunk-1.2/asn1/snmp/packet-snmp-template.c
  1304. - M /trunk-1.2/docbook/release-notes.xml
  1305. - M /trunk-1.2/epan/dfilter/dfilter-macro.c
  1306. - M /trunk-1.2/epan/dissectors/packet-http.c
  1307. - M /trunk-1.2/epan/dissectors/packet-isakmp.c
  1308. - M /trunk-1.2/epan/dissectors/packet-k12.c
  1309. - M /trunk-1.2/epan/dissectors/packet-pres.c
  1310. - M /trunk-1.2/epan/dissectors/packet-sccp.c
  1311. - M /trunk-1.2/epan/dissectors/packet-sip.c
  1312. - M /trunk-1.2/epan/dissectors/packet-snmp.c
  1313. - M /trunk-1.2/epan/dissectors/packet-user_encap.c
  1314. - M /trunk-1.2/epan/geoip_db.c
  1315. - M /trunk-1.2/epan/oids.c
  1316. - M /trunk-1.2/epan/proto.c
  1317. - M /trunk-1.2/epan/uat-int.h
  1318. - M /trunk-1.2/epan/uat.c
  1319. - M /trunk-1.2/epan/uat.h
  1320. - M /trunk-1.2/epan/uat_load.l
  1321. - M /trunk-1.2/gtk/main_menu.c
  1322. - M /trunk-1.2/gtk/main_welcome.c
  1323. - M /trunk-1.2/gtk/uat_gui.c
  1324. + M /trunk/epan/dissectors/packet-http.c
  1325.  
  1326. -Copy over revisions from the trunk:
  1327. +From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4758 :
  1328.  
  1329. -------------------------------------------------------------------------
  1330. -r31987 | jake | 2010-02-24 11:05:55 -0800 (Wed, 24 Feb 2010) | 4 lines
  1331. -Changed paths:
  1332. - M /trunk/gtk/menus.c
  1333. +The HTTP dissector uses strtoll() to convert the Content-Length string into a
  1334. +64bit variable. But that string can contain a number larger (or less) than
  1335. +64bit, which lets the strtoll() return INT_MAX (or INT_MIN). strtoll() then
  1336. +indicates this with errno==ERANGE.
  1337.  
  1338. -Fix for bug 4522:
  1339. -Don't offer "Wiki Protocol Page" and "Filter Field Reference" in the
  1340. -context menu when a Text item is selected.
  1341. -------------------------------------------------------------------------
  1342. -r32005 | jake | 2010-02-25 09:41:57 -0800 (Thu, 25 Feb 2010) | 3 lines
  1343. -Changed paths:
  1344. - M /trunk/gtk/main_welcome.c
  1345. +The attachted patch checks if errno is set this way and then treats that HTTP
  1346. +Content-Length as unspecified, since we don't know the real size.
  1347.  
  1348. -Fix for bug 2478:
  1349. -"Push to test. Release to detonate."
  1350. +I haven't checked other occurences of strtoll() in the HTTP dissector if they
  1351. +could benefit from the errno check, or if other dissectors could use it.
  1352. ------------------------------------------------------------------------
  1353. -r32090 | etxrab | 2010-03-03 07:29:38 -0800 (Wed, 03 Mar 2010) | 6 lines
  1354. -Changed paths:
  1355. - M /trunk/epan/dissectors/packet-sip.c
  1356.  
  1357. -Changed to use g_str_hash ()
  1358. -sip_hash_func() function seem to not generate unique enough keys
  1359. -if load generation tools are used with many thousands users.
  1360. -Loading time ~5 min -> 30s
  1361. +Update the release notes.
  1362.  
  1363. -There is a memory leak in the sip_is_packet_resend area as well.
  1364. ------------------------------------------------------------------------
  1365. +r33119 | gerald | 2010-06-06 17:02:21 -0700 (Sun, 06 Jun 2010) | 10 lines
  1366. +Changed paths:
  1367. + M /trunk-1.2/wiretap/wtap.def
  1368.  
  1369. -
  1370. -Copy over with manual intervention:
  1371. +Copy over r32719 from the trunk:
  1372.  
  1373. ------------------------------------------------------------------------
  1374. -r32081 | etxrab | 2010-03-01 21:44:04 -0800 (Mon, 01 Mar 2010) | 3 lines
  1375. +r32719 | guy | 2010-05-07 17:43:23 -0700 (Fri, 07 May 2010) | 2 lines
  1376. Changed paths:
  1377. - M /trunk/asn1/snmp/packet-snmp-template.c
  1378. - M /trunk/epan/dissectors/packet-snmp.c
  1379. + M /trunk/wiretap/wtap.def
  1380.  
  1381. -From Luis Ontanon:
  1382. -Check for duplicate entries in usmUserTable.
  1383. -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2426
  1384. -------------------------------------------------------------------------
  1385. -r32112 | stig | 2010-03-04 04:50:18 -0800 (Thu, 04 Mar 2010) | 4 lines
  1386. -Changed paths:
  1387. - M /trunk/asn1/pres/packet-pres-template.c
  1388. - M /trunk/asn1/snmp/packet-snmp-template.c
  1389. - M /trunk/epan/dfilter/dfilter-macro.c
  1390. - M /trunk/epan/dissectors/packet-http.c
  1391. - M /trunk/epan/dissectors/packet-isakmp.c
  1392. - M /trunk/epan/dissectors/packet-k12.c
  1393. - M /trunk/epan/dissectors/packet-mac-lte.c
  1394. - M /trunk/epan/dissectors/packet-pres.c
  1395. - M /trunk/epan/dissectors/packet-sccp.c
  1396. - M /trunk/epan/dissectors/packet-snmp.c
  1397. - M /trunk/epan/dissectors/packet-user_encap.c
  1398. - M /trunk/epan/geoip_db.c
  1399. - M /trunk/epan/oids.c
  1400. - M /trunk/epan/uat-int.h
  1401. - M /trunk/epan/uat.c
  1402. - M /trunk/epan/uat.h
  1403. - M /trunk/epan/uat_load.l
  1404. - M /trunk/gtk/uat_gui.c
  1405. -
  1406. -From LEGO via bug 3459:
  1407. -Add a callback to UAT to be called after the table has being updated,
  1408. -use it to renew the snmp_ue_cache.
  1409. +Add wtap_cleareof().
  1410. ------------------------------------------------------------------------
  1411.  
  1412. -
  1413. -Update the release notes.
  1414. -
  1415. ------------------------------------------------------------------------
  1416. -r32227 | gerald | 2010-03-17 13:05:43 -0700 (Wed, 17 Mar 2010) | 13 lines
  1417. +r33120 | gerald | 2010-06-06 18:01:30 -0700 (Sun, 06 Jun 2010) | 12 lines
  1418. Changed paths:
  1419. M /trunk-1.2/docbook/release-notes.xml
  1420. - M /trunk-1.2/epan/proto.h
  1421. + M /trunk-1.2/epan/dissectors/packet-smb-pipe.c
  1422.  
  1423. -Add r32193:
  1424. +Copy over r32848 from the trunk:
  1425.  
  1426. ------------------------------------------------------------------------
  1427. -r32193 | jake | 2010-03-15 01:14:58 -0700 (Mon, 15 Mar 2010) | 3 lines
  1428. +r32848 | morriss | 2010-05-17 14:49:09 -0700 (Mon, 17 May 2010) | 1 line
  1429. Changed paths:
  1430. - M /trunk/epan/proto.h
  1431. + M /trunk/epan/dissectors/packet-smb-pipe.c
  1432.  
  1433. -Fix for bug 4565:
  1434. -As a true 'pseudo' GLib function, act benign when presented a NULL pointer.
  1435. +Don't pass a NULL pointer to what is supposed to be (according to the format) a string: some implementations of vsnprintf() will core on that. (Unfortunately it seems that g_vsnprintf() doesn't protect us from this...)
  1436. ------------------------------------------------------------------------
  1437.  
  1438. Update the release notes.
  1439.  
  1440. ------------------------------------------------------------------------
  1441. -r32242 | etxrab | 2010-03-19 00:22:29 -0700 (Fri, 19 Mar 2010) | 1 line
  1442. +r33121 | gerald | 2010-06-06 18:13:14 -0700 (Sun, 06 Jun 2010) | 13 lines
  1443. Changed paths:
  1444. - M /trunk-1.2/Makefile.am
  1445. - M /trunk-1.2/diameter/chargecontrol.xml
  1446. - M /trunk-1.2/diameter/dictionary.xml
  1447. - M /trunk-1.2/diameter/mobileipv4.xml
  1448. - A /trunk-1.2/diameter/mobileipv6.xml
  1449. - M /trunk-1.2/packaging/nsis/wireshark.nsi
  1450. + M /trunk-1.2/docbook/release-notes.xml
  1451. + M /trunk-1.2/epan/dissectors/packet-ptp.c
  1452. + M /trunk-1.2/gtk/gui_utils.c
  1453.  
  1454. -Update Dimaeter xml files.
  1455. -------------------------------------------------------------------------
  1456. -r32255 | etxrab | 2010-03-20 15:25:54 -0700 (Sat, 20 Mar 2010) | 1 line
  1457. -Changed paths:
  1458. - M /trunk-1.2/diameter/TGPPGmb.xml
  1459. - M /trunk-1.2/diameter/imscxdx.xml
  1460. - M /trunk-1.2/diameter/mobileipv4.xml
  1461. +Copy over r32911 from the trunk:
  1462.  
  1463. -AVP updates
  1464. ------------------------------------------------------------------------
  1465. -r32260 | gerald | 2010-03-21 08:05:22 -0700 (Sun, 21 Mar 2010) | 1 line
  1466. +r32911 | jake | 2010-05-20 12:03:13 -0700 (Thu, 20 May 2010) | 3 lines
  1467. Changed paths:
  1468. - M /trunk-1.2/epan/enterprise-numbers
  1469. - M /trunk-1.2/manuf
  1470. + M /trunk/gtk/gui_utils.c
  1471.  
  1472. -[Automatic manuf and enterprise-numbers update for 2010-03-21]
  1473. +Fix for bug 4778:
  1474. +Check that the widget pointer is still present.
  1475. ------------------------------------------------------------------------
  1476. -r32315 | etxrab | 2010-03-27 14:43:18 -0700 (Sat, 27 Mar 2010) | 2 lines
  1477. -Changed paths:
  1478. - M /trunk-1.2/epan/dissectors/packet-sip.c
  1479.  
  1480. -Fix for" Parsing SIP messages within the same TCP Packet report a wrong SIP method"
  1481. -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4570
  1482. -------------------------------------------------------------------------
  1483. -r32318 | gerald | 2010-03-28 08:04:45 -0700 (Sun, 28 Mar 2010) | 1 line
  1484. -Changed paths:
  1485. - M /trunk-1.2/epan/enterprise-numbers
  1486. - M /trunk-1.2/manuf
  1487. +Fix PTP regression (bug 4773). Update the release notes.
  1488.  
  1489. -[Automatic manuf and enterprise-numbers update for 2010-03-28]
  1490. ------------------------------------------------------------------------
  1491. -r32332 | gerald | 2010-03-30 16:47:50 -0700 (Tue, 30 Mar 2010) | 38 lines
  1492. +r33122 | gerald | 2010-06-06 18:26:43 -0700 (Sun, 06 Jun 2010) | 19 lines
  1493. Changed paths:
  1494. - M /trunk-1.2/AUTHORS
  1495. M /trunk-1.2/docbook/release-notes.xml
  1496. - M /trunk-1.2/gtk/capture_dlg.c
  1497. - M /trunk-1.2/gtk/rtp_player.c
  1498. - M /trunk-1.2/wiretap/wtap.c
  1499. + M /trunk-1.2/epan/dissectors/packet-ber.c
  1500.  
  1501. Copy over revisions from the trunk:
  1502.  
  1503. ------------------------------------------------------------------------
  1504. -r31438 | stig | 2010-01-04 03:59:27 -0800 (Mon, 04 Jan 2010) | 2 lines
  1505. -Changed paths:
  1506. - M /trunk/gtk/capture_dlg.c
  1507. -
  1508. -Check for valid linktype_history in capture_get_linktype().
  1509. -------------------------------------------------------------------------
  1510. -
  1511. -
  1512. -Copy over with manual intervention:
  1513. -
  1514. -------------------------------------------------------------------------
  1515. -r32304 | morriss | 2010-03-26 17:54:11 -0700 (Fri, 26 Mar 2010) | 7 lines
  1516. +r32922 | gerald | 2010-05-23 16:42:58 -0700 (Sun, 23 May 2010) | 3 lines
  1517. Changed paths:
  1518. - M /trunk/gtk/rtp_player.c
  1519. + M /trunk/epan/dissectors/packet-ber.c
  1520.  
  1521. -Fix (or at least work around the crash in)
  1522. -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4119 :
  1523. -
  1524. -Never insert more than 1000 silence frames (e.g., if the sequence number jumps
  1525. -massively). There may be a better way, but at least now we won't crash.
  1526. -Leave a comment in the code indicating this.
  1527. +Make get_ber_length() iterative instead of recursive so we don't overrun the
  1528. +stack. Discovered by J. Oquendo.
  1529. ------------------------------------------------------------------------
  1530. -r32321 | guy | 2010-03-28 12:35:14 -0700 (Sun, 28 Mar 2010) | 4 lines
  1531. +r33046 | gal | 2010-06-02 06:33:37 -0700 (Wed, 02 Jun 2010) | 3 lines
  1532. Changed paths:
  1533. - M /trunk/AUTHORS
  1534. - M /trunk/wiretap/wtap.c
  1535. + M /trunk/epan/dissectors/packet-ber.c
  1536.  
  1537. -From Robert Bullen: give the Bluetooth-H4-with-Linux-pseudo-header
  1538. -encapsulation a name different from the no-pseudo-header H4
  1539. -encapsulation.
  1540. +Updated get_ber_length to handle multiple nested indefinite length encodings.
  1541. ------------------------------------------------------------------------
  1542.  
  1543. -
  1544. Update the release notes.
  1545.  
  1546. ------------------------------------------------------------------------
  1547. -r32333 | gerald | 2010-03-30 16:53:38 -0700 (Tue, 30 Mar 2010) | 38 lines
  1548. +r33123 | gerald | 2010-06-06 18:58:57 -0700 (Sun, 06 Jun 2010) | 97 lines
  1549. Changed paths:
  1550. - M /trunk-1.2/tap-iostat.c
  1551. + M /trunk-1.2/Makefile.am
  1552. + M /trunk-1.2/capture.c
  1553. + M /trunk-1.2/doc/README.developer
  1554. + M /trunk-1.2/docbook/release-notes.xml
  1555. + M /trunk-1.2/epan/column-utils.c
  1556. + M /trunk-1.2/epan/dissectors/packet-bgp.h
  1557. + M /trunk-1.2/epan/dissectors/packet-pgm.c
  1558. + M /trunk-1.2/epan/proto.c
  1559. + M /trunk-1.2/file.c
  1560. + M /trunk-1.2/file.h
  1561. + M /trunk-1.2/gtk/filter_autocomplete.c
  1562. + M /trunk-1.2/text2pcap-scanner.l
  1563. + M /trunk-1.2/tools/lemon/lemon.c
  1564. + M /trunk-1.2/trigcap.c
  1565.  
  1566. Copy over revisions from the trunk:
  1567.  
  1568. ------------------------------------------------------------------------
  1569. -r32296 | morriss | 2010-03-26 14:07:49 -0700 (Fri, 26 Mar 2010) | 7 lines
  1570. +r32947 | jake | 2010-05-25 10:47:00 -0700 (Tue, 25 May 2010) | 3 lines
  1571. Changed paths:
  1572. - M /trunk/tap-iostat.c
  1573. -
  1574. -Use 64-bit counters throughout. This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3205
  1575. -though most of the other taps also need such a change.
  1576. -
  1577. -Note: the columns don't align with really big numbers.
  1578. + M /trunk/epan/dissectors/packet-bgp.h
  1579.  
  1580. -Add support for 64-bit ftypes.
  1581. +Fix for bug 4782:
  1582. +Use proper bitmask to test the "MATCH"-part.
  1583. ------------------------------------------------------------------------
  1584. -r32298 | morriss | 2010-03-26 14:19:30 -0700 (Fri, 26 Mar 2010) | 4 lines
  1585. +r32956 | wmeier | 2010-05-25 15:27:00 -0700 (Tue, 25 May 2010) | 4 lines
  1586. Changed paths:
  1587. - M /trunk/tap-iostat.c
  1588. + M /trunk/text2pcap-scanner.l
  1589.  
  1590. -Use one space and a larger printf field width instead of many spaces and a
  1591. -smaller field width. This allows printf to use those extra spaces if it needs
  1592. -to, helping column alignment when the numbers are big.
  1593. +Handle lines ending in \r\n.
  1594. +Fixes Bug #4780
  1595. +See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4780
  1596. ------------------------------------------------------------------------
  1597. -r32299 | guy | 2010-03-26 15:30:54 -0700 (Fri, 26 Mar 2010) | 5 lines
  1598. +r32962 | guy | 2010-05-25 19:21:23 -0700 (Tue, 25 May 2010) | 3 lines
  1599. Changed paths:
  1600. - M /trunk/tap-iostat.c
  1601. -
  1602. -If we have more than 4294967295 items, we have a real problem, as we
  1603. -allocate memory for each item.
  1604. + M /trunk/doc/README.developer
  1605.  
  1606. -Use gboolean for Boolean flags.
  1607. +Put in a warning about the <stdarg.h> problem that I just found and
  1608. +fixed in one place (and am now fixing in some other places).
  1609. ------------------------------------------------------------------------
  1610. -r32300 | guy | 2010-03-26 15:36:22 -0700 (Fri, 26 Mar 2010) | 2 lines
  1611. +r32987 | gerald | 2010-05-26 17:49:01 -0700 (Wed, 26 May 2010) | 3 lines
  1612. Changed paths:
  1613. - M /trunk/tap-iostat.c
  1614. + M /trunk/gtk/filter_autocomplete.c
  1615.  
  1616. -Print 32-bit counters with the right format.
  1617. +Make sure our prefix length is > 0 before lopping off the last
  1618. +character. Fixes bug 4797.
  1619. ------------------------------------------------------------------------
  1620. +r33005 | gerald | 2010-05-27 16:55:04 -0700 (Thu, 27 May 2010) | 4 lines
  1621. +Changed paths:
  1622. + M /trunk/capture.c
  1623. + M /trunk/file.c
  1624. + M /trunk/file.h
  1625.  
  1626. +Add cf_fake_continue_tail() which is called when real-time capture
  1627. +updates are off and which sets the capture file state to a value that
  1628. +won't cause an assertion when the user stops capturing. Fixes bug 4035.
  1629. ------------------------------------------------------------------------
  1630. -r32334 | gerald | 2010-03-30 17:01:29 -0700 (Tue, 30 Mar 2010) | 2 lines
  1631. +r33028 | guy | 2010-05-31 12:37:26 -0700 (Mon, 31 May 2010) | 13 lines
  1632. Changed paths:
  1633. - M /trunk-1.2/docbook/release-notes.xml
  1634. + M /trunk/Makefile.am
  1635.  
  1636. -Update the release notes.
  1637. +Wireshark requires routines from libm, such as ceil(), so link with it;
  1638. +we shouldn't rely on getting it pulled in by other shared libraries, as
  1639.  
  1640. -------------------------------------------------------------------------
  1641. -r32341 | gerald | 2010-03-31 09:34:33 -0700 (Wed, 31 Mar 2010) | 2 lines
  1642. -Changed paths:
  1643. - M /trunk-1.2/ChangeLog
  1644. - M /trunk-1.2/NEWS
  1645. - M /trunk-1.2/docbook/release-notes.xml
  1646. - M /trunk-1.2/version.conf
  1647. + 1) there's no guarantee that the other shared libraries we use
  1648. + are linked with it or will continue to be linked with it;
  1649.  
  1650. -Build 1.2.7.
  1651. + 2) there's no guarantee that we're even linking dynamically;
  1652.  
  1653. + 3) it fails on Fedora 13 as part of a change to catch programs
  1654. + that implicitly (or explicitly) assume, in their build
  1655. + procedures, that they'll get libraries linked in as a result
  1656. + of linking with other libraries.
  1657. ------------------------------------------------------------------------
  1658. -r32344 | gerald | 2010-03-31 15:51:08 -0700 (Wed, 31 Mar 2010) | 2 lines
  1659. -Changed paths:
  1660. - M /trunk-1.2/config.nmake
  1661. - M /trunk-1.2/configure.in
  1662. - M /trunk-1.2/debian/changelog
  1663. - M /trunk-1.2/docbook/release-notes.xml
  1664. - M /trunk-1.2/version.conf
  1665.  
  1666. -1.2.7 -> 1.2.8.
  1667.  
  1668. +Copy over with manual intervention:
  1669. ------------------------------------------------------------------------
  1670. -r32374 | gerald | 2010-04-04 08:05:06 -0700 (Sun, 04 Apr 2010) | 1 line
  1671. +r32961 | guy | 2010-05-25 19:01:49 -0700 (Tue, 25 May 2010) | 4 lines
  1672. Changed paths:
  1673. - M /trunk-1.2/epan/enterprise-numbers
  1674. - M /trunk-1.2/manuf
  1675. + M /trunk/epan/column-utils.c
  1676.  
  1677. -[Automatic manuf and enterprise-numbers update for 2010-04-04]
  1678. +Once you've used a va_list, you can't use it again until you
  1679. +reinitialize it with va_start(). (Yes, there are platforms where
  1680. +reusing the va_arg fails, e.g. Mac OS X on x86-64.)
  1681. ------------------------------------------------------------------------
  1682. -r32446 | gerald | 2010-04-11 08:04:36 -0700 (Sun, 11 Apr 2010) | 1 line
  1683. +r32963 | guy | 2010-05-25 19:25:13 -0700 (Tue, 25 May 2010) | 6 lines
  1684. Changed paths:
  1685. - M /trunk-1.2/epan/enterprise-numbers
  1686. - M /trunk-1.2/manuf
  1687. + M /trunk/epan/dissectors/dcerpc/idl2wrs.c
  1688. + M /trunk/epan/proto.c
  1689. + M /trunk/tools/lemon/lemon.c
  1690. + M /trunk/trigcap.c
  1691.  
  1692. -[Automatic manuf and enterprise-numbers update for 2010-04-11]
  1693. +More <stdarg.h> cleanup; some are real bugs, some are just "don't do
  1694. +va_start and va_end unless you're actually going to use the va_list"
  1695. +(those bring the va_start and va_end closer to the use point, which
  1696. +makes it a little more obvious that we're using <stdarg.h> correctly and
  1697. +makes it a little harder to use it incorrectly).
  1698. ------------------------------------------------------------------------
  1699. -r32507 | gerald | 2010-04-18 08:04:40 -0700 (Sun, 18 Apr 2010) | 1 line
  1700. +r33003 | jake | 2010-05-27 14:54:58 -0700 (Thu, 27 May 2010) | 5 lines
  1701. Changed paths:
  1702. - M /trunk-1.2/epan/enterprise-numbers
  1703. - M /trunk-1.2/manuf
  1704. + M /trunk/epan/dissectors/packet-pgm.c
  1705.  
  1706. -[Automatic manuf and enterprise-numbers update for 2010-04-18]
  1707. -------------------------------------------------------------------------
  1708. -r32556 | gerald | 2010-04-25 08:04:47 -0700 (Sun, 25 Apr 2010) | 1 line
  1709. -Changed paths:
  1710. - M /trunk-1.2/epan/enterprise-numbers
  1711. - M /trunk-1.2/manuf
  1712. +From Steven McCoy:
  1713. +AFI fields are 2 bytes i.s.o. 1.
  1714.  
  1715. -[Automatic manuf and enterprise-numbers update for 2010-04-25]
  1716. +From me, several more size changes and decode cleanup.
  1717. ------------------------------------------------------------------------
  1718. -r32632 | gerald | 2010-05-02 08:04:42 -0700 (Sun, 02 May 2010) | 1 line
  1719. -Changed paths:
  1720. - M /trunk-1.2/epan/enterprise-numbers
  1721. - M /trunk-1.2/manuf
  1722.  
  1723. -[Automatic manuf and enterprise-numbers update for 2010-05-02]
  1724. +
  1725. +Update the release notes.
  1726. +
  1727. ------------------------------------------------------------------------
  1728. -r32642 | etxrab | 2010-05-03 00:49:50 -0700 (Mon, 03 May 2010) | 1 line
  1729. +r33127 | etxrab | 2010-06-07 05:51:23 -0700 (Mon, 07 Jun 2010) | 1 line
  1730. Changed paths:
  1731. M /trunk-1.2/diameter/TGPPGmb.xml
  1732. - M /trunk-1.2/diameter/TGPPSh.xml
  1733. M /trunk-1.2/diameter/dictionary.xml
  1734. + M /trunk-1.2/diameter/eap.xml
  1735. + M /trunk-1.2/diameter/nasreq.xml
  1736. + M /trunk-1.2/diameter/sip.xml
  1737.  
  1738. -Update diameter xml files.
  1739. +Update diameter.xml files.
  1740. ------------------------------------------------------------------------
  1741. -r32655 | gerald | 2010-05-03 17:20:39 -0700 (Mon, 03 May 2010) | 92 lines
  1742. +r33131 | gerald | 2010-06-07 08:57:27 -0700 (Mon, 07 Jun 2010) | 43 lines
  1743. Changed paths:
  1744. - M /trunk-1.2/capture.c
  1745. - M /trunk-1.2/capture_ui_utils.c
  1746. - M /trunk-1.2/cfile.c
  1747. - M /trunk-1.2/cfile.h
  1748. M /trunk-1.2/docbook/release-notes.xml
  1749. - M /trunk-1.2/file.c
  1750. - M /trunk-1.2/file.h
  1751. - M /trunk-1.2/gtk/main.c
  1752. - M /trunk-1.2/gtk/packet_win.c
  1753. - M /trunk-1.2/plugins/docsis/packet-bpkmreq.c
  1754. - M /trunk-1.2/plugins/docsis/packet-bpkmrsp.c
  1755. - M /trunk-1.2/plugins/docsis/packet-dsaack.c
  1756. - M /trunk-1.2/plugins/docsis/packet-dsarsp.c
  1757. - M /trunk-1.2/plugins/docsis/packet-dscack.c
  1758. - M /trunk-1.2/plugins/docsis/packet-dscrsp.c
  1759. - M /trunk-1.2/plugins/docsis/packet-dsdrsp.c
  1760. - M /trunk-1.2/plugins/docsis/packet-map.c
  1761. - M /trunk-1.2/plugins/docsis/packet-regack.c
  1762. - M /trunk-1.2/plugins/docsis/packet-regrsp.c
  1763. - M /trunk-1.2/wiretap/packetlogger.c
  1764. - M /trunk-1.2/wiretap/pcapng.c
  1765. + M /trunk-1.2/epan/sigcomp-udvm.c
  1766.  
  1767. Copy over revisions from the trunk:
  1768.  
  1769. ------------------------------------------------------------------------
  1770. -r28809 | tuexen | 2009-06-22 05:13:12 -0700 (Mon, 22 Jun 2009) | 2 lines
  1771. +r33065 | guy | 2010-06-02 18:22:18 -0700 (Wed, 02 Jun 2010) | 20 lines
  1772. Changed paths:
  1773. - M /trunk/wiretap/packetlogger.c
  1774. + M /trunk/epan/sigcomp-udvm.c
  1775.  
  1776. -Improve heuristic for packetlogger file format detection.
  1777. -------------------------------------------------------------------------
  1778. -r31512 | stig | 2010-01-13 02:21:25 -0800 (Wed, 13 Jan 2010) | 2 lines
  1779. -Changed paths:
  1780. - M /trunk/gtk/main.c
  1781. +Sorry, I forgot that 8.6. UDVM Cycles says
  1782.  
  1783. -Display the capture filter in the main window title when capturing.
  1784. + Note that the number of UDVM cycles MUST NOT be increased if a
  1785. + request for additional compressed data fails.
  1786.  
  1787. -------------------------------------------------------------------------
  1788. -r32390 | gerald | 2010-04-05 14:13:00 -0700 (Mon, 05 Apr 2010) | 2 lines
  1789. -Changed paths:
  1790. - M /trunk/capture_ui_utils.c
  1791. +so we *shouldn't* increase the cycle count further when
  1792. +SIGCOMP_INSTR_INPUT_BYTES fails. That does *NOT* of course, mean that
  1793. +we shouldn't increase the cycle count by 1 for a failed INPUT-BYTES
  1794. +instruction - that would leave UDVM vulnerable to infinite loops (as per
  1795. +bug 4826), and I *really* doubt that was their intent; presumably, it
  1796. +means it should not be increased *by the number of cycles for the
  1797. +additional data*:
  1798.  
  1799. -Note that -X stdin_descr stretches the original intent of the -X option.
  1800. + Additionally, if the UDVM successfully requests n bits of
  1801. + compressed data using one of the INPUT instructions then the
  1802. + number of available UDVM cycles is increased by n *
  1803. + cycles_per_bit once the instruction has been executed.
  1804. +
  1805. +if the attempt to get that additional data fails.
  1806. ------------------------------------------------------------------------
  1807.  
  1808.  
  1809. Copy over with manual intervention:
  1810. +
  1811. ------------------------------------------------------------------------
  1812. -r32393 | guy | 2010-04-05 15:20:21 -0700 (Mon, 05 Apr 2010) | 11 lines
  1813. +r33061 | gerald | 2010-06-02 15:16:49 -0700 (Wed, 02 Jun 2010) | 4 lines
  1814. Changed paths:
  1815. - M /trunk/wiretap/pcapng.c
  1816. + M /trunk/epan/sigcomp-udvm.c
  1817.  
  1818. -Treat the first block we read, when opening, specially:
  1819. -
  1820. - 1) if it's not an SHB, just say "this is not a pcap-ng file",
  1821. - don't try to process it (we can't process it, as we haven't
  1822. - finished setting up all the state information yet);
  1823. +Increment the cycle count no matter what. Increase the cycle count
  1824. +further when SIGCOMP_INSTR_INPUT_BYTES fails. Fixes the infinite loop
  1825. +found in bug 4826.
  1826. +------------------------------------------------------------------------
  1827.  
  1828. - 2) if it has the right SHB type code, but isn't a valid SHB,
  1829. - just say "this is not a pcap-ng file".
  1830. +Update the release notes.
  1831.  
  1832. -For all other SHB's, treat anything that renders it invalid as an error.
  1833. ------------------------------------------------------------------------
  1834. -r30363 | krj | 2009-10-06 06:51:56 -0700 (Tue, 06 Oct 2009) | 1 line
  1835. +r33133 | gerald | 2010-06-07 09:07:15 -0700 (Mon, 07 Jun 2010) | 20 lines
  1836. Changed paths:
  1837. - M /trunk/gtk/main.c
  1838. + M /trunk-1.2/epan/dissectors/packet-nfs.c
  1839.  
  1840. -Guard icon_list_create()
  1841. -------------------------------------------------------------------------
  1842. -r32357 | gerald | 2010-04-01 14:55:01 -0700 (Thu, 01 Apr 2010) | 4 lines
  1843. -Changed paths:
  1844. - M /trunk/capture.c
  1845. - M /trunk/capture_ui_utils.c
  1846. - M /trunk/cfile.c
  1847. - M /trunk/cfile.h
  1848. - M /trunk/file.c
  1849. - M /trunk/file.h
  1850. - M /trunk/gtk/main.c
  1851. +Copy over r33079:
  1852.  
  1853. -Keep a copy of the interface description and capture filter around so that
  1854. -we can use it in the main window title during and after capture. Add a
  1855. -"-X" option for providing a description for stdin.
  1856. ------------------------------------------------------------------------
  1857. -r32362 | rbalint | 2010-04-02 13:40:20 -0700 (Fri, 02 Apr 2010) | 3 lines
  1858. +r33079 | wmeier | 2010-06-03 17:45:37 -0700 (Thu, 03 Jun 2010) | 12 lines
  1859. Changed paths:
  1860. - M /trunk/gtk/packet_win.c
  1861. + M /trunk/epan/dissectors/packet-nfs.c
  1862.  
  1863. -Fix crash when double clicking in packet list area before capturing any packet.
  1864. -The crash does not happen when using the new packet list.
  1865. -------------------------------------------------------------------------
  1866. -r32396 | guy | 2010-04-05 19:49:18 -0700 (Mon, 05 Apr 2010) | 4 lines
  1867. -Changed paths:
  1868. - M /trunk/plugins/docsis/packet-bpkmrsp.c
  1869. +From Cal Turney: The NFS FH hash (nfs.fh.hash) incorrectly matches multiple filehandles.
  1870. +"The method used in packet-nfs.c to calculate a 32-bit hash representing the
  1871. + 32-byte filehandle is faulty in that the hash often matches multiple
  1872. + filehandles."
  1873.  
  1874. -The third argument to val_to_str() is a format string that gets passed
  1875. -the value that couldn't be mapped to a string - it's an integer and
  1876. -needs to be printed with an integer format. Fixes bug 4644.
  1877. -------------------------------------------------------------------------
  1878. -r32400 | morriss | 2010-04-06 08:45:11 -0700 (Tue, 06 Apr 2010) | 1 line
  1879. -Changed paths:
  1880. - M /trunk/plugins/docsis/packet-bpkmreq.c
  1881. - M /trunk/plugins/docsis/packet-dsaack.c
  1882. - M /trunk/plugins/docsis/packet-dsarsp.c
  1883. - M /trunk/plugins/docsis/packet-dscack.c
  1884. - M /trunk/plugins/docsis/packet-dscrsp.c
  1885. - M /trunk/plugins/docsis/packet-dsdrsp.c
  1886. - M /trunk/plugins/docsis/packet-map.c
  1887. - M /trunk/plugins/docsis/packet-regack.c
  1888. +"This patch uses CRC-32 to calculate the hash.
  1889. + We (EMC GNS) have tested this patch for the past two years and we have not
  1890. + found a single case where the hash matched more than one filehandle."
  1891.  
  1892. -Don't use %s as the format string in val_to_str().
  1893. +See Bug #4839: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4839
  1894. ------------------------------------------------------------------------
  1895.  
  1896. -Update the release notes.
  1897.  
  1898. ------------------------------------------------------------------------
  1899. -r32661 | gerald | 2010-05-04 12:13:29 -0700 (Tue, 04 May 2010) | 125 lines
  1900. +r33134 | gerald | 2010-06-07 09:07:46 -0700 (Mon, 07 Jun 2010) | 23 lines
  1901. Changed paths:
  1902. - M /trunk-1.2/AUTHORS
  1903. - M /trunk-1.2/configure.in
  1904. M /trunk-1.2/docbook/release-notes.xml
  1905. - M /trunk-1.2/epan/dissectors/packet-evrc.c
  1906. - M /trunk-1.2/epan/dissectors/packet-http.c
  1907. - M /trunk-1.2/epan/dissectors/packet-ntp.c
  1908. - M /trunk-1.2/epan/dissectors/packet-ptp.c
  1909. - M /trunk-1.2/epan/dissectors/packet-ssl.c
  1910. - M /trunk-1.2/epan/dissectors/packet-tcp.c
  1911. - M /trunk-1.2/epan/ex-opt.h
  1912. - M /trunk-1.2/epan/wslua/wslua_proto.c
  1913. - M /trunk-1.2/gtk/main.c
  1914. - M /trunk-1.2/gtk/main_packet_list.c
  1915. - M /trunk-1.2/gtk/main_packet_list.h
  1916. - M /trunk-1.2/gtk/prefs_dlg.c
  1917. - M /trunk-1.2/plugins/mate/mate.h
  1918. - M /trunk-1.2/plugins/mate/mate_grammar.lemon
  1919. - M /trunk-1.2/plugins/mate/mate_setup.c
  1920. - M /trunk-1.2/version_info.c
  1921. + M /trunk-1.2/epan/sigcomp-udvm.c
  1922.  
  1923. Copy over revisions from the trunk:
  1924.  
  1925. ------------------------------------------------------------------------
  1926. -r30191 | stig | 2009-09-29 03:01:06 -0700 (Tue, 29 Sep 2009) | 2 lines
  1927. +r33087 | gerald | 2010-06-04 11:28:02 -0700 (Fri, 04 Jun 2010) | 3 lines
  1928. Changed paths:
  1929. - M /trunk/epan/ex-opt.h
  1930. + M /trunk/epan/sigcomp-udvm.c
  1931.  
  1932. -Corrected prototype for ex_opt_get_nth().
  1933. +According to RFC 3220 section 7 the max UDVM message size is 65536,
  1934. +not 65535. Hopefully fixes bug 4837.
  1935. ------------------------------------------------------------------------
  1936. -r32433 | morriss | 2010-04-08 18:42:12 -0700 (Thu, 08 Apr 2010) | 5 lines
  1937. -Changed paths:
  1938. - M /trunk/configure.in
  1939. - M /trunk/epan/dissectors/packet-http.c
  1940.  
  1941. -Use a 64-bit number to store the content length. This fixes:
  1942. -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1958
  1943. -
  1944. -Of course this doesn't mean we can reassemble that much data.
  1945. -------------------------------------------------------------------------
  1946. -r32434 | guy | 2010-04-08 19:00:07 -0700 (Thu, 08 Apr 2010) | 4 lines
  1947. -Changed paths:
  1948. - M /trunk/epan/dissectors/packet-http.c
  1949. +Copy over with manual intervention:
  1950.  
  1951. -Squelch compiler warnings. (We know that header.content_length is less
  1952. -than a value that fits into an int, so we know its value will fit into
  1953. -an int.)
  1954. ------------------------------------------------------------------------
  1955. -r32456 | sake | 2010-04-13 12:37:44 -0700 (Tue, 13 Apr 2010) | 3 lines
  1956. +r33090 | guy | 2010-06-04 12:29:26 -0700 (Fri, 04 Jun 2010) | 2 lines
  1957. Changed paths:
  1958. - M /trunk/epan/dissectors/packet-ssl.c
  1959. + M /trunk/epan/sigcomp-udvm.c
  1960.  
  1961. -Fix for bug 4535: The SSL dissector can not correctly resemple SSL records when the record header is spit between packets
  1962. +Fix comments.
  1963. ------------------------------------------------------------------------
  1964. -r32465 | morriss | 2010-04-14 11:39:00 -0700 (Wed, 14 Apr 2010) | 6 lines
  1965. -Changed paths:
  1966. - M /trunk/plugins/mate/mate.h
  1967. - M /trunk/plugins/mate/mate_grammar.lemon
  1968. - M /trunk/plugins/mate/mate_setup.c
  1969.  
  1970. -Be sure we initialize the p_id in hf's. This fixes
  1971. -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3010 .
  1972. +Update the release notes.
  1973.  
  1974. -Also finish the implementation of ShowTimes for GOGs so that the variable gets
  1975. -initialized (preventing another uninitialized variable warning from Valgrind).
  1976. ------------------------------------------------------------------------
  1977. -r32481 | jake | 2010-04-15 14:12:34 -0700 (Thu, 15 Apr 2010) | 7 lines
  1978. +r33135 | gerald | 2010-06-07 09:20:00 -0700 (Mon, 07 Jun 2010) | 20 lines
  1979. Changed paths:
  1980. - M /trunk/epan/dissectors/packet-ntp.c
  1981. + M /trunk-1.2/docbook/release-notes.xml
  1982. + M /trunk-1.2/epan/dissectors/packet-ipsec.c
  1983.  
  1984. -From Dave Higton:
  1985. -When decoding NTP where the Reference Clock ID is "MSF/0", Wireshark textifies
  1986. -this as "Rugby (UK) Radio 60 kHz". The MSF transmitter was moved several years
  1987. -ago from Rugby to Anthorn.
  1988. +Apply patch from bug 4838:
  1989.  
  1990. -Also updates from RFC 4330.
  1991. -------------------------------------------------------------------------
  1992. -r32500 | morriss | 2010-04-16 15:48:33 -0700 (Fri, 16 Apr 2010) | 9 lines
  1993. -Changed paths:
  1994. - M /trunk/gtk/main_packet_list.c
  1995. - M /trunk/gtk/main_packet_list.h
  1996. - M /trunk/gtk/prefs_dlg.c
  1997. +Decoding IPsec (ESP) using AES-CTR fails.
  1998.  
  1999. -Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3387 (crash
  2000. -when changing the font and deleting a column at the same time while using
  2001. -the old packet list):
  2002. +When specifying SA keys for AES-CTR, wireshark expects a key length of 160, 224
  2003. +or 288 bits, (i.e. 128, 192 or 256 bits, followed by the 32 bit nonce value),
  2004. +but gcry_cipher_setkey() in packet_ipsec.c fails, as it expects 128, 192 or 256
  2005. +bits.
  2006. +
  2007. +Omitting the nonce won't work -- even if wireshark liked those key lengths,
  2008. +gcrypt wouldn't be able to decrypt without it.
  2009. +
  2010. +Looking at gcrypt.h, I'm guessing what's missing may be a call to
  2011. +gcry_cipher_setctr()? Once gcrypt has the nonce, the key len could be
  2012. +decremented by 4, (32 bits), for the call to gcry_cipher_setkey() and things
  2013. +should work from there.
  2014.  
  2015. -Don't calculate the default column widths until after both the font and column
  2016. -preferences have been applied.
  2017.  
  2018. -This isn't a problem in the new packet list.
  2019. -------------------------------------------------------------------------
  2020. -r32548 | morriss | 2010-04-23 19:04:14 -0700 (Fri, 23 Apr 2010) | 1 line
  2021. -Changed paths:
  2022. - M /trunk/version_info.c
  2023. +Update the release notes.
  2024.  
  2025. -Tell, in the version info, if we were compiled 32- or 64-bit.
  2026. ------------------------------------------------------------------------
  2027. -r32582 | etxrab | 2010-04-27 21:54:25 -0700 (Tue, 27 Apr 2010) | 3 lines
  2028. +r33142 | gerald | 2010-06-07 11:39:55 -0700 (Mon, 07 Jun 2010) | 15 lines
  2029. Changed paths:
  2030. - M /trunk/epan/dissectors/packet-evrc.c
  2031. + M /trunk-1.2/docbook/release-notes.xml
  2032. + M /trunk-1.2/epan/dissectors/packet-smb.c
  2033.  
  2034. -From Michael Lum:
  2035. -EVRC packet bundling not handled correctly.
  2036. -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4718
  2037. +Copy over r32650 by hand:
  2038. ------------------------------------------------------------------------
  2039. -r32585 | jake | 2010-04-28 01:19:39 -0700 (Wed, 28 Apr 2010) | 2 lines
  2040. +r32650 | morriss | 2010-05-03 12:33:23 -0700 (Mon, 03 May 2010) | 6 lines
  2041. Changed paths:
  2042. - M /trunk/epan/dissectors/packet-tcp.c
  2043. + M /trunk/epan/dissectors/packet-smb.c
  2044. +
  2045. +Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4734 :
  2046.  
  2047. -From jmmikkel:
  2048. -Set the sequence number for the next PDU if the current frame contains both the finish of the previous and the complete next one.
  2049. +Don't crash on a malformed SMB packet. According to svn blame, this code
  2050. +has been here since rev 21713 though maybe something else changed to make the
  2051. +crash apparent.
  2052. ------------------------------------------------------------------------
  2053.  
  2054. +Update the release notes.
  2055.  
  2056. -Copy over with manual intervention:
  2057. ------------------------------------------------------------------------
  2058. -r32499 | wmeier | 2010-04-16 12:27:56 -0700 (Fri, 16 Apr 2010) | 3 lines
  2059. +r33150 | gerald | 2010-06-07 12:21:26 -0700 (Mon, 07 Jun 2010) | 2 lines
  2060. Changed paths:
  2061. - M /trunk/AUTHORS
  2062. - M /trunk/epan/dissectors/packet-ptp.c
  2063. + M /trunk-1.2/docbook/release-notes.xml
  2064.  
  2065. -From Marcus Renz: Fix for "PTP dissector displays big correction field values wrong"
  2066. -See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4635
  2067. -------------------------------------------------------------------------
  2068. -r32517 | jake | 2010-04-19 11:48:12 -0700 (Mon, 19 Apr 2010) | 4 lines
  2069. -Changed paths:
  2070. - M /trunk/epan/wslua/wslua_proto.c
  2071. +Update the release notes.
  2072.  
  2073. -Fix for bug 4695:
  2074. -Modify ProtoField_tostring() to ProtoField__tostring()
  2075. -and clean up description.
  2076. ------------------------------------------------------------------------
  2077. -r32603 | morriss | 2010-04-29 12:30:54 -0700 (Thu, 29 Apr 2010) | 6 lines
  2078. +r33153 | gerald | 2010-06-07 13:39:11 -0700 (Mon, 07 Jun 2010) | 13 lines
  2079. Changed paths:
  2080. - M /trunk/gtk/main.c
  2081. + M /trunk-1.2/docbook/release-notes.xml
  2082. + M /trunk-1.2/epan/tcap-persistentdata.h
  2083.  
  2084. -Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4308 :
  2085. +Copy over by hand:
  2086.  
  2087. -Make a function that checks if the user is running as root or if npf.sys isn't
  2088. -loaded (on Windows) and call it *after* showing the main window so that the
  2089. -popup (if any) shows up above the main window.
  2090. ------------------------------------------------------------------------
  2091. +r33091 | morriss | 2010-06-04 12:37:31 -0700 (Fri, 04 Jun 2010) | 1 line
  2092. +Changed paths:
  2093. + M /trunk/epan/tcap-persistentdata.h
  2094.  
  2095. -Update the release notes.
  2096. -
  2097. +Increase LENGTH_OID a bit to give us more room for ACNs (probably more than will ever be used).
  2098. ------------------------------------------------------------------------
  2099. -r32663 | gerald | 2010-05-04 14:45:21 -0700 (Tue, 04 May 2010) | 2 lines
  2100. -Changed paths:
  2101. - M /trunk-1.2/docbook/release-notes.xml
  2102.  
  2103. -Update the DOCSIS fix revisions.
  2104. +
  2105. +Update the release notes.
  2106.  
  2107. ------------------------------------------------------------------------
  2108. diff -urN wireshark-1.2.8/config.nmake wireshark-1.2.9/config.nmake
  2109. --- wireshark-1.2.8/config.nmake 2010-05-05 10:13:12.000000000 -0700
  2110. +++ wireshark-1.2.9/config.nmake 2010-06-08 16:27:45.000000000 -0700
  2111. @@ -1,4 +1,4 @@
  2112. -# $Id: config.nmake 32344 2010-03-31 22:51:08Z gerald $
  2113. +# $Id: config.nmake 32682 2010-05-05 21:05:06Z gerald $
  2114.  
  2115. # Some more informations about the settings in this file, can be found
  2116. # in the file README.win32 and the Developer's Guide (available online).
  2117. @@ -16,8 +16,8 @@
  2118. # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
  2119. VERSION_MAJOR=1
  2120. VERSION_MINOR=2
  2121. -VERSION_MICRO=8
  2122. -VERSION_BUILD=32676
  2123. +VERSION_MICRO=9
  2124. +VERSION_BUILD=33171
  2125. # It's recommended to change VERSION_EXTRA for your own custom builds
  2126. # e.g. "-SVN-12345"
  2127. VERSION_EXTRA=""
  2128. diff -urN wireshark-1.2.8/configure wireshark-1.2.9/configure
  2129. --- wireshark-1.2.8/configure 2010-05-05 10:14:32.000000000 -0700
  2130. +++ wireshark-1.2.9/configure 2010-06-08 16:30:31.000000000 -0700
  2131. @@ -1,6 +1,6 @@
  2132. #! /bin/sh
  2133. # Guess values for system-dependent variables and create Makefiles.
  2134. -# Generated by GNU Autoconf 2.65 for wireshark 1.2.8.
  2135. +# Generated by GNU Autoconf 2.65 for wireshark 1.2.9.
  2136. #
  2137. #
  2138. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  2139. @@ -698,8 +698,8 @@
  2140. # Identity of this package.
  2141. PACKAGE_NAME='wireshark'
  2142. PACKAGE_TARNAME='wireshark'
  2143. -PACKAGE_VERSION='1.2.8'
  2144. -PACKAGE_STRING='wireshark 1.2.8'
  2145. +PACKAGE_VERSION='1.2.9'
  2146. +PACKAGE_STRING='wireshark 1.2.9'
  2147. PACKAGE_BUGREPORT=''
  2148. PACKAGE_URL=''
  2149.  
  2150. @@ -1589,7 +1589,7 @@
  2151. # Omit some internal or obsolete options to make the list less imposing.
  2152. # This message is too long to be a string in the A/UX 3.1 sh.
  2153. cat <<_ACEOF
  2154. -\`configure' configures wireshark 1.2.8 to adapt to many kinds of systems.
  2155. +\`configure' configures wireshark 1.2.9 to adapt to many kinds of systems.
  2156.  
  2157. Usage: $0 [OPTION]... [VAR=VALUE]...
  2158.  
  2159. @@ -1659,7 +1659,7 @@
  2160.  
  2161. if test -n "$ac_init_help"; then
  2162. case $ac_init_help in
  2163. - short | recursive ) echo "Configuration of wireshark 1.2.8:";;
  2164. + short | recursive ) echo "Configuration of wireshark 1.2.9:";;
  2165. esac
  2166. cat <<\_ACEOF
  2167.  
  2168. @@ -1832,7 +1832,7 @@
  2169. test -n "$ac_init_help" && exit $ac_status
  2170. if $ac_init_version; then
  2171. cat <<\_ACEOF
  2172. -wireshark configure 1.2.8
  2173. +wireshark configure 1.2.9
  2174. generated by GNU Autoconf 2.65
  2175.  
  2176. Copyright (C) 2009 Free Software Foundation, Inc.
  2177. @@ -2251,7 +2251,7 @@
  2178. This file contains any messages produced by compilers while
  2179. running configure, to aid debugging if configure makes a mistake.
  2180.  
  2181. -It was created by wireshark $as_me 1.2.8, which was
  2182. +It was created by wireshark $as_me 1.2.9, which was
  2183. generated by GNU Autoconf 2.65. Invocation command line was
  2184.  
  2185. $ $0 $@
  2186. @@ -2910,7 +2910,7 @@
  2187.  
  2188. # Define the identity of the package.
  2189. PACKAGE='wireshark'
  2190. - VERSION='1.2.8'
  2191. + VERSION='1.2.9'
  2192.  
  2193.  
  2194. cat >>confdefs.h <<_ACEOF
  2195. @@ -19768,7 +19768,7 @@
  2196. # report actual input values of CONFIG_FILES etc. instead of their
  2197. # values after options handling.
  2198. ac_log="
  2199. -This file was extended by wireshark $as_me 1.2.8, which was
  2200. +This file was extended by wireshark $as_me 1.2.9, which was
  2201. generated by GNU Autoconf 2.65. Invocation command line was
  2202.  
  2203. CONFIG_FILES = $CONFIG_FILES
  2204. @@ -19834,7 +19834,7 @@
  2205. cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  2206. ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  2207. ac_cs_version="\\
  2208. -wireshark config.status 1.2.8
  2209. +wireshark config.status 1.2.9
  2210. configured by $0, generated by GNU Autoconf 2.65,
  2211. with options \\"\$ac_cs_config\\"
  2212.  
  2213. diff -urN wireshark-1.2.8/configure.in wireshark-1.2.9/configure.in
  2214. --- wireshark-1.2.8/configure.in 2010-05-05 10:13:10.000000000 -0700
  2215. +++ wireshark-1.2.9/configure.in 2010-06-08 16:27:42.000000000 -0700
  2216. @@ -1,4 +1,4 @@
  2217. -# $Id: configure.in 32661 2010-05-04 19:13:29Z gerald $
  2218. +# $Id: configure.in 32682 2010-05-05 21:05:06Z gerald $
  2219. #
  2220. AC_PREREQ(2.60)
  2221.  
  2222. @@ -12,7 +12,7 @@
  2223. dnl AC_CANONICAL_BUILD
  2224. dnl AC_CANONICAL_TARGET
  2225.  
  2226. -AC_INIT(wireshark, 1.2.8)
  2227. +AC_INIT(wireshark, 1.2.9)
  2228. AM_INIT_AUTOMAKE([1.9 tar-ustar])
  2229.  
  2230. AM_DISABLE_STATIC
  2231. diff -urN wireshark-1.2.8/debian/changelog wireshark-1.2.9/debian/changelog
  2232. --- wireshark-1.2.8/debian/changelog 2010-05-05 10:11:46.000000000 -0700
  2233. +++ wireshark-1.2.9/debian/changelog 2010-06-08 16:26:00.000000000 -0700
  2234. @@ -1,4 +1,4 @@
  2235. -wireshark (1.2.8) unstable; urgency=low
  2236. +wireshark (1.2.9) unstable; urgency=low
  2237.  
  2238. * Self-made package
  2239.  
  2240. diff -urN wireshark-1.2.8/diameter/dictionary.xml wireshark-1.2.9/diameter/dictionary.xml
  2241. --- wireshark-1.2.8/diameter/dictionary.xml 2010-05-05 10:11:34.000000000 -0700
  2242. +++ wireshark-1.2.9/diameter/dictionary.xml 2010-06-08 16:25:45.000000000 -0700
  2243. @@ -1,5 +1,5 @@
  2244. <?xml version="1.0" encoding="UTF-8"?>
  2245. -<!-- $Id: dictionary.xml 32642 2010-05-03 07:49:50Z etxrab $ -->
  2246. +<!-- $Id: dictionary.xml 33127 2010-06-07 12:51:23Z etxrab $ -->
  2247.  
  2248. <?type-proto key="MIPRegistrationRequest" value="mip" ?>
  2249. <?avp-proto key="Example-AVP" value="data" ?>
  2250. @@ -22,7 +22,7 @@
  2251. ]>
  2252. <dictionary>
  2253. <base uri="http://www.ietf.org/rfc/rfc3588.txt">
  2254. - <!--
  2255. + <!--
  2256. $Log: dictionary.xml,v $
  2257. Revision 1.1 2001/11/01 21:52:44 guy
  2258. From David Frascone: duUpdate to Diameter dissector to load the
  2259. @@ -50,11 +50,11 @@
  2260. Revision 1.2 2001/07/31 16:29:34 chaos
  2261. Checking in some changes to verify log and ident strings
  2262.  
  2263. --->
  2264. + -->
  2265. <!-- *********************** Commands ***************************** -->
  2266. <!-- Diameter Base Protocol Command Codes -->
  2267. - <!-- 0-255 RADIUS compatability codes [http://www.iana.org/assignments/radius-types] -->
  2268. - <!--256 Unassigned -->
  2269. + <!-- 0-255 RADIUS compatability codes [http://www.iana.org/assignments/radius-types] -->
  2270. + <!--256 Unassigned -->
  2271. <command name="Capabilities-Exchange" code="257" vendor-id="None"/>
  2272. <command name="Re-Auth" code="258" vendor-id="None"/>
  2273. <!-- 259 Unassigned
  2274. @@ -66,14 +66,14 @@
  2275. 266-267 Unassigned
  2276. 268 DER / DEA [RFC4072] eap.xml
  2277. 269-270 Unassigned
  2278. --->
  2279. + -->
  2280. <command name="Accounting" code="271" vendor-id="None"/>
  2281. <!-- 272 CCR / CCA [RFC4006] chargecontrol.xml
  2282. 273 Unassigned
  2283. --->
  2284. + -->
  2285. <command name="Abort-Session" code="274" vendor-id="None"/>
  2286. <command name="Session-Termination" code="275" vendor-id="None"/>
  2287. - <!--276-279 Unassigned -->
  2288. + <!--276-279 Unassigned -->
  2289. <command name="Device-Watchdog" code="280" vendor-id="None"/>
  2290. <command name="Disconnect-Peer" code="282" vendor-id="None"/>
  2291. <!--283 UAR / UAA [RFC4740] sip.xml
  2292. @@ -96,30 +96,29 @@
  2293. 307 Profile-Update-Request/-Answer PUR/PUA
  2294. 308 Subscribe-Notifications-Request/-Answer SNR/SNA
  2295. 309 Push-Notification-Request/-Answer PNR/PNA
  2296. - -->
  2297. + -->
  2298.  
  2299. - <command name="Boostrapping-Info" code="310" vendor-id="None"/> <!-- BIR/BIA 29.109 [7] -->
  2300. - <command name="Message-Process" code="311" vendor-id="None"/> <!-- MPR/MPA 29.140 [16] -->
  2301. - <command name="GBAPush-Info" code="312" vendor-id="None"/> <!-- GPR/GPI 29.109 [7] -->
  2302. - <!-- 313 (Not used yet) -->
  2303. - <command name="Policy-Data" code="314" vendor-id="None"/> <!-- PDR / PDA [RFC5224] -->
  2304. - <command name="Policy-Install" code="315" vendor-id="None"/> <!-- (PIA) [ITU-T Rec. Q.3303.3][RFC5431] -->
  2305. - -->
  2306. - <!-- http://www.3gpp.org/ftp/Specs/html-info/29272.htm -->
  2307. - <command name="3GPP-Update-Location" code="316" vendor-id="None"/>
  2308. - <command name="3GPP-Cancel-Location" code="317" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
  2309. - <command name="3GPP-Authentication-Information" code="318" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
  2310. - <command name="3GPP-Insert-Subscriber-Data" code="319" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
  2311. - <command name="3GPP-Delete-Subscriber-Data" code="320" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
  2312. - <command name="3GPP-Purge-UE" code="321" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
  2313. - <command name="3GPP-Reset" code="322" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
  2314. - <command name="3GPP-Notify" code="323" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
  2315. -
  2316. - <command name="3GPP-ME-Identity-Check" code="324" vendor-id="None"/> <!--(ECR/ECA) [3GPP TS 29.272][RFC5516] -->
  2317. - <command name="MIP6" code="325" vendor-id="None"/> <!--(MIR/MIA) [RFC5778] -->
  2318. - <command name="QoS-Authorization" code="326" vendor-id="None"/> <!--(QAR/QAA) [RFC-ietf-dime-diameter-qos-15] -->
  2319. - <command name="QoS-Install" code="327" vendor-id="None"/> <!--(QIR/QIA) [RFC-ietf-dime-diameter-qos-15] -->
  2320. - <!--
  2321. + <command name="Boostrapping-Info" code="310" vendor-id="None"/> <!-- BIR/BIA 29.109 [7] -->
  2322. + <command name="Message-Process" code="311" vendor-id="None"/> <!-- MPR/MPA 29.140 [16] -->
  2323. + <command name="GBAPush-Info" code="312" vendor-id="None"/> <!-- GPR/GPI 29.109 [7] -->
  2324. + <!-- 313 (Not used yet) -->
  2325. + <command name="Policy-Data" code="314" vendor-id="None"/> <!-- PDR / PDA [RFC5224] -->
  2326. + <command name="Policy-Install" code="315" vendor-id="None"/> <!-- (PIA) [ITU-T Rec. Q.3303.3][RFC5431] -->
  2327. +
  2328. + <!-- http://www.3gpp.org/ftp/Specs/html-info/29272.htm -->
  2329. + <command name="3GPP-Update-Location" code="316" vendor-id="None"/>
  2330. + <command name="3GPP-Cancel-Location" code="317" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
  2331. + <command name="3GPP-Authentication-Information" code="318" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
  2332. + <command name="3GPP-Insert-Subscriber-Data" code="319" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
  2333. + <command name="3GPP-Delete-Subscriber-Data" code="320" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
  2334. + <command name="3GPP-Purge-UE" code="321" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
  2335. + <command name="3GPP-Reset" code="322" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
  2336. + <command name="3GPP-Notify" code="323" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
  2337. + <command name="3GPP-ME-Identity-Check" code="324" vendor-id="None"/> <!--(ECR/ECA) [3GPP TS 29.272][RFC5516] -->
  2338. + <command name="MIP6" code="325" vendor-id="None"/> <!--(MIR/MIA) [RFC5778] -->
  2339. + <command name="QoS-Authorization" code="326" vendor-id="None"/> <!--(QAR/QAA) [RFC-ietf-dime-diameter-qos-15] -->
  2340. + <command name="QoS-Install" code="327" vendor-id="None"/> <!--(QIR/QIA) [RFC-ietf-dime-diameter-qos-15] -->
  2341. + <!--
  2342. 328-8388607 Unassigned
  2343. 8388608 WIMAX-HRPD-SFF Request/Answer [http://www.3gpp2.org/Public_html/specs/tsgx.cfm][3GPP2 X.S0058-0 v1.0][Avi_Lior]
  2344. 8388609 WiMAX-Diameter-EAP-Request/Answer (WDER/WDEA) WDE [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
  2345. @@ -139,8 +138,8 @@
  2346. 8388623-16777213 Unassigned
  2347. 16777214 Experimental code [RFC3588]
  2348. 16777215 Experimental code [RFC3588]
  2349. - -->
  2350. - <!-- ********************** End Commands ************************** -->
  2351. + -->
  2352. + <!-- ********************** End Commands ************************** -->
  2353. <!-- ************************* Vendors **************************** -->
  2354. <vendor vendor-id="None" code="0" name="None"/>
  2355. <vendor vendor-id="HP" code="11" name="Hewlett Packard"/>
  2356. @@ -152,9 +151,9 @@
  2357. <vendor vendor-id="TGPPCX" code="16777216" name="3GPP CX/DX"/>
  2358. <vendor vendor-id="Ericsson" code="193" name="Ericsson"/>
  2359. <vendor vendor-id="ETSI" code="13019" name="ETSI"/>
  2360. - <vendor vendor-id="Vodafone" code="12645" name="Vodafone"/>
  2361. - <vendor vendor-id="Deutsche_Telekom_AG" code="2937" name="Deutsche Telekom AG"/>
  2362. - <!-- *********************** End Vendors ************************** -->
  2363. + <vendor vendor-id="Vodafone" code="12645" name="Vodafone"/>
  2364. + <vendor vendor-id="Deutsche_Telekom_AG" code="2937" name="Deutsche Telekom AG"/>
  2365. + <!-- *********************** End Vendors ************************** -->
  2366. <!-- ************************ typedefn's ************************** -->
  2367. <typedefn type-name="OctetString"/>
  2368. <!--
  2369. @@ -166,7 +165,7 @@
  2370. be 9, but can be set to any value up to 65504 bytes. AVP Values
  2371. of this type that do not align on a 32-bit boundary MUST have
  2372. the necessary padding.
  2373. - -->
  2374. + -->
  2375. <typedefn type-name="UTF8String" type-parent="OctetString"/>
  2376. <!--
  2377. The UTF8String format is derived from the OctetString AVP Base
  2378. @@ -205,7 +204,7 @@
  2379.  
  2380. The UTF8String MUST not contain any octets with a value of
  2381. zero.
  2382. - -->
  2383. + -->
  2384. <typedefn type-name="IPAddress" type-parent="OctetString"/>
  2385. <!--
  2386. The IPAddress format is derived from the OctetString AVP Base
  2387. @@ -216,7 +215,7 @@
  2388. be 12 (16 if 'V' bit is enabled), otherwise the AVP Length
  2389. field MUST be set to 24 (28 if the 'V' bit is enabled) for IPv6
  2390. addresses.
  2391. - -->
  2392. + -->
  2393. <typedefn type-name="DiameterIdentity" type-parent="OctetString"/>
  2394. <!--
  2395. The DiameterIdentity format is derived from the OctetString AVP
  2396. @@ -430,7 +429,7 @@
  2397. The rule syntax is a modified subset of ipfw(8) from FreeBSD,
  2398. and the ipfw.c code may provide a useful base for
  2399. implementations.
  2400. - -->
  2401. + -->
  2402. <typedefn type-name="QOSFilterRule" type-parent="OctetString"/>
  2403. <!--
  2404. The QosFilterRule format is derived from the OctetString AVP
  2405. @@ -534,20 +533,20 @@
  2406. and the ipfw.c code may provide a useful base for
  2407. implementations.
  2408.  
  2409. - -->
  2410. + -->
  2411. <typedefn type-name="MIPRegistrationRequest" type-parent="OctetString"/>
  2412. <typedefn type-name="Integer32"/>
  2413. <!--
  2414. 32 bit signed value, in network byte order. The AVP Length
  2415. field MUST be set to 12 (16 if the 'V' bit is enabled).
  2416. - -->
  2417. + -->
  2418. <typedefn type-name="VendorId" type-parent="Unsigned32"/>
  2419. <typedefn type-name="AppId" type-parent="Integer32"/>
  2420. <typedefn type-name="Integer64"/>
  2421. <!--
  2422. 64 bit signed value, in network byte order. The AVP Length
  2423. field MUST be set to 16 (20 if the 'V' bit is enabled).
  2424. - -->
  2425. + -->
  2426. <typedefn type-name="Unsigned32"/>
  2427. <!--
  2428. 32 bit unsigned value, in network byte order. The AVP Length
  2429. @@ -555,7 +554,7 @@
  2430. Unsigned32 values used to transmit time data contains the four
  2431. most significant octets returned from NTP [18], in network byte
  2432. order.
  2433. - -->
  2434. + -->
  2435. <typedefn type-name="Time"/>
  2436. <!--
  2437. The Time format is derived from the Unsigned32 AVP Base Format.
  2438. @@ -569,12 +568,12 @@
  2439. On 6h 28m 16s UTC, 7 February 2036 the time value will
  2440. overflow. NTP [18] describes a procedure to extend the time to
  2441. 2104.
  2442. - -->
  2443. + -->
  2444. <typedefn type-name="Unsigned64"/>
  2445. <!--
  2446. 64 bit unsigned value, in network byte order. The AVP Length
  2447. field MUST be set to 16 (20 if the 'V' bit is enabled).
  2448. - -->
  2449. + -->
  2450. <typedefn type-name="Enumerated" type-parent="Unsigned32"/>
  2451. <typedefn type-name="DiameterURI" type-parent="UTF8String"/>
  2452.  
  2453. @@ -585,20 +584,21 @@
  2454. <avp name="User-Name" code="1" mandatory="must">
  2455. <type type-name="UTF8String"/>
  2456. </avp>
  2457. - <avp name="User-Password" code="2" mandatory="may">
  2458. + <avp name="User-Password" code="2" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2459. <type type-name="OctetString"/>
  2460. </avp>
  2461. - <avp name="CHAP-Password" code="3" mandatory="may">
  2462. + <avp name="CHAP-Password" code="3" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2463. <type type-name="OctetString"/>
  2464. </avp>
  2465. - <avp name="NAS-IP-Address" code="4" mandatory="may">
  2466. + <avp name="NAS-IP-Address" code="4" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2467. <type type-name="OctetString"/>
  2468. </avp>
  2469. - <avp name="NAS-Port" code="5" mandatory="may">
  2470. - <type type-name="Integer32"/>
  2471. - </avp>
  2472. - <avp name="Service-Type" code="6">
  2473. + <avp name="NAS-Port" code="5" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2474. <type type-name="Unsigned32"/>
  2475. + </avp>
  2476. + <avp name="Service-Type" code="6" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2477. + <type type-name="Enumerated"/>
  2478. + <enum name="Unknown" code="0"/>
  2479. <enum name="Login" code="1"/>
  2480. <enum name="Framed" code="2"/>
  2481. <enum name="Callback-Login" code="3"/>
  2482. @@ -616,52 +616,56 @@
  2483. <enum name="IAPP-Register" code="15"/>
  2484. <enum name="IAPP-AP-Check" code="16"/>
  2485. <enum name="Authorize Only" code="17"/>
  2486. + <enum name="Framed-Management" code="18"/>
  2487. </avp>
  2488. - <avp name="Framed-Protocol" code="7">
  2489. - <type type-name="Unsigned32"/>
  2490. - <enum name="ARA" code="3"/>
  2491. + <avp name="Framed-Protocol" code="7" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2492. + <type type-name="Enumerated"/>
  2493. + <enum name="PPP" code="1"/>
  2494. + <enum name="SLIP" code="2"/>
  2495. + <enum name="ARAP" code="3"/>
  2496. + <enum name="Gandalf" code="4"/>
  2497. + <enum name="Xylogics" code="5"/>
  2498. + <enum name="X.75" code="6"/>
  2499. + <enum name="GPRS PDP Context" code="7"/>
  2500. <enum name="Ascend-ARA" code="255"/>
  2501. - <enum name="COMB" code="260"/>
  2502. + <enum name="MPP" code="256"/>
  2503. <enum name="EURAW" code="257"/>
  2504. <enum name="EUUI" code="258"/>
  2505. - <enum name="FR" code="261"/>
  2506. - <enum name="Gandalf" code="4"/>
  2507. - <enum name="MPP" code="256"/>
  2508. - <enum name="PPP" code="1"/>
  2509. - <enum name="SLIP" code="2"/>
  2510. <enum name="X25" code="259"/>
  2511. - <enum name="Xylogics" code="5"/>
  2512. + <enum name="COMB" code="260"/>
  2513. + <enum name="FR" code="261"/>
  2514. </avp>
  2515. <avp name="Framed-IP-Address" code="8" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  2516. <type type-name="IPAddress"/>
  2517. </avp>
  2518. - <avp name="Framed-IP-Netmask" code="9" mandatory="may">
  2519. + <avp name="Framed-IP-Netmask" code="9" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  2520. <type type-name="IPAddress"/>
  2521. </avp>
  2522. - <avp name="Framed-Routing" code="10">
  2523. - <type type-name="Unsigned32"/>
  2524. - <enum name="Broadcast" code="1"/>
  2525. - <enum name="Broadcast-Listen" code="3"/>
  2526. - <enum name="Listen" code="2"/>
  2527. + <avp name="Framed-Routing" code="10" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  2528. + <type type-name="Enumerated"/>
  2529. <enum name="None" code="0"/>
  2530. + <enum name="Send routing packets" code="1"/>
  2531. + <enum name="Listen for routing packets" code="2"/>
  2532. + <enum name="Send and Listen " code="3"/>
  2533. </avp>
  2534. - <avp name="Filter-Id" code="11" mandatory="may">
  2535. - <type type-name="OctetString"/>
  2536. - </avp>
  2537. - <avp name="Framed-MTU" code="12" mandatory="may">
  2538. - <type type-name="Integer32"/>
  2539. + <avp name="Filter-Id" code="11" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  2540. + <type type-name="UTF8String"/>
  2541. </avp>
  2542. - <avp name="Framed-Compression" code="13">
  2543. + <avp name="Framed-MTU" code="12" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  2544. <type type-name="Unsigned32"/>
  2545. - <enum name="IPX-Header-Compression" code="2"/>
  2546. + </avp>
  2547. + <avp name="Framed-Compression" code="13" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  2548. + <type type-name="Enumerated"/>
  2549. <enum name="None" code="0"/>
  2550. - <enum name="Van-Jacobson-TCP-IP" code="1"/>
  2551. + <enum name="Van Jacobson TCP/IP header compression" code="1"/>
  2552. + <enum name="IPX header compression" code="2"/>
  2553. + <enum name="Stac-LZS compression" code="3"/>
  2554. </avp>
  2555. - <avp name="Login-IP-Host" code="14" mandatory="may">
  2556. - <type type-name="IPAddress"/>
  2557. - </avp>
  2558. - <avp name="Login-Service" code="15">
  2559. - <type type-name="Unsigned32"/>
  2560. + <avp name="Login-IP-Host" code="14" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  2561. + <type type-name="IPAddress"/>
  2562. + </avp>
  2563. + <avp name="Login-Service" code="15" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  2564. + <type type-name="Enumerated"/>
  2565. <enum name="Telnet" code="0"/>
  2566. <enum name="Rlogin" code="1"/>
  2567. <enum name="TCP-Clear" code="2"/>
  2568. @@ -671,108 +675,110 @@
  2569. <enum name="X25-T3POS" code="6"/>
  2570. <enum name="TCP Clear Quiet (suppresses any NAS-generated connect string)" code="8"/>
  2571. </avp>
  2572. - <avp name="Login-TCP-Port" code="16" mandatory="may">
  2573. - <type type-name="Integer32"/>
  2574. + <avp name="Login-TCP-Port" code="16" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  2575. + <type type-name="Unsigned32"/>
  2576. </avp>
  2577. - <avp name="Reply-Message" code="18" mandatory="may">
  2578. - <type type-name="OctetString"/>
  2579. + <avp name="Reply-Message" code="18" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2580. + <type type-name="UTF8String"/>
  2581. </avp>
  2582. - <avp name="Callback-Number" code="19" mandatory="may">
  2583. - <type type-name="OctetString"/>
  2584. + <avp name="Callback-Number" code="19" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2585. + <type type-name="UTF8String"/>
  2586. </avp>
  2587. - <avp name="Callback-Id" code="20" mandatory="may">
  2588. - <type type-name="OctetString"/>
  2589. + <avp name="Callback-Id" code="20" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2590. + <type type-name="UTF8String"/>
  2591. </avp>
  2592. - <avp name="Framed-Route" code="22" mandatory="may">
  2593. - <type type-name="OctetString"/>
  2594. + <avp name="Framed-Route" code="22" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2595. + <type type-name="UTF8String"/>
  2596. </avp>
  2597. - <avp name="Framed-IPX-Network" code="23" mandatory="may">
  2598. - <type type-name="Integer32"/>
  2599. + <avp name="Framed-IPX-Network" code="23" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2600. + <type type-name="UTF8String"/>
  2601. </avp>
  2602. - <avp name="State" code="24" mandatory="may">
  2603. + <avp name="State" code="24" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2604. <type type-name="OctetString"/>
  2605. </avp>
  2606. - <avp name="Class" code="25" mandatory="must">
  2607. + <avp name="Class" code="25" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2608. <type type-name="OctetString"/>
  2609. </avp>
  2610. - <avp name="Vendor-Specific" code="26">
  2611. + <avp name="Vendor-Specific" code="26" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2612. <type type-name="Unsigned32"/>
  2613. <!-- Should vendors be enum'ed? -->
  2614. </avp>
  2615. - <avp name="Session-Timeout" code="27" mandatory="must">
  2616. + <avp name="Session-Timeout" code="27" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2617. <type type-name="Unsigned32"/>
  2618. </avp>
  2619. - <avp name="Idle-Timeout" code="28" mandatory="may">
  2620. - <type type-name="Integer32"/>
  2621. + <avp name="Idle-Timeout" code="28" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2622. + <type type-name="Unsigned32"/>
  2623. </avp>
  2624. - <avp name="Termination-Action" code="29">
  2625. + <avp name="Termination-Action" code="29" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2626. <type type-name="Unsigned32"/>
  2627. <enum name="Default" code="0"/>
  2628. <enum name="RADIUS-Request" code="1"/>
  2629. </avp>
  2630. - <avp name="Called-Station-Id" code="30" mandatory="may">
  2631. - <type type-name="OctetString"/>
  2632. + <avp name="Called-Station-Id" code="30" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2633. + <type type-name="UTF8String"/>
  2634. </avp>
  2635. - <avp name="Calling-Station-Id" code="31" mandatory="may">
  2636. - <type type-name="OctetString"/>
  2637. + <avp name="Calling-Station-Id" code="31" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2638. + <type type-name="UTF8String"/>
  2639. </avp>
  2640. - <avp name="NAS-Identifier" code="32" mandatory="may">
  2641. + <avp name="NAS-Identifier" code="32" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2642. <type type-name="OctetString"/>
  2643. </avp>
  2644. - <avp name="Proxy-State" code="33" mandatory="must">
  2645. + <avp name="Proxy-State" code="33" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2646. <type type-name="OctetString"/>
  2647. </avp>
  2648. - <avp name="Login-LAT-Service" code="34" mandatory="may">
  2649. + <avp name="Login-LAT-Service" code="34" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2650. <type type-name="OctetString"/>
  2651. </avp>
  2652. - <avp name="Login-LAT-Node" code="35" mandatory="may">
  2653. + <avp name="Login-LAT-Node" code="35" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2654. <type type-name="OctetString"/>
  2655. </avp>
  2656. - <avp name="Login-LAT-Group" code="36" mandatory="may">
  2657. + <avp name="Login-LAT-Group" code="36" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2658. <type type-name="OctetString"/>
  2659. </avp>
  2660. - <avp name="Framed-AppleTalk-Link" code="37" mandatory="may">
  2661. - <type type-name="Integer32"/>
  2662. + <avp name="Framed-AppleTalk-Link" code="37" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2663. + <type type-name="Unsigned32"/>
  2664. </avp>
  2665. - <avp name="Framed-AppleTalk-Network" code="38" mandatory="may">
  2666. - <type type-name="Integer32"/>
  2667. + <avp name="Framed-AppleTalk-Network" code="38" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2668. + <type type-name="Unsigned32"/>
  2669. </avp>
  2670. - <avp name="Framed-AppleTalk-Zone" code="39" mandatory="may">
  2671. + <avp name="Framed-AppleTalk-Zone" code="39" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2672. <type type-name="OctetString"/>
  2673. </avp>
  2674. <avp name="Acct-Status-Type" code="40">
  2675. <type type-name="Unsigned32"/>
  2676. - <enum name="Accounting-Off" code="8"/>
  2677. - <enum name="Accounting-On" code="7"/>
  2678. - <enum name="Alive" code="3"/>
  2679. - <enum name="Cancel" code="6"/>
  2680. - <enum name="Modem-Start" code="4"/>
  2681. - <enum name="Modem-Stop" code="5"/>
  2682. <enum name="Start" code="1"/>
  2683. <enum name="Stop" code="2"/>
  2684. + <enum name="Interim-Update" code="3"/>
  2685. + <enum name="Modem-Start" code="4"/>
  2686. + <enum name="Modem-Stop" code="5"/>
  2687. + <enum name="Cancel" code="6"/>
  2688. + <enum name="Accounting-On" code="7"/>
  2689. + <enum name="Accounting-Off" code="8"/>
  2690. + <!-- 9-14 Reserved for Tunnel Accounting -->
  2691. + <!-- 15 Reserved for Tunnel Failed -->
  2692. </avp>
  2693. - <avp name="Acct-Delay-Time" code="41" mandatory="may">
  2694. - <type type-name="Integer32"/>
  2695. + <avp name="Acct-Delay-Time" code="41" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  2696. + <type type-name="Unsigned32"/>
  2697. </avp>
  2698. <avp name="Acct-Input-Octets" code="42" mandatory="may">
  2699. - <type type-name="Integer32"/>
  2700. + <type type-name="Unsigned32"/>
  2701. </avp>
  2702. <avp name="Acct-Output-Octets" code="43" mandatory="may">
  2703. - <type type-name="Integer32"/>
  2704. + <type type-name="Unsigned32"/>
  2705. </avp>
  2706. <avp name="Accounting-Session-Id" code="44" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  2707. <type type-name="Unsigned32"/>
  2708. </avp>
  2709. - <avp name="Acct-Authentic" code="45">
  2710. - <type type-name="Unsigned32"/>
  2711. + <avp name="Acct-Authentic" code="45" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  2712. + <type type-name="Enumerated"/>
  2713. <enum name="None" code="0"/>
  2714. <enum name="RADIUS" code="1"/>
  2715. <enum name="Local" code="2"/>
  2716. <enum name="Remote" code="3"/>
  2717. <enum name="Diameter" code="4"/>
  2718. </avp>
  2719. - <avp name="Acct-Session-Time" code="46" mandatory="may">
  2720. - <type type-name="Integer32"/>
  2721. + <avp name="Acct-Session-Time" code="46" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  2722. + <type type-name="Unsigned32"/>
  2723. </avp>
  2724. <avp name="Acct-Input-Packets" code="47" mandatory="may">
  2725. <type type-name="Integer32"/>
  2726. @@ -808,8 +814,8 @@
  2727. <avp name="Accounting-Multi-Session-Id" code="50" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  2728. <type type-name="OctetString"/>
  2729. </avp>
  2730. - <avp name="Acct-Link-Count" code="51" mandatory="may">
  2731. - <type type-name="Integer32"/>
  2732. + <avp name="Acct-Link-Count" code="51" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  2733. + <type type-name="Unsigned32"/>
  2734. </avp>
  2735. <avp name="Acct-Input-Gigawords" code="52" mandatory="may">
  2736. <type type-name="Integer32"/>
  2737. @@ -817,23 +823,29 @@
  2738. <avp name="Acct-Output-Gigawords" code="53" mandatory="may">
  2739. <type type-name="Integer32"/>
  2740. </avp>
  2741. +<!-- 54 Unassigned -->
  2742. <avp name="Event-Timestamp" code="55" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
  2743. <type type-name="Time"/>
  2744. </avp>
  2745. -<!-- 56-59 (unassigned) -->
  2746. - <avp name="CHAP-Challenge" code="60" mandatory="may">
  2747. +<!--
  2748. +56 Egress-VLANID [RFC4675]
  2749. +57 Ingress-Filters [RFC4675]
  2750. +58 Egress-VLAN-Name [RFC4675]
  2751. +59 User-Priority-Table [RFC4675]
  2752. +-->
  2753. + <avp name="CHAP-Challenge" code="60" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2754. <type type-name="OctetString"/>
  2755. </avp>
  2756. - <avp name="NAS-Port-Type" code="61" mandatory="must" may-encrypt="yes">
  2757. + <avp name="NAS-Port-Type" code="61" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2758. <type type-name="Enumerated"/>
  2759. <enum name="Async" code="0"/>
  2760. - <enum name="HDLC-Clear-Channel" code="7"/>
  2761. - <enum name="ISDN-Async-v110" code="4"/>
  2762. - <enum name="ISDN-Async-v120" code="3"/>
  2763. - <enum name="ISDN-Sync" code="2"/>
  2764. - <enum name="PIAFS" code="6"/>
  2765. <enum name="Sync" code="1"/>
  2766. + <enum name="ISDN-Sync" code="2"/>
  2767. + <enum name="ISDN-Async-v120" code="3"/>
  2768. + <enum name="ISDN-Async-v110" code="4"/>
  2769. <enum name="Virtual" code="5"/>
  2770. + <enum name="PIAFS" code="6"/>
  2771. + <enum name="HDLC-Clear-Channel" code="7"/>
  2772. <enum name="X25" code="8"/>
  2773. <enum name="X75" code="9"/>
  2774. <enum name="G.3 Fax" code="10"/>
  2775. @@ -853,15 +865,25 @@
  2776. <enum name="Wireless - 1X-EV" code="24"/>
  2777. <enum name="IAPP" code="25"/>
  2778. <enum name="FTTP - Fiber to the Premises" code="26"/>
  2779. + <enum name="Wireless - IEEE 802.16" code="27"/>
  2780. + <enum name="Wireless - IEEE 802.20" code="28"/>
  2781. + <enum name="Wireless - IEEE 802.22" code="29"/>
  2782. + <enum name="PPPoA - PPP over ATM" code="30"/>
  2783. + <enum name="PPPoEoA - PPP over Ethernet over ATM" code="31"/>
  2784. + <enum name="PPPoEoE - PPP over Ethernet over Ethernet" code="32"/>
  2785. + <enum name="PPPoEoVLAN - PPP over Ethernet over VLAN" code="33"/>
  2786. + <enum name="PPPoEoQinQ - PPP over Ethernet over IEEE 802.1QinQ" code="34"/>
  2787. + <enum name="xPON - Passive Optical Network" code="35"/>
  2788. + <enum name="Wireless - XGP" code="36"/>
  2789. </avp>
  2790. - <avp name="Port-Limit" code="62" mandatory="may">
  2791. - <type type-name="Integer32"/>
  2792. + <avp name="Port-Limit" code="62" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2793. + <type type-name="Unsigned32"/>
  2794. </avp>
  2795. - <avp name="Login-LAT-Port" code="63" mandatory="may">
  2796. + <avp name="Login-LAT-Port" code="63" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2797. <type type-name="OctetString"/>
  2798. </avp>
  2799. - <avp name="Tunnel-Type" code="64">
  2800. - <type type-name="Unsigned32"/>
  2801. + <avp name="Tunnel-Type" code="64" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2802. + <type type-name="Enumerated"/>
  2803. <enum name="PPTP" code="1"/>
  2804. <enum name="L2F" code="2"/>
  2805. <enum name="L2TP" code="3"/>
  2806. @@ -873,11 +895,11 @@
  2807. <enum name="ESP" code="9"/>
  2808. <enum name="GRE" code="10"/>
  2809. <enum name="DVS" code="11"/>
  2810. - <enum name="IP-IP" code="12"/>
  2811. + <enum name="IP-in-IP Tunneling" code="12"/>
  2812. <enum name="VLAN" code="13"/>
  2813. </avp>
  2814. - <avp name="Tunnel-Medium-Type" code="65">
  2815. - <type type-name="Unsigned32"/>
  2816. + <avp name="Tunnel-Medium-Type" code="65" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2817. + <type type-name="Enumerated"/>
  2818. <enum name="IPv4" code="1"/>
  2819. <enum name="IPv6" code="2"/>
  2820. <enum name="NSAP" code="3"/>
  2821. @@ -894,43 +916,48 @@
  2822. <enum name="Vines" code="14"/>
  2823. <enum name="E-164-NSAP" code="15"/>
  2824. </avp>
  2825. - <avp name="Acct-Tunnel-Client-Endpoint" code="66" mandatory="may">
  2826. - <type type-name="OctetString"/>
  2827. + <avp name="Acct-Tunnel-Client-Endpoint" code="66" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2828. + <type type-name="UTF8String"/>
  2829. </avp>
  2830. - <avp name="Tunnel-Server-Endpoint" code="67" mandatory="may">
  2831. - <type type-name="OctetString"/>
  2832. + <avp name="Tunnel-Server-Endpoint" code="67" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2833. + <type type-name="UTF8String"/>
  2834. </avp>
  2835. - <avp name="Acct-Tunnel-Connection-ID" code="68" mandatory="may">
  2836. + <avp name="Acct-Tunnel-Connection-ID" code="68" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2837. <type type-name="OctetString"/>
  2838. </avp>
  2839. - <avp name="Tunnel-Password" code="69" mandatory="may">
  2840. + <avp name="Tunnel-Password" code="69" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2841. <type type-name="OctetString"/>
  2842. </avp>
  2843. - <avp name="ARAP-Password" code="70" mandatory="may">
  2844. + <avp name="ARAP-Password" code="70" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2845. <type type-name="OctetString"/>
  2846. </avp>
  2847. - <avp name="ARAP-Features" code="71" mandatory="may">
  2848. + <avp name="ARAP-Features" code="71" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2849. <type type-name="OctetString"/>
  2850. </avp>
  2851. - <avp name="ARAP-Zone-Access" code="72" mandatory="may">
  2852. - <type type-name="Integer32"/>
  2853. + <avp name="ARAP-Zone-Access" code="72" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2854. + <type type-name="Enumerated"/>
  2855. + <enum name="Only allow access to default zone" code="1"/>
  2856. + <enum name="Use zone filter inclusively" code="2"/>
  2857. + <enum name="Use zone filter exclusively" code="3"/>
  2858. </avp>
  2859. - <avp name="ARAP-Security" code="73" mandatory="may">
  2860. - <type type-name="Integer32"/>
  2861. + <avp name="ARAP-Security" code="73" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2862. + <type type-name="Unsigned32"/>
  2863. </avp>
  2864. - <avp name="ARAP-Security-Data" code="74" mandatory="may">
  2865. + <avp name="ARAP-Security-Data" code="74" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2866. <type type-name="OctetString"/>
  2867. </avp>
  2868. - <avp name="Password-Retry" code="75" mandatory="may">
  2869. - <type type-name="Integer32"/>
  2870. + <avp name="Password-Retry" code="75" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2871. + <type type-name="Unsigned32"/>
  2872. </avp>
  2873. - <avp name="Prompt" code="76" mandatory="may">
  2874. - <type type-name="Integer32"/>
  2875. + <avp name="Prompt" code="76" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2876. + <type type-name="Enumerated"/>
  2877. + <enum name="No Echo" code="0"/>
  2878. + <enum name="Echo" code="1"/>
  2879. </avp>
  2880. - <avp name="Connect-Info" code="77" mandatory="may">
  2881. - <type type-name="OctetString"/>
  2882. + <avp name="Connect-Info" code="77" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2883. + <type type-name="UTF8String"/>
  2884. </avp>
  2885. - <avp name="Configuration-Token" code="78" mandatory="may">
  2886. + <avp name="Configuration-Token" code="78" mandatory="must" protected="mustnot" vendor-bit="mustnot">
  2887. <type type-name="OctetString"/>
  2888. </avp>
  2889. <avp name="EAP-Message" code="79" mandatory="may">
  2890. @@ -939,24 +966,66 @@
  2891. <avp name="Signature" code="80" mandatory="may">
  2892. <type type-name="OctetString"/>
  2893. </avp>
  2894. - <avp name="ARAP-Challenge-Response" code="84" mandatory="may">
  2895. + <avp name="Tunnel-Private-Group-Id" code="81" mandatory="must" protected="mustnot" vendor-bit="mustnot">
  2896. + <type type-name="OctetString"/>
  2897. + </avp>
  2898. + <avp name="Tunnel-Assignment-Id" code="82" mandatory="must" protected="mustnot" vendor-bit="mustnot">
  2899. + <type type-name="OctetString"/>
  2900. + </avp>
  2901. + <avp name="Tunnel-Preference" code="83" mandatory="must" protected="mustnot" vendor-bit="mustnot">
  2902. + <type type-name="Unsigned32"/>
  2903. + </avp>
  2904. + <avp name="ARAP-Challenge-Response" code="84" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2905. <type type-name="OctetString"/>
  2906. </avp>
  2907. <avp name="Acct-Interim-Interval" code="85" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
  2908. - <type type-name="Integer32"/>
  2909. + <type type-name="Unsigned32"/>
  2910. </avp>
  2911. - <avp name="Framed-Interface-Id" code="96" mandatory="may">
  2912. - <type type-name="Unsigned64"/>
  2913. + <avp name="Acct-Tunnel-Packets-Lost" code="86" mandatory="must" protected="mustnot" vendor-bit="mustnot">
  2914. + <type type-name="Unsigned32"/>
  2915. + </avp>
  2916. + <avp name="NAS-Port-Id" code="87" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2917. + <type type-name="UTF8String"/>
  2918. </avp>
  2919. - <avp name="Framed-IPv6-Prefix" code="97" mandatory="must" may-encrypt="yes" protected="may">
  2920. + <avp name="Framed-Pool" code="88" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2921. <type type-name="OctetString"/>
  2922. </avp>
  2923. <!--
  2924. http://www.iana.org/assignments/radius-types
  2925. - 98 Login-IPv6-Host [RFC3162]
  2926. - 99 Framed-IPv6-Route [RFC3162]
  2927. - 100 Framed-IPv6-Pool [RFC3162]
  2928. + 89 CUI [RFC4372]
  2929. +-->
  2930. + <avp name="Tunnel-Client-Auth-Id" code="90" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2931. + <type type-name="UTF8String"/>
  2932. + </avp>
  2933. + <avp name="Tunnel-Server-Auth-Id" code="91" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2934. + <type type-name="UTF8String"/>
  2935. + </avp>
  2936. +<!--
  2937. +http://www.iana.org/assignments/radius-types
  2938. + 92 NAS-Filter-Rule [RFC4849]
  2939. -->
  2940. +<!-- 93 (unassigned) -->
  2941. + <avp name="Originating-Line-Info" code="94" mandatory="may" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2942. + <type type-name="OctetString"/>
  2943. + </avp>
  2944. + <avp name="NAS-IPv6-Address" code="95" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2945. + <type type-name="OctetString"/>
  2946. + </avp>
  2947. + <avp name="Framed-Interface-Id" code="96" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2948. + <type type-name="Unsigned64"/>
  2949. + </avp>
  2950. + <avp name="Framed-IPv6-Prefix" code="97" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2951. + <type type-name="OctetString"/>
  2952. + </avp>
  2953. + <avp name="Login-IPv6-Host" code="98" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2954. + <type type-name="OctetString"/>
  2955. + </avp>
  2956. + <avp name="Framed-IPv6-Route" code="99" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2957. + <type type-name="UTF8String"/>
  2958. + </avp>
  2959. + <avp name="Framed-IPv6-Prefix" code="100" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  2960. + <type type-name="OctetString"/>
  2961. + </avp>
  2962. <avp name="Error-Cause" code="101" mandatory="may">
  2963. <type type-name="Integer32"/>
  2964. <enum name="Diameter Common Messages" code="0"/>
  2965. @@ -968,7 +1037,7 @@
  2966. <enum name="Invalid Request" code="404"/>
  2967. <enum name="Unsupported Service" code="405"/>
  2968. <enum name="Unsupported Extension" code="406"/>
  2969. - <enum name="Invalid Attribute Value" code="407"/>
  2970. + <enum name="Invalid Attribute Value" code="407"/>
  2971. <enum name="Administratively Prohibited" code="501"/>
  2972. <enum name="Request Not Routable (Proxy)" code="502"/>
  2973. <enum name="Session Context Not Found" code="503"/>
  2974. @@ -1044,32 +1113,32 @@
  2975. <!--
  2976. 123 Delegated-IPv6-Prefix [RFC4818]
  2977. -->
  2978. - <avp name="MIP6-Feature-Vector" code="124" mandatory="may">
  2979. - <type type-name="Unsigned64"/>
  2980. - </avp>
  2981. - <avp name="MIP6-Home-Link-Prefix" code="125" mandatory="may">
  2982. - <type type-name="OctetString"/>
  2983. - </avp>
  2984. - <!-- RFC5580 -->
  2985. - <avp name="Operator-Name" code="126" mandatory="may">
  2986. - <type type-name="OctetString"/>
  2987. - </avp>
  2988. - <avp name="Location-Information" code="127" mandatory="may">
  2989. - <type type-name="OctetString"/>
  2990. - </avp>
  2991. - <avp name="Location-Data" code="128" mandatory="may">
  2992. - <type type-name="OctetString"/>
  2993. - </avp>
  2994. - <avp name="Basic-Location-Policy-Rules" code="129" mandatory="may">
  2995. - <type type-name="OctetString"/>
  2996. - </avp>
  2997. - <avp name="Extended-Location-Policy-Rules" code="130" mandatory="may">
  2998. - <type type-name="OctetString"/>
  2999. - </avp>
  3000. - <avp name="Location-Capable" code="131" mandatory="may">
  3001. - <type type-name="OctetString"/>
  3002. - </avp>
  3003. - <!--
  3004. + <avp name="MIP6-Feature-Vector" code="124" mandatory="may">
  3005. + <type type-name="Unsigned64"/>
  3006. + </avp>
  3007. + <avp name="MIP6-Home-Link-Prefix" code="125" mandatory="may">
  3008. + <type type-name="OctetString"/>
  3009. + </avp>
  3010. + <!-- RFC5580 -->
  3011. + <avp name="Operator-Name" code="126" mandatory="may">
  3012. + <type type-name="OctetString"/>
  3013. + </avp>
  3014. + <avp name="Location-Information" code="127" mandatory="may">
  3015. + <type type-name="OctetString"/>
  3016. + </avp>
  3017. + <avp name="Location-Data" code="128" mandatory="may">
  3018. + <type type-name="OctetString"/>
  3019. + </avp>
  3020. + <avp name="Basic-Location-Policy-Rules" code="129" mandatory="may">
  3021. + <type type-name="OctetString"/>
  3022. + </avp>
  3023. + <avp name="Extended-Location-Policy-Rules" code="130" mandatory="may">
  3024. + <type type-name="OctetString"/>
  3025. + </avp>
  3026. + <avp name="Location-Capable" code="131" mandatory="may">
  3027. + <type type-name="OctetString"/>
  3028. + </avp>
  3029. + <!--
  3030. 133 Framed-Management-Protocol [RFC5607]
  3031. 134 Management-Transport-Protection [RFC5607]
  3032. 135 Management-Policy-Id [RFC5607]
  3033. @@ -1085,9 +1154,7 @@
  3034. 192-223 Experimental Use [RFC3575]
  3035. 224-240 Implementation Specific [RFC3575]
  3036. 241-255 Reserved [RFC3575]
  3037. -
  3038. -
  3039. --->
  3040. + -->
  3041. <!-- ******************* DIAMETER BASE PROTOCOL AVPS ************************ -->
  3042. <avp name="Host-IP-Address" code="257" mandatory="must" protected="may" may-encrypt="no" vendor-bit="mustnot">
  3043. <type type-name="IPAddress"/>
  3044. @@ -1097,15 +1164,15 @@
  3045. <enum name="Diameter Common Messages" code="0"/>
  3046. <enum name="Diameter NASREQ Application" code="1"/>
  3047. <enum name="Diameter Mobile IPv4 Application" code="2"/>
  3048. - <enum name="Diameter Base Accounting" code="3"/>
  3049. - <enum name="Diameter Credit Control" code="4"/>
  3050. - <enum name="Diameter EAP" code="5"/>
  3051. - <enum name="Diameter Session Initiation Protocol (SIP) Application" code="6"/>
  3052. + <enum name="Diameter Base Accounting" code="3"/>
  3053. + <enum name="Diameter Credit Control" code="4"/>
  3054. + <enum name="Diameter EAP" code="5"/>
  3055. + <enum name="Diameter Session Initiation Protocol (SIP) Application" code="6"/>
  3056. <enum name="Diameter Mobile IPv6 IKE (MIP6I)" code="7"/>
  3057. - <enum name="Diameter Mobile IPv6 Auth (MIP6A)" code="8"/>
  3058. - <enum name="Diameter QoS application" code="9"/>
  3059. - <!-- 10-16777215 Unassigned -->
  3060. - <enum name="3GPP CX/DX" code="16777216"/>
  3061. + <enum name="Diameter Mobile IPv6 Auth (MIP6A)" code="8"/>
  3062. + <enum name="Diameter QoS application" code="9"/>
  3063. + <!-- 10-16777215 Unassigned -->
  3064. + <enum name="3GPP CX/DX" code="16777216"/>
  3065. <enum name="3GPP Sh" code="16777217"/>
  3066. <enum name="3GPP Re/Rf" code="16777218"/>
  3067. <enum name="3GPP Wx" code="16777219"/>
  3068. @@ -1135,48 +1202,47 @@
  3069. <enum name="Policy Processing" code="16777243"/>
  3070. <enum name="Juniper Policy-Control-JSRC" code="16777244"/>
  3071. <enum name="ITU-T S-TC1" code="16777245"/> <!-- ITU-T Rec. Q.3221 -->
  3072. - <enum name="NSN Unified Charging Trigger Function (UCTF)" code="16777246"/>
  3073. - <enum name="3GPP2 CAN Access Authentication and Authorization" code="16777247"/>
  3074. - <enum name="3GPP2 WLAN Interworking Access Authentication and Authorization" code="16777248"/>
  3075. - <enum name="3GPP2 WLAN Interworking Accounting" code="16777249"/>
  3076. - <enum name="3GPP STaMIP" code="16777250"/>
  3077. - <enum name="3GPP S6a" code="16777251"/>
  3078. - <enum name="3GPP S13" code="16777252"/>
  3079. - <enum name="ETSI Re" code="16777253"/>
  3080. - <enum name="ETSI GOCAP" code="16777254"/>
  3081. - <enum name="SLg" code="16777255"/>
  3082. - <enum name="ITU-T Rw" code="16777256"/>
  3083. - <enum name="ETSI a4" code="16777257"/>
  3084. - <enum name="ITU-T Rt" code="16777258"/>
  3085. - <enum name="CARA" code="16777259"/>
  3086. - <enum name="CAMA" code="16777260"/>
  3087. - <enum name="Femtocell extension to Diameter EAP Application" code="16777261"/>
  3088. - <enum name="ITU-T Ru" code="16777262"/>
  3089. - <enum name="ITU-T Ng" code="16777263"/>
  3090. - <enum name="3GPP SWm" code="16777264"/>
  3091. - <enum name="3GPP SWx" code="16777265"/>
  3092. - <enum name="3GPP Gxx" code="16777266"/>
  3093. - <enum name="3GPP S9" code="16777267"/>
  3094. - <enum name="3GPP Zpn" code="16777268"/>
  3095. - <enum name="Ericsson HSI" code="16777269"/>
  3096. - <enum name="Juniper-Example" code="16777270"/>
  3097. - <enum name="ITU-T Ri" code="16777271"/>
  3098. - <enum name="3GPP S6b" code="16777272"/>
  3099. - <enum name="Relay" code="4294967295"/>
  3100. -
  3101. - </avp>
  3102. + <enum name="NSN Unified Charging Trigger Function (UCTF)" code="16777246"/>
  3103. + <enum name="3GPP2 CAN Access Authentication and Authorization" code="16777247"/>
  3104. + <enum name="3GPP2 WLAN Interworking Access Authentication and Authorization" code="16777248"/>
  3105. + <enum name="3GPP2 WLAN Interworking Accounting" code="16777249"/>
  3106. + <enum name="3GPP STaMIP" code="16777250"/>
  3107. + <enum name="3GPP S6a" code="16777251"/>
  3108. + <enum name="3GPP S13" code="16777252"/>
  3109. + <enum name="ETSI Re" code="16777253"/>
  3110. + <enum name="ETSI GOCAP" code="16777254"/>
  3111. + <enum name="SLg" code="16777255"/>
  3112. + <enum name="ITU-T Rw" code="16777256"/>
  3113. + <enum name="ETSI a4" code="16777257"/>
  3114. + <enum name="ITU-T Rt" code="16777258"/>
  3115. + <enum name="CARA" code="16777259"/>
  3116. + <enum name="CAMA" code="16777260"/>
  3117. + <enum name="Femtocell extension to Diameter EAP Application" code="16777261"/>
  3118. + <enum name="ITU-T Ru" code="16777262"/>
  3119. + <enum name="ITU-T Ng" code="16777263"/>
  3120. + <enum name="3GPP SWm" code="16777264"/>
  3121. + <enum name="3GPP SWx" code="16777265"/>
  3122. + <enum name="3GPP Gxx" code="16777266"/>
  3123. + <enum name="3GPP S9" code="16777267"/>
  3124. + <enum name="3GPP Zpn" code="16777268"/>
  3125. + <enum name="Ericsson HSI" code="16777269"/>
  3126. + <enum name="Juniper-Example" code="16777270"/>
  3127. + <enum name="ITU-T Ri" code="16777271"/>
  3128. + <enum name="3GPP S6b" code="16777272"/>
  3129. + <enum name="Relay" code="4294967295"/>
  3130. + </avp>
  3131. <avp name="Acct-Application-Id" code="259" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
  3132. <type type-name="AppId"/>
  3133. <enum name="Diameter Common Messages" code="0"/>
  3134. <enum name="Diameter NASREQ Application" code="1"/>
  3135. <enum name="Diameter Mobile IPv4 Application" code="2"/>
  3136. <enum name="Diameter Base Accounting" code="3"/>
  3137. - <enum name="Diameter Credit Control" code="4"/>
  3138. - <enum name="Diameter EAP" code="5"/>
  3139. - <enum name="Diameter Session Initiation Protocol (SIP) Application" code="6"/>
  3140. + <enum name="Diameter Credit Control" code="4"/>
  3141. + <enum name="Diameter EAP" code="5"/>
  3142. + <enum name="Diameter Session Initiation Protocol (SIP) Application" code="6"/>
  3143. <enum name="Diameter Mobile IPv6 IKE (MIP6I)" code="7"/>
  3144. <enum name="Diameter Mobile IPv6 Auth (MIP6A)" code="8"/>
  3145. - <enum name="3GPP CX/DX" code="16777216"/>
  3146. + <enum name="3GPP CX/DX" code="16777216"/>
  3147. <enum name="3GPP Sh" code="16777217"/>
  3148. <enum name="3GPP Re/Rf" code="16777218"/>
  3149. <enum name="3GPP Wx" code="16777219"/>
  3150. @@ -1202,39 +1268,39 @@
  3151. <enum name="Juniper Cluster" code="16777239"/>
  3152. <enum name="Juniper Policy-Control-AAA" code="16777240"/>
  3153. <enum name="iptego USPI" code="16777241"/>
  3154. - <enum name="Covergence-specific SIP routing" code="16777242"/>
  3155. - <enum name="Policy Processing" code="16777243"/>
  3156. - <enum name="Juniper Policy-Control-JSRC" code="16777244"/>
  3157. - <enum name="ITU-T S-TC1" code="16777245"/> <!-- ITU-T Rec. Q.3221 -->
  3158. - <enum name="NSN Unified Charging Trigger Function (UCTF)" code="16777246"/>
  3159. - <enum name="3GPP2 CAN Access Authentication and Authorization" code="16777247"/>
  3160. - <enum name="3GPP2 WLAN Interworking Access Authentication and Authorization" code="16777248"/>
  3161. - <enum name="3GPP2 WLAN Interworking Accounting" code="16777249"/>
  3162. - <enum name="3GPP STaMIP" code="16777250"/>
  3163. - <enum name="3GPP S6a" code="16777251"/>
  3164. - <enum name="3GPP S13" code="16777252"/>
  3165. - <enum name="ETSI Re" code="16777253"/>
  3166. - <enum name="ETSI GOCAP" code="16777254"/>
  3167. - <enum name="SLg" code="16777255"/>
  3168. - <enum name="ITU-T Rw" code="16777256"/>
  3169. - <enum name="ETSI a4" code="16777257"/>
  3170. - <enum name="ITU-T Rt" code="16777258"/>
  3171. - <enum name="CARA" code="16777259"/>
  3172. - <enum name="CAMA" code="16777260"/>
  3173. - <enum name="Femtocell extension to Diameter EAP Application" code="16777261"/>
  3174. - <enum name="ITU-T Ru" code="16777262"/>
  3175. - <enum name="ITU-T Ng" code="16777263"/>
  3176. - <enum name="3GPP SWm" code="16777264"/>
  3177. - <enum name="3GPP SWx" code="16777265"/>
  3178. - <enum name="3GPP Gxx" code="16777266"/>
  3179. - <enum name="3GPP S9" code="16777267"/>
  3180. - <enum name="3GPP Zpn" code="16777268"/>
  3181. - <enum name="Ericsson HSI" code="16777269"/>
  3182. - <enum name="Juniper-Example" code="16777270"/>
  3183. - <enum name="ITU-T Ri" code="16777271"/>
  3184. - <enum name="3GPP S6b" code="16777272"/>
  3185. - <enum name="Relay" code="4294967295"/>
  3186. - </avp>
  3187. + <enum name="Covergence-specific SIP routing" code="16777242"/>
  3188. + <enum name="Policy Processing" code="16777243"/>
  3189. + <enum name="Juniper Policy-Control-JSRC" code="16777244"/>
  3190. + <enum name="ITU-T S-TC1" code="16777245"/> <!-- ITU-T Rec. Q.3221 -->
  3191. + <enum name="NSN Unified Charging Trigger Function (UCTF)" code="16777246"/>
  3192. + <enum name="3GPP2 CAN Access Authentication and Authorization" code="16777247"/>
  3193. + <enum name="3GPP2 WLAN Interworking Access Authentication and Authorization" code="16777248"/>
  3194. + <enum name="3GPP2 WLAN Interworking Accounting" code="16777249"/>
  3195. + <enum name="3GPP STaMIP" code="16777250"/>
  3196. + <enum name="3GPP S6a" code="16777251"/>
  3197. + <enum name="3GPP S13" code="16777252"/>
  3198. + <enum name="ETSI Re" code="16777253"/>
  3199. + <enum name="ETSI GOCAP" code="16777254"/>
  3200. + <enum name="SLg" code="16777255"/>
  3201. + <enum name="ITU-T Rw" code="16777256"/>
  3202. + <enum name="ETSI a4" code="16777257"/>
  3203. + <enum name="ITU-T Rt" code="16777258"/>
  3204. + <enum name="CARA" code="16777259"/>
  3205. + <enum name="CAMA" code="16777260"/>
  3206. + <enum name="Femtocell extension to Diameter EAP Application" code="16777261"/>
  3207. + <enum name="ITU-T Ru" code="16777262"/>
  3208. + <enum name="ITU-T Ng" code="16777263"/>
  3209. + <enum name="3GPP SWm" code="16777264"/>
  3210. + <enum name="3GPP SWx" code="16777265"/>
  3211. + <enum name="3GPP Gxx" code="16777266"/>
  3212. + <enum name="3GPP S9" code="16777267"/>
  3213. + <enum name="3GPP Zpn" code="16777268"/>
  3214. + <enum name="Ericsson HSI" code="16777269"/>
  3215. + <enum name="Juniper-Example" code="16777270"/>
  3216. + <enum name="ITU-T Ri" code="16777271"/>
  3217. + <enum name="3GPP S6b" code="16777272"/>
  3218. + <enum name="Relay" code="4294967295"/>
  3219. + </avp>
  3220. <avp name="Vendor-Specific-Application-Id" code="260" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
  3221. <grouped>
  3222. <gavp name="Vendor-Id"/>
  3223. @@ -1249,9 +1315,9 @@
  3224. <enum name="All Realm" code="2"/>
  3225. <enum name="Realm and Application" code="3"/>
  3226. <enum name="All Application" code="4"/>
  3227. - <enum name="All Host" code="5"/>
  3228. - <enum name="ALL_USER" code="6"/>
  3229. - </avp>
  3230. + <enum name="All Host" code="5"/>
  3231. + <enum name="ALL_USER" code="6"/>
  3232. + </avp>
  3233. <avp name="Redirect-Max-Cache-Time" code="262" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
  3234. <type type-name="Unsigned32"/>
  3235. </avp>
  3236. @@ -1273,7 +1339,6 @@
  3237. <avp name="Result-Code" code="268" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
  3238. <type type-name="Unsigned32"/>
  3239. <enum name="DIAMETER_MULTI_ROUND_AUTH" code="1001"/>
  3240. -
  3241. <enum name="DIAMETER_SUCCESS" code="2001"/>
  3242. <enum name="DIAMETER_LIMITED_SUCCESS" code="2002"/>
  3243. <enum name="DIAMETER_FIRST_REGISTRATION" code="2003"/>
  3244. @@ -1281,11 +1346,10 @@
  3245. <enum name="DIAMETER_UNREGISTERED_SERVICE" code="2005"/>
  3246. <enum name="DIAMETER_SUCCESS_SERVER_NAME_NOT_STORED" code="2006"/>
  3247. <enum name="DIAMETER_SERVER_SELECTION" code="2007"/>
  3248. - <enum name="DIAMETER_SUCCESS_AUTH_SENT_SERVER_NOT_STORED" code="2008"/>
  3249. - <enum name="DIAMETER_SUCCESS_RELOCATE_HA" code="2009"/>
  3250. - <!-- 2010-2999 Unassigned -->
  3251. -
  3252. - <enum name="DIAMETER_COMMAND_UNSUPPORTED" code="3001"/>
  3253. + <enum name="DIAMETER_SUCCESS_AUTH_SENT_SERVER_NOT_STORED" code="2008"/>
  3254. + <enum name="DIAMETER_SUCCESS_RELOCATE_HA" code="2009"/>
  3255. + <!-- 2010-2999 Unassigned -->
  3256. + <enum name="DIAMETER_COMMAND_UNSUPPORTED" code="3001"/>
  3257. <enum name="DIAMETER_UNABLE_TO_DELIVER" code="3002"/>
  3258. <enum name="DIAMETER_REALM_NOT_SERVED" code="3003"/>
  3259. <enum name="DIAMETER_TOO_BUSY" code="3004"/>
  3260. @@ -1295,8 +1359,7 @@
  3261. <enum name="DIAMETER_INVALID_HDR_BITS" code="3008"/>
  3262. <enum name="DIAMETER_INVALID_AVP_BITS" code="3009"/>
  3263. <enum name="DIAMETER_UNKNOWN_PEER" code="3010"/>
  3264. - <!-- 3011-3999 Unassigned -->
  3265. -
  3266. + <!-- 3011-3999 Unassigned -->
  3267. <enum name="DIAMETER_AUTHENTICATION_REJECTED" code="4001"/>
  3268. <enum name="DIAMETER_OUT_OF_SPACE" code="4002"/>
  3269. <enum name="DIAMETER_ELECTION_LOST" code="4003"/>
  3270. @@ -1308,8 +1371,7 @@
  3271. <enum name="DIAMETER_CREDIT_CONTROL_NOT_APPLICABLE" code="4011"/>
  3272. <enum name="DIAMETER_CREDIT_LIMIT_REACHED" code="4012"/>
  3273. <enum name="DIAMETER_USER_NAME_REQUIRED" code="4013"/>
  3274. - <!-- 4014-4999 Unassigned -->
  3275. -
  3276. + <!-- 4014-4999 Unassigned -->
  3277. <enum name="DIAMETER_AVP_UNSUPPORTED" code="5001"/>
  3278. <enum name="DIAMETER_UNKNOWN_SESSION_ID" code="5002"/>
  3279. <enum name="DIAMETER_AUTHORIZATION_REJECTED" code="5003"/>
  3280. @@ -1328,10 +1390,10 @@
  3281. <enum name="DIAMETER_INVALID_AVP_BIT_COMBO" code="5016"/>
  3282. <enum name="DIAMETER_NO_COMMON_SECURITY" code="5017"/>
  3283. <enum name="DIAMETER_RADIUS_AVP_UNTRANSLATABLE" code="5018"/>
  3284. - <!-- 5019-5023 Unassigned -->
  3285. + <!-- 5019-5023 Unassigned -->
  3286. <enum name="DIAMETER_ERROR_NO_FOREIGN_HA_SERVICE" code="5024"/>
  3287. <enum name="DIAMETER_ERROR_END_TO_END_MIP_KEY_ENCRYPTION" code="5025"/>
  3288. - <!-- 5026-5029 Unassigned -->
  3289. + <!-- 5026-5029 Unassigned -->
  3290. <enum name="DIAMETER_USER_UNKNOWN" code="5030"/>
  3291. <enum name="DIAMETER_RATING_FAILED" code="5031"/>
  3292. <enum name="DIAMETER_ERROR_USER_UNKNOWN" code="5032"/>
  3293. @@ -1342,10 +1404,10 @@
  3294. <enum name="DIAMETER_ERROR_AUTH_SCHEME_NOT_SUPPORTED" code="5037"/>
  3295. <enum name="DIAMETER_ERROR_IN_ASSIGNMENT_TYPE" code="5038"/>
  3296. <enum name="DIAMETER_ERROR_TOO_MUCH_DATA" code="5039"/>
  3297. - <enum name="DIAMETER_ERROR_NOT SUPPORTED_USER_DATA" code="5040"/>
  3298. - <enum name="DIAMETER_ERROR_MIP6_AUTH_MODE" code="5041"/>
  3299. - <!-- 5042-4294967295 Unassigned -->
  3300. - </avp>
  3301. + <enum name="DIAMETER_ERROR_NOT SUPPORTED_USER_DATA" code="5040"/>
  3302. + <enum name="DIAMETER_ERROR_MIP6_AUTH_MODE" code="5041"/>
  3303. + <!-- 5042-4294967295 Unassigned -->
  3304. + </avp>
  3305. <avp name="Product-Name" code="269" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
  3306. <type type-name="UTF8String"/>
  3307. </avp>
  3308. @@ -1396,7 +1458,6 @@
  3309. <grouped>
  3310.  
  3311. </grouped>
  3312. -
  3313. </avp>
  3314. <avp name="Proxy-Host" code="280" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
  3315. <type type-name="DiameterIdentity"/>
  3316. @@ -1421,14 +1482,15 @@
  3317. <enum name="AUTHORIZE_ONLY" code="0"/>
  3318. <enum name="AUTHORIZE_AUTHENTICATE" code="1"/>
  3319. </avp>
  3320. +<!-- 286 Unassigned -->
  3321. <avp name="Accounting-Sub-Session-Id" code="287" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
  3322. <type type-name="Unsigned64"/>
  3323. </avp>
  3324. -<!-- 288-290 Unallocated http://www.iana.org/assignments/aaa-parameters (last updated 20 September 2005)?? -->
  3325. +<!-- 288-290 Unallocated http://www.iana.org/assignments/aaa-parameters -->
  3326. <avp name="Authorization-Lifetime" code="291" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
  3327. <type type-name="Integer32"/>
  3328. </avp>
  3329. - <avp name="Redirect-Host" code="292" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
  3330. + <avp name="Redirect-Host" code="292" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
  3331. <type type-name="DiameterURI"/>
  3332. </avp>
  3333. <avp name="Destination-Host" code="293" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
  3334. @@ -1457,7 +1519,7 @@
  3335. <gavp name="Experimental-Result-Code"/>
  3336. </grouped>
  3337. </avp>
  3338. - <!-- 3GPP TS 29.230 version 6.5.0 Release 6, ETSI TS 129 230 V6.5.0 (2005-09) -->
  3339. + <!-- 3GPP TS 29.230 version 9.2.0 Release 9, ETSI TS 129 230 V9.2.0 (2010-04) -->
  3340. <avp name="Experimental-Result-Code" code="298" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
  3341. <type type-name="Unsigned32"/>
  3342. <enum name="DIAMETER_FIRST_REGISTRATION" code="2001"/>
  3343. @@ -1465,13 +1527,20 @@
  3344. <enum name="DIAMETER_UNREGISTERED_SERVICE" code="2003"/>
  3345. <enum name="DIAMETER_SUCCESS_SERVER_NAME_NOT_STORED" code="2004"/>
  3346. <enum name="DIAMETER_SERVER_SELECTION(Deprecated value)" code="2005"/>
  3347. -
  3348. + <enum name="DIAMETER_PDP_CONTEXT_DELETION_INDICATION" code="2021"/>
  3349. <enum name="DIAMETER_USER_DATA_NOT_AVAILABLE" code="4100"/>
  3350. <enum name="DIAMETER_PRIOR_UPDATE_IN_PROGRESS" code="4101"/>
  3351. - <enum name="DIAMETER_ERROR_OUT_OF_RESOURCES" code="4121"/>
  3352. - <enum name="DIAMETER_PCC_BEARER_EVENT" code="4141"/>
  3353. -
  3354. - <enum name="DIAMETER_ERROR_USER_UNKNOWN" code="5001"/>
  3355. + <enum name="DIAMETER_ERROR_OUT_OF_RESOURCES" code="4121"/>
  3356. + <enum name="DIAMETER_PCC_BEARER_EVENT" code="4141"/>
  3357. + <enum name="DIAMETER_AUTHENTICATION_DATA_UNAVAILABLE" code="4181"/>
  3358. + <enum name="DIAMETER_ERROR_ABSENT_USER" code="4201"/>
  3359. + <enum name="DIAMETER_ERROR_UNREACHABLE_USER" code="4221"/>
  3360. + <enum name="DIAMETER_ERROR_SUSPENDED_USER" code="4222"/>
  3361. + <enum name="DIAMETER_ERROR_DETACHED_USER" code="4223"/>
  3362. + <enum name="DIAMETER_ERROR_POSITIONING_DENIED" code="4224"/>
  3363. + <enum name="DIAMETER_ERROR_POSITIONING_FAILED" code="4225"/>
  3364. + <enum name="DIAMETER_ERROR_UNKNOWN_UNREACHABLE LCS_CLIENT" code="4226"/>
  3365. + <enum name="DIAMETER_ERROR_USER_UNKNOWN" code="5001"/>
  3366. <enum name="DIAMETER_ERROR_IDENTITIES_DONT_MATCH" code="5002"/>
  3367. <enum name="DIAMETER_ERROR_IDENTITY_NOT_REGISTERED" code="5003"/>
  3368. <enum name="DIAMETER_ERROR_ROAMING_NOT_ALLOWED" code="5004"/>
  3369. @@ -1486,43 +1555,195 @@
  3370. <enum name="DIAMETER_ERROR_W-APN_UNUSED_BY_USER" code="5042"/>
  3371. <enum name="DIAMETER_ERROR_W-DIAMETER_ERROR_NO_ACCESS_INDEPENDENT_SUBSCRIPTION" code="5043"/>
  3372. <enum name="DIAMETER_ERROR_USER_NO_W-APN_SUBSCRIPTION" code="5044"/>
  3373. + <enum name="DIAMETER_ERROR_UNSUITABLE_NETWORK" code="5045"/>
  3374. + <enum name="INVALID_SERVICE_INFORMATION" code="5061"/>
  3375. + <enum name="FILTER_RESTRICTIONS" code="5062"/>
  3376. + <enum name="REQUESTED_SERVICE_NOT_AUTHORIZED" code="5063"/>
  3377. + <enum name="DUPLICATED_AF_SESSION" code="5064"/>
  3378. + <enum name="IP-CAN_SESSION_NOT_AVAILABLE" code="5065"/>
  3379. + <enum name="UNAUTHORIZED_NON_EMERGENCY_SESSION" code="5066"/>
  3380. <enum name="DIAMETER_ERROR_USER_DATA_NOT_RECOGNIZED" code="5100"/>
  3381. <enum name="DIAMETER_ERROR_OPERATION_NOT_ALLOWED" code="5101"/>
  3382. <enum name="DIAMETER_ERROR_USER_DATA_CANNOT_BE_READ" code="5102"/>
  3383. <enum name="DIAMETER_ERROR_USER_DATA_CANNOT_BE_MODIFIED" code="5103"/>
  3384. <enum name="DIAMETER_ERROR_USER_DATA_CANNOT_BE_NOTIFIED" code="5104"/>
  3385. <enum name="DIAMETER_ERROR_TRANSPARENT_DATA_OUT_OF_SYNC" code="5105"/>
  3386. + <enum name="DIAMETER_ERROR_SUBS_DATA_ABSENT" code="5106"/>
  3387. + <enum name="DIAMETER_ERROR_NO_SUBSCRIPTION_TO_DATA" code="5107"/>
  3388. + <enum name="DIAMETER_ERROR_DSAI_NOT_AVAILABLE" code="5108"/>
  3389. <enum name="DIAMETER_ERROR_START_INDICATION" code="5120"/>
  3390. <enum name="DIAMETER_ERROR_STOP_INDICATION" code="5121"/>
  3391. <enum name="DIAMETER_ERROR_UNKNOWN_MBMS_BEARER_SERVICE" code="5122"/>
  3392. <enum name="DIAMETER_ERROR_SERVICE_AREA" code="5123"/>
  3393. <enum name="DIAMETER_ERROR_INITIAL_PARAMETERS" code="5140"/>
  3394. <enum name="DIAMETER_ERROR_TRIGGER_EVENT" code="5141"/>
  3395. - <enum name="DIAMETER_BEARER_EVENT" code="5142"/>
  3396. - <enum name="DIAMETER_ERROR_BEARER_NOT_AUTHORIZED" code="5143"/>
  3397. - <enum name="DIAMETER_ERROR_TRAFFIC_MAPPING_INFO_REJECTED" code="5144"/>
  3398. - <enum name="DIAMETER_QOS_RULE_EVENT" code="5145"/>
  3399. - <enum name="DIAMETER_ERROR_TRAFFIC_MAPPING_INFO_REJECTED" code="5146"/>
  3400. - <enum name="DIAMETER_ERROR_CONFLICTING_REQUEST" code="5147"/>
  3401. - </avp>
  3402. - <!-- RFC3588 AVP -->
  3403. - <avp name="Inband-Security-Id" code="299" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
  3404. - <type type-name="Unsigned32"/>
  3405. - <enum name="NO_INBAND_SECURITY" code="0"/>
  3406. - <enum name="TLS" code="1"/>
  3407. + <enum name="DIAMETER_BEARER_EVENT" code="5142"/>
  3408. + <enum name="DIAMETER_ERROR_BEARER_NOT_AUTHORIZED" code="5143"/>
  3409. + <enum name="DIAMETER_ERROR_TRAFFIC_MAPPING_INFO_REJECTED" code="5144"/>
  3410. + <enum name="DIAMETER_QOS_RULE_EVENT" code="5145"/>
  3411. + <enum name="DIAMETER_ERROR_TRAFFIC_MAPPING_INFO_REJECTED" code="5146"/>
  3412. + <enum name="DIAMETER_ERROR_CONFLICTING_REQUEST" code="5147"/>
  3413. + <enum name="DIAMETER_ERROR_IMPI_UNKNOWN" code="5401"/>
  3414. + <enum name="DIAMETER_ERROR_NOT_AUTHORIZED" code="5402"/>
  3415. + <enum name="DIAMETER_ERROR_TRANSACTION_IDENTIFIER_INVALID" code="5403"/>
  3416. + <enum name="DIAMETER_ERROR_UNKNOWN_EPS_SUBSCRIPTION" code="5420"/>
  3417. + <enum name="DIAMETER_ERROR_RAT_NOT_ALLOWED" code="5421"/>
  3418. + <enum name="DIAMETER_ERROR_EQUIPMENT_UNKNOWN" code="5422"/>
  3419. + <enum name="DIAMETER_ERROR_UNKNOWN_SERVING_NODE" code="5423"/>
  3420. + <enum name="DIAMETER_ERROR_USER_NO_NON_3GPP_SUBSCRIPTION" code="5450"/>
  3421. + <enum name="DIAMETER_ERROR_USER_NO_APN_SUBSCRIPTION" code="5451"/>
  3422. + <enum name="DIAMETER_ERROR_RAT_TYPE_NOT_ALLOWED" code="5452"/>
  3423. + <enum name="DIAMETER_ERROR_SUBSESSION" code="5470"/>
  3424. + <enum name="DIAMETER_ERROR_UNAUTHORIZED_REQUESTING_NETWORK" code="5490"/>
  3425. + </avp>
  3426. + <!-- RFC3588 AVP -->
  3427. + <avp name="Inband-Security-Id" code="299" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
  3428. + <type type-name="Unsigned32"/>
  3429. + <enum name="NO_INBAND_SECURITY" code="0"/>
  3430. + <enum name="TLS" code="1"/>
  3431. </avp>
  3432. -
  3433. <avp name="E2E-Sequence" code="300" mandatory="must">
  3434. <grouped>
  3435. <gavp name="foo"/>
  3436. </grouped>
  3437. </avp>
  3438. <!-- 301-317 Unallocated -->
  3439. -<!-- AVP:s 318 - 348 Belongs to Diameter Mobile IPv4 Application and is defined in mobileipv4.xml -->
  3440. +<!-- AVP:s 318 - 348 Belongs to Diameter Mobile IPv4 Application and is defined in mobileipv4.xml
  3441. +318 MIP-FA-to-HA-SPI [RFC4004]
  3442. +319 MIP-FA-to-MN-SPI [RFC4004]
  3443. +320 MIP-Reg-Request [RFC4004]
  3444. +321 MIP-Reg-Reply [RFC4004]
  3445. +322 MIP-MN-AAA-Auth [RFC4004]
  3446. +323 MIP-HA-to-FA-SPI [RFC4004]
  3447. +324 Unassigned
  3448. +325 MIP-MN-to-FA-MSA [RFC4004]
  3449. +326 MIP-FA-to-MN-MSA [RFC4004]
  3450. +327 Unassigned
  3451. +328 MIP-FA-to-HA-MSA [RFC4004]
  3452. +329 MIP-HA-to-FA-MSA [RFC4004]
  3453. +331 MIP-MN-to-HA-MSA [RFC4004]
  3454. +332 MIP-HA-to-MN-MSA [RFC4004]
  3455. +333 MIP-Mobile-Node-Address [RFC4004]
  3456. +334 MIP-Home-Agent-Address [RFC4004]
  3457. +335 MIP-Nonce [RFC4004]
  3458. +336 MIP-Candidate-Home-Agent-Host [RFC4004]
  3459. +337 MIP-Feature-Vector [RFC4004]
  3460. +338 MIP-Auth-Input-Data-Length [RFC4004]
  3461. +339 MIP-Authenticator-Length [RFC4004]
  3462. +340 MIP-Authenticator-Offset [RFC4004]
  3463. +341 MIP-MN-AAA-SPI [RFC4004]
  3464. +342 MIP-Filter-Rule [RFC4004]
  3465. +343 MIP-Session-Key [RFC4004]
  3466. +344 MIP-FA-Challenge [RFC4004]
  3467. +345 MIP-Algorithm-Type [RFC4004]
  3468. +346 MIP-Replay-Mode [RFC4004]
  3469. +347 MIP-Originating-Foreign-AAA [RFC4004]
  3470. +348 MIP-Home-Agent-Host [RFC4004]
  3471. +-->
  3472. <!-- AVP:s 349-362 Unassigned -->
  3473. -<!-- AVP:s 363 - 408 Belongs to Diameter Network Access Server Application and is defined in nasreq.xml -->
  3474. -<!-- AVP:s 411 - 461 Belongs to Carge Control and is defined in chargecontrol.xml -->
  3475. -<!-- 462 EAP-Payload [RFC4072]
  3476. +<!-- AVP:s 368 - 393 is in sip.xml
  3477. +363 Accounting-Input-Octets [RFC4005][RFC4004]
  3478. +364 Accounting-Output-Octets [RFC4005][RFC4004]
  3479. +365 Accounting-Input-Packets [RFC4005][RFC4004]
  3480. +366 Accounting-Output-Packets [RFC4005][RFC4004]
  3481. +367 MIP-MSA-Lifetime [RFC4004]
  3482. +368 SIP-Accounting-Information [RFC4740]
  3483. +369 SIP-Accounting-Server-URI [RFC4740]
  3484. +370 SIP-Credit-Control-Server-URI [RFC4740]
  3485. +371 SIP-Server-URI [RFC4740]
  3486. +372 SIP-Server-Capabilities [RFC4740]
  3487. +373 SIP-Mandatory-Capability [RFC4740]
  3488. +374 SIP-Optional-Capability [RFC4740]
  3489. +375 SIP-Server-Assignment-Type [RFC4740]
  3490. +376 SIP-Auth-Data-Item [RFC4740]
  3491. +377 SIP-Authentication-Scheme [RFC4740]
  3492. +378 SIP-Item-Number [RFC4740]
  3493. +379 SIP-Authenticate [RFC4740]
  3494. +380 SIP-Authorization [RFC4740]
  3495. +381 SIP-Authentication-Info [RFC4740]
  3496. +382 SIP-Number-Auth-Items [RFC4740]
  3497. +383 SIP-Deregistration-Reason [RFC4740]
  3498. +384 SIP-Reason-Code [RFC4740]
  3499. +385 SIP-Reason-Info [RFC4740]
  3500. +386 SIP-Visited-Network-Id [RFC4740]
  3501. +387 SIP-User-Authorization-Type [RFC4740]
  3502. +388 SIP-Supported-User-Data-Type [RFC4740]
  3503. +389 SIP-User-Data [RFC4740]
  3504. +390 SIP-User-Data-Type [RFC4740]
  3505. +391 SIP-User-Data-Contents [RFC4740]
  3506. +392 SIP-User-Data-Already-Available [RFC4740]
  3507. +393 SIP-Method [RFC4740]
  3508. +-->
  3509. +<!-- 394-399 Unassigned -->
  3510. +<!-- 400 408 is defined in nasreq.xml
  3511. +400 NAS-Filter-Rule [RFC4005]
  3512. +401 Tunneling [RFC4005]
  3513. +402 CHAP-Auth [RFC4005]
  3514. +403 CHAP-Algorithm [RFC4005]
  3515. +404 CHAP-Ident [RFC4005]
  3516. +405 CHAP-Response [RFC4005]
  3517. +406 Acounting-Auth-Method [RFC4005]
  3518. +407 QoS-Filter-Rule [RFC4005]
  3519. +408 Origin-AAA-Protocol [RFC4005]
  3520. + -->
  3521. +<!-- 409-410 Unassigned -->
  3522. +-->
  3523. +<!-- AVP:s 411 - 461 Belongs to Carge Control and is defined in chargecontrol.xml
  3524. +411 CC-Correlation-Id [RFC4006]
  3525. +412 CC-Input-Octets [RFC4006]
  3526. +413 CC-Money [RFC4006]
  3527. +414 CC-Output-Octets [RFC4006]
  3528. +415 CC-Request-Number [RFC4006]
  3529. +416 CC-Request-Type [RFC4006]
  3530. +417 CC-Service-Specific-Units [RFC4006]
  3531. +418 CC-Session-Failover [RFC4006]
  3532. +419 CC-Sub-Session-Id [RFC4006]
  3533. +420 CC-Time [RFC4006]
  3534. +421 CC-Total-Octets [RFC4006]
  3535. +422 Check-Balance-Result [RFC4006]
  3536. +423 Cost-Information [RFC4006]
  3537. +424 Cost-Unit [RFC4006]
  3538. +425 Currency-Code [RFC4006]
  3539. +426 Credit-Control [RFC4006]
  3540. +427 Credit-Control-Failure-Handling [RFC4006]
  3541. +428 Direct-Debiting-Failure-Handling [RFC4006]
  3542. +429 Exponent [RFC4006]
  3543. +430 Final-Unit-Indication [RFC4006]
  3544. +431 Granted-Service-Unit [RFC4006]
  3545. +432 Rating-Group [RFC4006]
  3546. +433 Redirect-Address-Type [RFC4006]
  3547. +434 Redirect-Server [RFC4006]
  3548. +435 Redirect-Server-Address [RFC4006]
  3549. +436 Requested-Action [RFC4006]
  3550. +437 Requested-Service-Unit [RFC4006]
  3551. +438 Restriction-Filter-Rule [RFC4006]
  3552. +439 Service-Identifier [RFC4006]
  3553. +440 Service-Parameter-Info [RFC4006]
  3554. +441 Service-Parameter-Type [RFC4006]
  3555. +442 Service-Parameter-Value [RFC4006]
  3556. +443 Subscription-Id [RFC4006]
  3557. +444 Subscription-Id-Data [RFC4006]
  3558. +445 Unit-Value [RFC4006]
  3559. +446 Used-Service-Unit [RFC4006]
  3560. +447 Value-Digits [RFC4006]
  3561. +448 Validity-Time [RFC4006]
  3562. +449 Final-Unit-Action [RFC4006]
  3563. +450 Subscription-Id-Type [RFC4006]
  3564. +451 Tariff-Time-Change [RFC4006]
  3565. +452 Tariff-Change-Usage [RFC4006]
  3566. +453 G-S-U-Pool-Identifier [RFC4006]
  3567. +454 CC-Unit-Type [RFC4006]
  3568. +455 Multiple-Services-Indicator [RFC4006]
  3569. +456 Multiple-Services-Credit-Control [RFC4006]
  3570. +457 G-S-U-Pool-Reference [RFC4006]
  3571. +458 User-Equipment-Info [RFC4006]
  3572. +459 User-Equipment-Info-Type [RFC4006]
  3573. +460 User-Equipment-Info-Value [RFC4006]
  3574. +461 Service-Context-Id [RFC4006]
  3575. +
  3576. +-->
  3577. +<!-- epa.xml
  3578. + 462 EAP-Payload [RFC4072]
  3579. 463 EAP-Reissued-Payload [RFC4072]
  3580. 464 EAP-Master-Session-Key [RFC4072]
  3581. 465 Accounting-EAP-Auth-Method [RFC4072]
  3582. @@ -1536,7 +1757,6 @@
  3583. <enum name="Stop Record" code="4"/>
  3584. </avp>
  3585. <!-- 481-482 Unallocated http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xhtml -->
  3586. -
  3587. <avp name="Accounting-Realtime-Required" code="483" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
  3588. <type type-name="Unsigned32"/>
  3589. <enum name="Reserved" code="0"/>
  3590. @@ -1560,11 +1780,11 @@
  3591. 502 Bandwidth [RFC5624]
  3592. 503 PHB-Class [RFC5624]
  3593. 504 - 507 in mobileipv6.xml
  3594. -503 PHB-Class [RFC5624]
  3595. -504 PMIP6-DHCP-Server-Address [RFC5779]
  3596. -505 PMIP6-IPv4-Home-Address [RFC5779]
  3597. -506 Mobile-Node-Identifier [RFC5779]
  3598. -507 Service-Configuration [RFC5779]
  3599. + 503 PHB-Class [RFC5624]
  3600. + 504 PMIP6-DHCP-Server-Address [RFC5779]
  3601. + 505 PMIP6-IPv4-Home-Address [RFC5779]
  3602. + 506 Mobile-Node-Identifier [RFC5779]
  3603. + 507 Service-Configuration [RFC5779]
  3604. 508 QoS-Resources [RFC5777]
  3605. 509 Filter-Rule [RFC5777]
  3606. 510 Filter-Rule-Precedence [RFC5777]
  3607. @@ -1639,9 +1859,8 @@
  3608. 579 QoS-Authorization-Data [RFC-ietf-dime-diameter-qos-15]
  3609. 580 Bound-Auth-Session-Id [RFC-ietf-dime-diameter-qos-15]
  3610. 581-0xffffff Unassigned
  3611. -
  3612. -->
  3613. - <avp name="Example-AVP" code="999999" mandatory="mustnot" vendor-bit="may">
  3614. + <avp name="Example-AVP" code="999999" mandatory="mustnot" vendor-bit="may">
  3615. <grouped>
  3616. <gavp name="Origin-Host"/>
  3617. <gavp name="Host-IP-Address"/>
  3618. @@ -1679,7 +1898,6 @@
  3619. <avp name="GBA-UserSecSettings" code="400" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  3620. <type type-name="OctetString"/>
  3621. </avp>
  3622. -
  3623. <avp name="Transaction-Identifier" code="401" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  3624. <type type-name="OctetString"/>
  3625. </avp>
  3626. @@ -1744,7 +1962,7 @@
  3627. -->
  3628. <!-- 3GPP Diameter charging applications (3GPP TS 32.299 version 7.0.0 Release 7)-->
  3629. <!-- Note: The AVP codes from 800 to 822 are reserved for TS 32.299. -->
  3630. - <avp name="Event-Type" code="823" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot" vendor-id="TGPP" >
  3631. + <avp name="Event-Type" code="823" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot" vendor-id="TGPP">
  3632. <grouped>
  3633. <gavp name="SIP-Method"/>
  3634. <gavp name="Event"/>
  3635. @@ -1753,155 +1971,150 @@
  3636. <gavp name="Content-Disposition"/>
  3637. </grouped>
  3638. </avp>
  3639. - <avp name="SIP-Method" code="824" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3640. + <avp name="SIP-Method" code="824" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3641. <type type-name="UTF8String"/>
  3642. </avp>
  3643. - <avp name="Event" code="825" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3644. + <avp name="Event" code="825" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3645. <type type-name="UTF8String"/>
  3646. </avp>
  3647. - <avp name="Content-Type" code="826" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3648. + <avp name="Content-Type" code="826" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3649. <type type-name="UTF8String"/>
  3650. </avp>
  3651. <!-- In 3GPP TS 32.299 version 6.5.0 Release 6 (2005-12) -->
  3652. <!-- type type-name="UTF8String" -->
  3653. <!-- but according to 3GPP TS 32.299 version 7.4.0 Release 7(2006-12) it -->
  3654. <!-- should be: -->
  3655. - <avp name="Content-Length" code="827" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3656. + <avp name="Content-Length" code="827" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3657. <type type-name="Unsigned32"/>
  3658. </avp>
  3659. - <avp name="Content-Disposition" code="828" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3660. + <avp name="Content-Disposition" code="828" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3661. <type type-name="UTF8String"/>
  3662. </avp>
  3663. - <avp name="Role-Of-Node" code="829" mandatory="must" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3664. + <avp name="Role-Of-Node" code="829" mandatory="must" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3665. <type type-name="Enumerated"/>
  3666. <enum name="ORIGINATING_ROLE" code="0"/>
  3667. <enum name="TERMINATING_ROLE" code="1"/>
  3668. <enum name="PROXY_ROLE" code="2"/>
  3669. <enum name="B2BUA_ROLE" code="3"/>
  3670. </avp>
  3671. - <avp name="User-Session-Id" code="830" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3672. + <avp name="User-Session-Id" code="830" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3673. <type type-name="UTF8String"/>
  3674. </avp>
  3675. - <avp name="Calling-Party-Address" code="831" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3676. + <avp name="Calling-Party-Address" code="831" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3677. <type type-name="UTF8String"/>
  3678. </avp>
  3679. - <avp name="Called-Party-Address" code="832" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3680. + <avp name="Called-Party-Address" code="832" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3681. <type type-name="UTF8String"/>
  3682. </avp>
  3683. - <avp name="Time-Stamps" code="833" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3684. + <avp name="Time-Stamps" code="833" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3685. <grouped>
  3686. <gavp name="SIP-Request-Timestamp"/>
  3687. <gavp name="SIP-Response-Timestamp"/>
  3688. </grouped>
  3689. </avp>
  3690. - <avp name="SIP-Request-Timestamp" code="834" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3691. + <avp name="SIP-Request-Timestamp" code="834" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3692. <type type-name="Time"/>
  3693. </avp>
  3694. - <avp name="SIP-Response-Timestamp" code="835" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3695. + <avp name="SIP-Response-Timestamp" code="835" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3696. <type type-name="Time"/>
  3697. </avp>
  3698. - <avp name="Application-Server" code="836" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3699. + <avp name="Application-Server" code="836" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3700. <type type-name="UTF8String"/>
  3701. </avp>
  3702. - <avp name="Application-provided-Called-Party-Address" code="837" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3703. + <avp name="Application-provided-Called-Party-Address" code="837" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3704. <type type-name="UTF8String"/>
  3705. </avp>
  3706. - <avp name="Inter-Operator-Identifier" code="838" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3707. + <avp name="Inter-Operator-Identifier" code="838" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3708. <grouped>
  3709. <gavp name="Originating-IOI"/>
  3710. <gavp name="Terminating-IOI"/>
  3711. </grouped>
  3712. </avp>
  3713. - <avp name="Originating-IOI" code="839" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3714. + <avp name="Originating-IOI" code="839" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3715. <type type-name="UTF8String"/>
  3716. </avp>
  3717. - <avp name="Terminating-IOI" code="840" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3718. + <avp name="Terminating-IOI" code="840" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3719. <type type-name="UTF8String"/>
  3720. </avp>
  3721. - <avp name="IMS-Charging-Identifier" code="841" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3722. + <avp name="IMS-Charging-Identifier" code="841" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3723. <type type-name="UTF8String"/>
  3724. </avp>
  3725. - <avp name="SDP-Session-Description" code="842" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3726. + <avp name="SDP-Session-Description" code="842" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3727. <type type-name="UTF8String"/>
  3728. </avp>
  3729. - <avp name="SDP-Media-components" code="843" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3730. + <avp name="SDP-Media-components" code="843" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3731. <grouped>
  3732. <gavp name="SDP-Media-Name"/>
  3733. <gavp name="SDP-Media-Description"/>
  3734. </grouped>
  3735. </avp>
  3736. - <avp name="SDP-Media-Name" code="844" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3737. + <avp name="SDP-Media-Name" code="844" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3738. <type type-name="UTF8String"/>
  3739. </avp>
  3740. - <avp name="SDP-Media-Description" code="845" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3741. + <avp name="SDP-Media-Description" code="845" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3742. <type type-name="UTF8String"/>
  3743. </avp>
  3744. - <avp name="GPRS-Charging-ID" code="846" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3745. + <avp name="GPRS-Charging-ID" code="846" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3746. <type type-name="UTF8String"/>
  3747. </avp>
  3748. - <!--
  3749. - ETSI TS 132 299 V7.6.0 (2007-06)
  3750. - -->
  3751. - <avp name="GGSN-Address" code="847" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3752. + <!-- ETSI TS 132 299 V7.6.0 (2007-06) -->
  3753. + <avp name="GGSN-Address" code="847" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3754. <type type-name="IPAddress"/>
  3755. </avp>
  3756. - <avp name="Served-Party-IP-Address" code="848" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3757. + <avp name="Served-Party-IP-Address" code="848" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3758. <type type-name="IPAddress"/>
  3759. </avp>
  3760. - <avp name="Authorised-QoS" code="849" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3761. + <avp name="Authorised-QoS" code="849" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3762. <type type-name="UTF8String"/>
  3763. </avp>
  3764. - <avp name="Application-Server-Information" code="850" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3765. + <avp name="Application-Server-Information" code="850" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3766. <grouped>
  3767. <gavp name="Application-Server"/>
  3768. <gavp name="Application-Provided-Called-Party-Address"/>
  3769. </grouped>
  3770. </avp>
  3771. - <avp name="Trunk-Group-ID" code="851" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3772. + <avp name="Trunk-Group-ID" code="851" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3773. <grouped>
  3774. <gavp name="Incoming-Trunk-Group-ID"/>
  3775. <gavp name="Outgoing-Trunk-Group-ID"/>
  3776. </grouped>
  3777. </avp>
  3778. - <avp name="Incoming-Trunk-Group-ID" code="852" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3779. + <avp name="Incoming-Trunk-Group-ID" code="852" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3780. <type type-name="UTF8String"/>
  3781. </avp>
  3782. - <avp name="Outgoing-Trunk-Group-ID" code="853" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3783. + <avp name="Outgoing-Trunk-Group-ID" code="853" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3784. <type type-name="UTF8String"/>
  3785. </avp>
  3786. - <avp name="Bearer-Service" code="854" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3787. + <avp name="Bearer-Service" code="854" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3788. <type type-name="OctetString"/>
  3789. </avp>
  3790. - <avp name="Service-ID" code="855" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3791. + <avp name="Service-ID" code="855" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3792. <type type-name="UTF8String"/>
  3793. </avp>
  3794. -
  3795. <avp name="PoC-Controlling-Address" code="858" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  3796. <type type-name="UTF8String"/>
  3797. </avp>
  3798. -
  3799. <avp name="PoC-Group-Name" code="859" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  3800. <type type-name="UTF8String"/>
  3801. </avp>
  3802. -
  3803. - <avp name="Cause" code="860" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3804. + <avp name="Cause" code="860" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3805. <grouped>
  3806. <gavp name="Cause-Code"/>
  3807. <gavp name="Node-Functionality"/>
  3808. </grouped>
  3809. </avp>
  3810. - <avp name="Cause-Code" code="861" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3811. + <avp name="Cause-Code" code="861" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3812. <type type-name="Enumerated"/>
  3813. - <enum name="End of REGISTER dialog" code="-3"/>
  3814. - <enum name="End of SUBSCRIBE dialog" code="-2"/>
  3815. - <enum name="Successful transaction" code="-1"/>
  3816. + <enum name="End of REGISTER dialog" code="-3"/>
  3817. + <enum name="End of SUBSCRIBE dialog" code="-2"/>
  3818. + <enum name="Successful transaction" code="-1"/>
  3819. <enum name="Normal end of session" code="0"/>
  3820. <enum name="Unspecified error" code="1"/>
  3821. <enum name="Unsuccessful session setup" code="2"/>
  3822. <enum name="Internal error" code="3"/>
  3823. <enum name="Multiple Choices" code="300"/>
  3824. <enum name="Moved Permanently" code="301"/>
  3825. - <enum name="Moved Temporarily" code="302"/>
  3826. + <enum name="Moved Temporarily" code="302"/>
  3827. <enum name="Use Proxy" code="305"/>
  3828. <enum name="Alternative Service" code="380"/>
  3829. <enum name="Bad Request" code="400"/>
  3830. @@ -1910,7 +2123,7 @@
  3831. <enum name="Forbidden" code="403"/>
  3832. <enum name="Not Found" code="404"/>
  3833. <enum name="Method Not Allowed" code="405"/>
  3834. - <enum name="Not Acceptable" code="406"/>
  3835. + <enum name="Not Acceptable" code="406"/>
  3836. <enum name="Proxy Authentication Required" code="407"/>
  3837. <enum name="Request Timeout" code="408"/>
  3838. <enum name="Gone" code="410"/>
  3839. @@ -1918,27 +2131,27 @@
  3840. <enum name="Request Entity Too Large" code="413"/>
  3841. <enum name="Request-URI Too Long" code="414"/>
  3842. <enum name="Unsupported Media Type" code="415"/>
  3843. - <enum name="Unsupported URI Scheme" code="416"/>
  3844. + <enum name="Unsupported URI Scheme" code="416"/>
  3845. <enum name="Unknown Resource-Priority" code="417"/>
  3846. - <enum name="Bad Extension" code="420"/>
  3847. - <enum name="Extension Required" code="421"/>
  3848. + <enum name="Bad Extension" code="420"/>
  3849. + <enum name="Extension Required" code="421"/>
  3850. <enum name="Session Interval Too Small" code="422"/>
  3851. <enum name="Interval Too Brief" code="423"/>
  3852. - <enum name="Use Identity Header" code="428"/>
  3853. + <enum name="Use Identity Header" code="428"/>
  3854. <enum name="Provide Referrer Identity" code="429"/>
  3855. <enum name="Bad Identity-Info" code="436"/>
  3856. - <enum name="Unsupported Certificate" code="437"/>
  3857. + <enum name="Unsupported Certificate" code="437"/>
  3858. <enum name="Invalid Identity Header" code="438"/>
  3859. - <enum name="Temporarily Unavailable" code="480"/>
  3860. - <enum name="Call/Transaction Does Not Exist" code="481"/>
  3861. + <enum name="Temporarily Unavailable" code="480"/>
  3862. + <enum name="Call/Transaction Does Not Exist" code="481"/>
  3863. <enum name="Loop Detected" code="482"/>
  3864. <enum name="Too Many Hops" code="483"/>
  3865. <enum name="Address Incomplete" code="484"/>
  3866. <enum name="Ambiguous" code="485"/>
  3867. <enum name="Busy Here" code="486"/>
  3868. <enum name="Request Terminated" code="487"/>
  3869. - <enum name="Not Acceptable Here" code="488"/>
  3870. - <enum name="Bad Event" code="489"/>
  3871. + <enum name="Not Acceptable Here" code="488"/>
  3872. + <enum name="Bad Event" code="489"/>
  3873. <enum name="Request Pending" code="491"/>
  3874. <enum name="Undecipherable" code="493"/>
  3875. <enum name="Security Agreement Required" code="494"/>
  3876. @@ -1950,12 +2163,12 @@
  3877. <enum name="Version Not Supported" code="505"/>
  3878. <enum name="Message Too Large" code="513"/>
  3879. <enum name="Precondition Failure" code="580"/>
  3880. - <enum name="Busy Everywhere" code="600"/>
  3881. + <enum name="Busy Everywhere" code="600"/>
  3882. <enum name="Decline" code="603"/>
  3883. <enum name="Does Not Exist Anywhere" code="604"/>
  3884. <enum name="Not Acceptable" code="606"/>
  3885. </avp>
  3886. - <avp name="Node-Functionality" code="862" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3887. + <avp name="Node-Functionality" code="862" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3888. <type type-name="Unsigned32"/>
  3889. <enum name="S-CSCF" code="0"/>
  3890. <enum name="P-CSCF" code="1"/>
  3891. @@ -1964,29 +2177,29 @@
  3892. <enum name="MGCF" code="4"/>
  3893. <enum name="BGCF" code="5"/>
  3894. <enum name="AS" code="6"/>
  3895. - <enum name="IBCF" code="7"/>
  3896. - <enum name="S-GW" code="8"/>
  3897. - <enum name="P-GW" code="9"/>
  3898. - </avp>
  3899. - <avp name="Service-Specific-Data" code="863" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3900. + <enum name="IBCF" code="7"/>
  3901. + <enum name="S-GW" code="8"/>
  3902. + <enum name="P-GW" code="9"/>
  3903. + </avp>
  3904. + <avp name="Service-Specific-Data" code="863" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3905. <type type-name="UTF8String"/>
  3906. </avp>
  3907. - <avp name="Originator" code="864" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3908. + <avp name="Originator" code="864" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3909. <type type-name="Enumerated"/>
  3910. <enum name="Calling Party" code="0"/>
  3911. <enum name="Called Party" code="1"/>
  3912. </avp>
  3913. - <avp name="PS-Furnish-Charging-Information" code="865" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3914. + <avp name="PS-Furnish-Charging-Information" code="865" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3915. <grouped>
  3916. <gavp name="GPRS-Charging-Id"/>
  3917. <gavp name="PS-Free-Format-Data"/>
  3918. <gavp name="PS-Append-Free-Format-Data"/>
  3919. </grouped>
  3920. </avp>
  3921. - <avp name="PS-Free-Format-Data" code="866" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3922. + <avp name="PS-Free-Format-Data" code="866" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3923. <type type-name="OctetString"/>
  3924. </avp>
  3925. - <avp name="PS-Append-Free-Format-Data" code="867" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3926. + <avp name="PS-Append-Free-Format-Data" code="867" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3927. <type type-name="Enumerated"/>
  3928. <enum name="Append" code="0"/>
  3929. <enum name="Overwrite" code="1"/>
  3930. @@ -1994,10 +2207,10 @@
  3931. <avp name="Time-Quota-Threshold" code="868" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
  3932. <type type-name="Unsigned32"/>
  3933. </avp>
  3934. - <avp name="Volume-Quota-Threshold" code="869" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3935. + <avp name="Volume-Quota-Threshold" code="869" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3936. <type type-name="Unsigned32"/>
  3937. </avp>
  3938. - <avp name="Trigger-Type" code="870" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3939. + <avp name="Trigger-Type" code="870" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3940. <type type-name="Enumerated"/>
  3941. <enum name="CHANGE_IN_SGSN_IP_ADDRESS" code="1"/>
  3942. <enum name="CHANGE_IN_QOS" code="2"/>
  3943. @@ -2021,17 +2234,17 @@
  3944. <enum name="CHANGEINLOCATION_MNC" code="31"/>
  3945. <enum name="CHANGEINLOCATION_RAC" code="32"/>
  3946. <enum name="CHANGEINLOCATION_LAC" code="33"/>
  3947. - <enum name="CHANGEINLOCATION_CellId" code="34"/>
  3948. - <enum name="CHANGE_IN_MEDIA_COMPOSITION" code="40"/>
  3949. - <enum name="CHANGEINPARTICIPANTS_Number" code="50"/>
  3950. - <enum name="CHANGE_IN_THRSHLD_OF_PARTICIPANTS_NMB" code="51"/>
  3951. - <enum name="CHANGE_IN_USER_PARTICIPATING_TYPE" code="52"/>
  3952. - <enum name="CHANGE_IN_SERVICE_CONDITION" code="60"/>
  3953. - </avp>
  3954. + <enum name="CHANGEINLOCATION_CellId" code="34"/>
  3955. + <enum name="CHANGE_IN_MEDIA_COMPOSITION" code="40"/>
  3956. + <enum name="CHANGEINPARTICIPANTS_Number" code="50"/>
  3957. + <enum name="CHANGE_IN_THRSHLD_OF_PARTICIPANTS_NMB" code="51"/>
  3958. + <enum name="CHANGE_IN_USER_PARTICIPATING_TYPE" code="52"/>
  3959. + <enum name="CHANGE_IN_SERVICE_CONDITION" code="60"/>
  3960. + </avp>
  3961. <avp name="Quota-Holding-Time" code="871" mandatory="must" vendor-bit="must" vendor-id="TGPP">
  3962. <type type-name="Unsigned32"/>
  3963. </avp>
  3964. - <avp name="Reporting-Reason" code="872" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3965. + <avp name="Reporting-Reason" code="872" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3966. <type type-name="Enumerated"/>
  3967. <enum name="THRESHOLD" code="0"/>
  3968. <enum name="QHT" code="1"/>
  3969. @@ -2043,7 +2256,7 @@
  3970. <enum name="FORCED_REAUTHORISATION" code="7"/>
  3971. <enum name="POOL_EXHAUSTED" code="8"/>
  3972. </avp>
  3973. - <avp name="Service-Information" code="873" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3974. + <avp name="Service-Information" code="873" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  3975. <grouped>
  3976. <gavp name="PS-Information"/>
  3977. <gavp name="WLAN-Information"/>
  3978. @@ -2080,17 +2293,17 @@
  3979. </grouped>
  3980. </avp>
  3981. <avp name="WLAN-Information" code="875" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
  3982. - <grouped>
  3983. - <gavp name="WLAN-Session-Id"/>
  3984. - <gavp name="PDG-Address"/>
  3985. - <gavp name="NPDG-Charging-Id"/>
  3986. - <gavp name="WAG-Address"/>
  3987. - <gavp name="WAG-PLMN-Id"/>
  3988. - <gavp name="WLAN-Radio-Container"/>
  3989. - <gavp name="WLAN-UE-Local-IPAddress"/>
  3990. - </grouped>
  3991. - </avp>
  3992. - <avp name="IMS-Information" code="876" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  3993. + <grouped>
  3994. + <gavp name="WLAN-Session-Id"/>
  3995. + <gavp name="PDG-Address"/>
  3996. + <gavp name="NPDG-Charging-Id"/>
  3997. + <gavp name="WAG-Address"/>
  3998. + <gavp name="WAG-PLMN-Id"/>
  3999. + <gavp name="WLAN-Radio-Container"/>
  4000. + <gavp name="WLAN-UE-Local-IPAddress"/>
  4001. + </grouped>
  4002. + </avp>
  4003. + <avp name="IMS-Information" code="876" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  4004. <grouped>
  4005. <gavp name="Event-Type"/>
  4006. <gavp name="Role-Of-Node"/>
  4007. @@ -2112,11 +2325,11 @@
  4008. <gavp name="Service-Id"/>
  4009. <gavp name="Service-Specific-Data"/>
  4010. <gavp name="Message-Body"/>
  4011. - <gavp name="Cause-Code"/>
  4012. - <gavp name="Access-Network-Information"/>
  4013. - <gavp name="Early-Media-Description"/>
  4014. - <gavp name="IMS-Communication-Service-Identifier"/>
  4015. - </grouped>
  4016. + <gavp name="Cause-Code"/>
  4017. + <gavp name="Access-Network-Information"/>
  4018. + <gavp name="Early-Media-Description"/>
  4019. + <gavp name="IMS-Communication-Service-Identifier"/>
  4020. + </grouped>
  4021. </avp>
  4022. <avp name="MMS-Information" code="877" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
  4023. <grouped>
  4024. @@ -2137,11 +2350,11 @@
  4025. <gavp name="Aux-Applic-Info"/>
  4026. <gavp name="Content-Class"/>
  4027. <gavp name="DRM-Content"/>
  4028. - <gavp name="Adaptations"/>
  4029. - <gavp name="VASP-Id"/>
  4030. - <gavp name="VAS-Id"/>
  4031. - </grouped>
  4032. - </avp>
  4033. + <gavp name="Adaptations"/>
  4034. + <gavp name="VASP-Id"/>
  4035. + <gavp name="VAS-Id"/>
  4036. + </grouped>
  4037. + </avp>
  4038. <avp name="LCS-Information" code="878" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
  4039. <grouped>
  4040. <gavp name="LCS-Client-ID"/>
  4041. @@ -2152,36 +2365,36 @@
  4042. <gavp name="MSISDN"/>
  4043. </grouped>
  4044. </avp>
  4045. - <avp name="PoC-Information" code="879" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  4046. + <avp name="PoC-Information" code="879" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  4047. <grouped>
  4048. <gavp name="PoC-Server-Role"/>
  4049. - <gavp name="PoC-Session-Type"/>
  4050. - <gavp name="PoC-User-Role"/>
  4051. - <gavp name="PoC-Session-Initiation-type"/>
  4052. - <gavp name="PoC-Event-Type"/>
  4053. - <gavp name="Number-Of-Participants"/>
  4054. - <gavp name="Participants-Involved"/>
  4055. - <gavp name="Participant-Group"/>
  4056. - <gavp name="Talk-Burst-Exchange"/>
  4057. + <gavp name="PoC-Session-Type"/>
  4058. + <gavp name="PoC-User-Role"/>
  4059. + <gavp name="PoC-Session-Initiation-type"/>
  4060. + <gavp name="PoC-Event-Type"/>
  4061. + <gavp name="Number-Of-Participants"/>
  4062. + <gavp name="Participants-Involved"/>
  4063. + <gavp name="Participant-Group"/>
  4064. + <gavp name="Talk-Burst-Exchange"/>
  4065. <gavp name="PoC-Controlling-Address"/>
  4066. - <gavp name="PoC-Group-Name"/>
  4067. - <gavp name="PoC-Session-Id"/>
  4068. - <gavp name="Charged-Party"/>
  4069. - </grouped>
  4070. + <gavp name="PoC-Group-Name"/>
  4071. + <gavp name="PoC-Session-Id"/>
  4072. + <gavp name="Charged-Party"/>
  4073. + </grouped>
  4074. </avp>
  4075. <avp name="MBMS-Information" code="880" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
  4076. - <grouped>
  4077. - <gavp name="TMGI"/>
  4078. - <gavp name="MBMS-Service-Type"/>
  4079. - <gavp name="MBMS-User-Service-Type"/>
  4080. - <gavp name="File-Repair-Supported"/>
  4081. - <gavp name="Required-MBMS-Bearer-Capabilities"/>
  4082. - <gavp name="MBMS-2G-3G-Indicator"/>
  4083. - <gavp name="RAI"/>
  4084. - <gavp name="MBMS-Service-Area"/>
  4085. - <gavp name="MBMS-Session-Identity"/>
  4086. - </grouped>
  4087. - </avp>
  4088. + <grouped>
  4089. + <gavp name="TMGI"/>
  4090. + <gavp name="MBMS-Service-Type"/>
  4091. + <gavp name="MBMS-User-Service-Type"/>
  4092. + <gavp name="File-Repair-Supported"/>
  4093. + <gavp name="Required-MBMS-Bearer-Capabilities"/>
  4094. + <gavp name="MBMS-2G-3G-Indicator"/>
  4095. + <gavp name="RAI"/>
  4096. + <gavp name="MBMS-Service-Area"/>
  4097. + <gavp name="MBMS-Session-Identity"/>
  4098. + </grouped>
  4099. + </avp>
  4100. <avp name="Quota-Consumption-Time" code="881" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
  4101. <type type-name="Unsigned32"/>
  4102. </avp>
  4103. @@ -2191,13 +2404,11 @@
  4104. <enum name="calling party" code="1"/>
  4105. <enum name="unknown" code="2"/>
  4106. </avp>
  4107. -
  4108. <avp name="PoC-Server-Role" code="883" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  4109. <type type-name="Enumerated"/>
  4110. <enum name="Participating PoC Server" code="0"/>
  4111. <enum name="Controlling PoC Server" code="1"/>
  4112. </avp>
  4113. -
  4114. <avp name="PoC-Session-Type" code="884" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  4115. <type type-name="Enumerated"/>
  4116. <enum name="1 to 1 PoC session" code="0"/>
  4117. @@ -2205,25 +2416,22 @@
  4118. <enum name="pre-arranged PoC group session" code="2"/>
  4119. <enum name="ad-hoc PoC group session" code="3"/>
  4120. </avp>
  4121. -
  4122. <avp name="Number-Of-Participants" code="885" mandatory="must" vendor-bit="must" vendor-id="TGPP">
  4123. <type type-name="Integer32"/>
  4124. </avp>
  4125. - <avp name="Originator-Address" code="886" mandatory="must" vendor-bit="must" vendor-id="TGPP">
  4126. - <grouped>
  4127. - <gavp name="Address-Type"/>
  4128. - <gavp name="Address-Data"/>
  4129. - <gavp name="Address-Domain"/>
  4130. + <avp name="Originator-Address" code="886" mandatory="must" vendor-bit="must" vendor-id="TGPP">
  4131. + <grouped>
  4132. + <gavp name="Address-Type"/>
  4133. + <gavp name="Address-Data"/>
  4134. + <gavp name="Address-Domain"/>
  4135. </grouped>
  4136. - </avp>
  4137. - <avp name="Participants-Involved" code="887" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4138. + </avp>
  4139. + <avp name="Participants-Involved" code="887" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4140. <type type-name="UTF8String"/>
  4141. </avp>
  4142. -
  4143. <avp name="Expires" code="888" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
  4144. <type type-name="Unsigned32"/>
  4145. </avp>
  4146. -
  4147. <avp name="Message-Body" code="889" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  4148. <grouped>
  4149. <gavp name="Content-Type"/>
  4150. @@ -2232,19 +2440,19 @@
  4151. <gavp name="Originator"/>
  4152. </grouped>
  4153. </avp>
  4154. - <avp name="WAG-Address" code="890" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  4155. + <avp name="WAG-Address" code="890" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  4156. <type type-name="IPAddress"/>
  4157. </avp>
  4158. - <avp name="WAG-PLMN-Id" code="891">
  4159. + <avp name="WAG-PLMN-Id" code="891" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
  4160. <type type-name="OctetString"/>
  4161. </avp>
  4162. <avp name="WLAN-Radio-Container" code="892" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  4163. <grouped>
  4164. - <gavp name="Operator-Name"/>
  4165. - <gavp name="Location-Type"/>
  4166. - <gavp name="Location-Information"/>
  4167. - <gavp name="WLAN-Technology"/>
  4168. - </grouped>
  4169. + <gavp name="Operator-Name"/>
  4170. + <gavp name="Location-Type"/>
  4171. + <gavp name="Location-Information"/>
  4172. + <gavp name="WLAN-Technology"/>
  4173. + </grouped>
  4174. </avp>
  4175. <avp name="WLAN-Technology" code="893" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  4176. <type type-name="Unsigned32"/>
  4177. @@ -2263,21 +2471,20 @@
  4178. </avp>
  4179. <avp name="Address-Domain" code="898" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  4180. <grouped>
  4181. - <gavp name="Domain-Name"/>
  4182. - <gavp name="3GPP-IMSI-MCC-MNC"/>
  4183. - </grouped>
  4184. + <gavp name="Domain-Name"/>
  4185. + <gavp name="3GPP-IMSI-MCC-MNC"/>
  4186. + </grouped>
  4187. </avp>
  4188. <avp name="Address-Type" code="899" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  4189. <type type-name="Enumerated"/>
  4190. - <enum name="e-mail address" code="0"/>
  4191. - <enum name="MSISDN" code="1"/>
  4192. - <enum name="IPv4 Address" code="2"/>
  4193. - <enum name="IPv6 Address" code="3"/>
  4194. - <enum name="Numeric Shortcode" code="4"/>
  4195. - <enum name="Alphanumeric Shortcode" code="5"/>
  4196. - <enum name="Other" code="6"/>
  4197. - </avp>
  4198. -
  4199. + <enum name="e-mail address" code="0"/>
  4200. + <enum name="MSISDN" code="1"/>
  4201. + <enum name="IPv4 Address" code="2"/>
  4202. + <enum name="IPv6 Address" code="3"/>
  4203. + <enum name="Numeric Shortcode" code="4"/>
  4204. + <enum name="Alphanumeric Shortcode" code="5"/>
  4205. + <enum name="Other" code="6"/>
  4206. + </avp>
  4207. <!--
  4208. 900 TMGI OctectString
  4209. 901 Required-MBMS-Bearer-Capabilities UTF8String
  4210. @@ -2314,11 +2521,11 @@
  4211. <gavp name="Charging-Rule-Definition"/>
  4212. <gavp name="Charging-Rule-Name"/>
  4213. <gavp name="Charging-Rule-Base-Name"/>
  4214. - <gavp name="Bearer-Identifier"/>
  4215. - <gavp name="Rule-Activation-Time"/>
  4216. - <gavp name="Rule-Deactivation-Time"/>
  4217. - <gavp name="Resource-Allocation-Notification"/>
  4218. - </grouped>
  4219. + <gavp name="Bearer-Identifier"/>
  4220. + <gavp name="Rule-Activation-Time"/>
  4221. + <gavp name="Rule-Deactivation-Time"/>
  4222. + <gavp name="Resource-Allocation-Notification"/>
  4223. + </grouped>
  4224. </avp>
  4225. <avp name="Charging-Rule-Remove" code="1002" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4226. <grouped>
  4227. @@ -2328,21 +2535,23 @@
  4228. </avp>
  4229. <avp name="Charging-Rule-Definition" code="1003" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4230. <grouped>
  4231. - <gavp name="Charging-Rule-Name"/>
  4232. - <gavp name="Service-Identifier"/>
  4233. - <gavp name="Rating-Group"/>
  4234. - <gavp name="Flow-Description"/>
  4235. - <gavp name="Flow-Informatio"/>
  4236. - <gavp name="Flow-Status"/>
  4237. - <gavp name="QoS-Information"/>
  4238. - <gavp name="Reporting-Level"/>
  4239. - <gavp name="Online"/>
  4240. - <gavp name="Offline"/>
  4241. - <gavp name="Metering-Method"/>
  4242. - <gavp name="Precedence"/>
  4243. - <gavp name="AF-Charging-Identifier"/>
  4244. - <gavp name="Flows"/>
  4245. - </grouped>
  4246. + <gavp name="Charging-Rule-Name"/>
  4247. + <gavp name="Service-Identifier"/>
  4248. + <gavp name="Rating-Group"/>
  4249. + <gavp name="Flow-Description"/>
  4250. + <gavp name="Flow-Information"/>
  4251. + <gavp name="Flow-Status"/>
  4252. + <gavp name="QoS-Information"/>
  4253. + <gavp name="Reporting-Level"/>
  4254. + <gavp name="Online"/>
  4255. + <gavp name="Offline"/>
  4256. + <gavp name="Metering-Method"/>
  4257. + <gavp name="Precedence"/>
  4258. + <gavp name="AF-Charging-Identifier"/>
  4259. + <gavp name="Flows"/>
  4260. + <gavp name="Monitoring-Key"/>
  4261. + <gavp name="AF-Signalling-Protocol"/>
  4262. + </grouped>
  4263. </avp>
  4264. <avp name="Charging-Rule-Base-Name" code="1004" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4265. <type type-name="UTF8String"/>
  4266. @@ -2352,40 +2561,46 @@
  4267. </avp>
  4268. <avp name="Event-Trigger" code="1006" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4269. <type type-name="Enumerated"/>
  4270. - <enum name="SGSN CHANGE" code="0"/>
  4271. - <enum name="QOS CHANGE" code="1"/>
  4272. - <enum name="RAT CHANGE" code="2"/>
  4273. - <enum name="TFT CHANGE" code="3"/>
  4274. - <enum name="PLMN CHANGE" code="4"/>
  4275. - <enum name="LOSS_OF_BEARER" code="5"/>
  4276. - <enum name="RECOVERY_OF_BEARER" code="6"/>
  4277. - <enum name="IP-CAN_CHANGE" code="7"/>
  4278. - <enum name="GW-PCEF-MALFUNCTION" code="8"/>
  4279. - <enum name="RESOURCES_LIMITATION" code="9"/>
  4280. - <enum name="MAX_NR_BEARERS_REACHED" code="10"/>
  4281. - <enum name="QOS_CHANGE_EXCEEDING_AUTHORIZATION" code="11"/>
  4282. - <enum name="NO_EVENT_TRIGGER" code="12"/>
  4283. - <enum name="USER_LOCATION_CHANGE" code="13"/>
  4284. - <enum name="NO_EVENT_TRIGGERS" code="14"/>
  4285. - <enum name="OUT_OF_CREDIT" code="15"/>
  4286. - <enum name="REALLOCATION_OF_CREDIT" code="16"/>
  4287. - <enum name="REVALIDATION_TIMEOUT" code="17"/>
  4288. - <enum name="UE_IP_ADDRESS_ALLOCATE" code="18"/>
  4289. - <enum name="UE_IP_ADDRESS_RELEASE" code="19"/>
  4290. - <enum name="DEFAULT_EPS_BEARER_QOS_CHANGE" code="20"/>
  4291. - <enum name="AN_GW_CHANGE" code="21"/>
  4292. - <enum name="SUCCESSFUL_RESOURCE_ALLOCATION" code="22"/>
  4293. - <enum name="RESOURCE_MODIFICATION_REQUEST" code="23"/>
  4294. - <enum name="TFT DELETED" code="1000"/>
  4295. - <enum name="LOSS OF BEARER" code="1001"/>
  4296. - <enum name="RECOVERY OF BEARER" code="1002"/>
  4297. - <enum name="POLICY ENFORCEMENT FAILED" code="1003"/>
  4298. + <enum name="SGSN CHANGE" code="0"/>
  4299. + <enum name="QOS CHANGE" code="1"/>
  4300. + <enum name="RAT CHANGE" code="2"/>
  4301. + <enum name="TFT CHANGE" code="3"/>
  4302. + <enum name="PLMN CHANGE" code="4"/>
  4303. + <enum name="LOSS_OF_BEARER" code="5"/>
  4304. + <enum name="RECOVERY_OF_BEARER" code="6"/>
  4305. + <enum name="IP-CAN_CHANGE" code="7"/>
  4306. + <enum name="GW-PCEF-MALFUNCTION" code="8"/>
  4307. + <enum name="RESOURCES_LIMITATION" code="9"/>
  4308. + <enum name="MAX_NR_BEARERS_REACHED" code="10"/>
  4309. + <enum name="QOS_CHANGE_EXCEEDING_AUTHORIZATION" code="11"/>
  4310. + <enum name="NO_EVENT_TRIGGER" code="12"/>
  4311. + <enum name="USER_LOCATION_CHANGE" code="13"/>
  4312. + <enum name="NO_EVENT_TRIGGERS" code="14"/>
  4313. + <enum name="OUT_OF_CREDIT" code="15"/>
  4314. + <enum name="REALLOCATION_OF_CREDIT" code="16"/>
  4315. + <enum name="REVALIDATION_TIMEOUT" code="17"/>
  4316. + <enum name="UE_IP_ADDRESS_ALLOCATE" code="18"/>
  4317. + <enum name="UE_IP_ADDRESS_RELEASE" code="19"/>
  4318. + <enum name="DEFAULT_EPS_BEARER_QOS_CHANGE" code="20"/>
  4319. + <enum name="AN_GW_CHANGE" code="21"/>
  4320. + <enum name="SUCCESSFUL_RESOURCE_ALLOCATION" code="22"/>
  4321. + <enum name="RESOURCE_MODIFICATION_REQUEST" code="23"/>
  4322. + <enum name="PGW_TRACE_CONTROL" code="24"/>
  4323. + <enum name="UE_TIME_ZONE_CHANGE" code="25"/>
  4324. + <enum name="USAGE_REPORT" code="26"/>
  4325. + <enum name="TAI_CHANGE" code="27"/>
  4326. + <enum name="ECGI_CHANGE" code="28"/>
  4327. + <enum name="TIME_CHANGE" code="100"/>
  4328. + <enum name="TFT DELETED" code="1000"/>
  4329. + <enum name="LOSS OF BEARER" code="1001"/>
  4330. + <enum name="RECOVERY OF BEARER" code="1002"/>
  4331. + <enum name="POLICY ENFORCEMENT FAILED" code="1003"/>
  4332. </avp>
  4333. <avp name="Metering-Method" code="1007" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4334. <type type-name="Enumerated"/>
  4335. - <enum name="DURATION" code="0" />
  4336. - <enum name="VOLUME" code="1" />
  4337. - <enum name="DURATION_VOLUME" code="1" />
  4338. + <enum name="DURATION" code="0"/>
  4339. + <enum name="VOLUME" code="1"/>
  4340. + <enum name="DURATION_VOLUME" code="2"/>
  4341. </avp>
  4342. <avp name="Offline" code="1008" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4343. <type type-name="Enumerated"/>
  4344. @@ -2412,17 +2627,17 @@
  4345. <grouped>
  4346. <gavp name="Precedence"/>
  4347. <gavp name="TFT-Filter"/>
  4348. - <gavp name="TOS-Traffic-Class"/>
  4349. - <gavp name="Security-Parameter-Index"/>
  4350. - <gavp name="Flow-Label"/>
  4351. - </grouped>
  4352. + <gavp name="TOS-Traffic-Class"/>
  4353. + <gavp name="Security-Parameter-Index"/>
  4354. + <gavp name="Flow-Label"/>
  4355. + </grouped>
  4356. </avp>
  4357. <avp name="ToS-Traffic-Class" code="1014" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4358. - <type type-name="OctetString"/>
  4359. + <type type-name="OctetString"/>
  4360. </avp>
  4361. <avp name="PDP-Session-operation" code="1015" vendor-id="TGPP" protected="may" mandatory="must" may-encrypt="yes" vendor-bit="must">
  4362. <type type-name="Unsigned32" />
  4363. - <enum name="PDP-SESSION-TERMINATION" code="0" />
  4364. + <enum name="PDP-SESSION-TERMINATION" code="0"/>
  4365. </avp>
  4366. <avp name="QoS-Information" code="1016" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4367. <grouped>
  4368. @@ -2432,73 +2647,73 @@
  4369. <gavp name="Guaranteed-Bitrate-UL"/>
  4370. <gavp name="Guaranteed-Bitrate-DL"/>
  4371. <gavp name="Bearer-Identifier"/>
  4372. - <gavp name="Allocation-Retention-Priority"/>
  4373. - <gavp name="APN-Aggregate-Max-Bitrate-UL"/>
  4374. - <gavp name="APN-Aggregate-Max-Bitrate-DL"/>
  4375. - </grouped>
  4376. + <gavp name="Allocation-Retention-Priority"/>
  4377. + <gavp name="APN-Aggregate-Max-Bitrate-UL"/>
  4378. + <gavp name="APN-Aggregate-Max-Bitrate-DL"/>
  4379. + </grouped>
  4380. </avp>
  4381. - <avp name="Charging-Rule-Report" code="1018" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4382. + <avp name="Charging-Rule-Report" code="1018" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4383. <grouped>
  4384. <gavp name="Charging-Rule-Base-Name"/>
  4385. <gavp name="Charging-Rule-Name"/>
  4386. - <gavp name="Bearer-Identifier"/>
  4387. - <gavp name="PCC-Rule-Status"/>
  4388. - <gavp name="Rule-Failure-Code"/>
  4389. - <gavp name="Final-Unit-Indication"/>
  4390. - </grouped>
  4391. - </avp>
  4392. - <avp name="PCC-Rule-Status" code="1019" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4393. - <type type-name="Unsigned32"/>
  4394. - <enum name="ACTIVE" code="0"/>
  4395. - <enum name="INACTIVE" code="1"/>
  4396. - <enum name="TEMPORARY_INACTIVE" code="2"/>
  4397. - </avp>
  4398. - <avp name="Bearer-Identifier" code="1020" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4399. - <type type-name="OctetString"/>
  4400. - </avp>
  4401. - <avp name="Bearer-Operation" code="1021" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4402. - <type type-name="Enumerated"/>
  4403. - <enum name="TERMINATION" code="0"/>
  4404. - <enum name="ESTABLISHMENT" code="1"/>
  4405. - <enum name="MODIFICATION" code="2"/>
  4406. - </avp>
  4407. - <avp name="Access-Network-Charging-Identifier-Gx" code="1022" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4408. - <grouped>
  4409. - <gavp name="Access-Network-Charging-Identifier-Value"/>
  4410. - <gavp name="Charging-Rule-Base-Name"/>
  4411. - <gavp name="Charging-Rule-Name"/>
  4412. - </grouped>
  4413. - </avp>
  4414. - <avp name="Bearer-Control-Mode" code="1023" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4415. - <type type-name="Enumerated"/>
  4416. - <enum name="UE_ONLY" code="0"/>
  4417. - <enum name="RESERVED" code="1"/>
  4418. - <enum name="UE_NW" code="2"/>
  4419. - </avp>
  4420. - <avp name="Network-Request-Support" code="1024" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4421. - <type type-name="Enumerated"/>
  4422. - <enum name="NETWORK_REQUEST NOT SUPPORTED" code="0"/>
  4423. - <enum name="NETWORK_REQUEST SUPPORTED" code="1"/>
  4424. - </avp>
  4425. - <avp name="Guaranteed-Bitrate-DL" code="1025" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4426. - <type type-name="Unsigned32"/>
  4427. - </avp>
  4428. - <avp name="Guaranteed-Bitrate-UL" code="1026" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4429. + <gavp name="Bearer-Identifier"/>
  4430. + <gavp name="PCC-Rule-Status"/>
  4431. + <gavp name="Rule-Failure-Code"/>
  4432. + <gavp name="Final-Unit-Indication"/>
  4433. + </grouped>
  4434. + </avp>
  4435. + <avp name="PCC-Rule-Status" code="1019" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4436. <type type-name="Unsigned32"/>
  4437. + <enum name="ACTIVE" code="0"/>
  4438. + <enum name="INACTIVE" code="1"/>
  4439. + <enum name="TEMPORARY_INACTIVE" code="2"/>
  4440. </avp>
  4441. - <avp name="IP-CAN-Type" code="1027" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4442. - <type type-name="Enumerated"/>
  4443. - <enum name="3GPP-GPRS" code="0"/>
  4444. - <enum name="DOCSIS" code="1"/>
  4445. - <enum name="xDSL" code="2"/>
  4446. - <enum name="WiMAX" code="3"/>
  4447. - <enum name="3GPP2" code="4"/>
  4448. - <enum name="3GPP-EPS" code="5"/>
  4449. - </avp>
  4450. - <avp name="QoS-Class-Identifier" code="1028" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4451. + <avp name="Bearer-Identifier" code="1020" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4452. + <type type-name="OctetString"/>
  4453. + </avp>
  4454. + <avp name="Bearer-Operation" code="1021" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4455. <type type-name="Enumerated"/>
  4456. - <enum name="None" code="0"/>
  4457. - <enum name="Conversational" code="1"/>
  4458. + <enum name="TERMINATION" code="0"/>
  4459. + <enum name="ESTABLISHMENT" code="1"/>
  4460. + <enum name="MODIFICATION" code="2"/>
  4461. + </avp>
  4462. + <avp name="Access-Network-Charging-Identifier-Gx" code="1022" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4463. + <grouped>
  4464. + <gavp name="Access-Network-Charging-Identifier-Value"/>
  4465. + <gavp name="Charging-Rule-Base-Name"/>
  4466. + <gavp name="Charging-Rule-Name"/>
  4467. + </grouped>
  4468. + </avp>
  4469. + <avp name="Bearer-Control-Mode" code="1023" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4470. + <type type-name="Enumerated"/>
  4471. + <enum name="UE_ONLY" code="0"/>
  4472. + <enum name="RESERVED" code="1"/>
  4473. + <enum name="UE_NW" code="2"/>
  4474. + </avp>
  4475. + <avp name="Network-Request-Support" code="1024" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4476. + <type type-name="Enumerated"/>
  4477. + <enum name="NETWORK_REQUEST NOT SUPPORTED" code="0"/>
  4478. + <enum name="NETWORK_REQUEST SUPPORTED" code="1"/>
  4479. + </avp>
  4480. + <avp name="Guaranteed-Bitrate-DL" code="1025" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4481. + <type type-name="Unsigned32"/>
  4482. + </avp>
  4483. + <avp name="Guaranteed-Bitrate-UL" code="1026" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4484. + <type type-name="Unsigned32"/>
  4485. + </avp>
  4486. + <avp name="IP-CAN-Type" code="1027" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4487. + <type type-name="Enumerated"/>
  4488. + <enum name="3GPP-GPRS" code="0"/>
  4489. + <enum name="DOCSIS" code="1"/>
  4490. + <enum name="xDSL" code="2"/>
  4491. + <enum name="WiMAX" code="3"/>
  4492. + <enum name="3GPP2" code="4"/>
  4493. + <enum name="3GPP-EPS" code="5"/>
  4494. + </avp>
  4495. + <avp name="QoS-Class-Identifier" code="1028" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4496. + <type type-name="Enumerated"/>
  4497. + <enum name="None" code="0"/>
  4498. + <enum name="Conversational" code="1"/>
  4499. <enum name="Conversational" code="2"/>
  4500. <enum name="Streaming" code="3"/>
  4501. <enum name="Streaming" code="4"/>
  4502. @@ -2509,231 +2724,235 @@
  4503. <enum name="Background" code="9"/>
  4504. <enum name="OTHER" code="0xFFFFFFFF"/>
  4505. </avp>
  4506. - <avp name="QoS-Negotiation" code="1029" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4507. - <type type-name="Enumerated"/>
  4508. - <enum name="NO_QoS_NEGOTIATION" code="0"/>
  4509. - <enum name="QoS_NEGOTIATION_SUPPORTED" code="1"/>
  4510. - </avp>
  4511. - <avp name="QoS-Upgrade" code="1030" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4512. - <type type-name="Enumerated"/>
  4513. - <enum name="QoS_UPGRADE_NOT_SUPPORTED" code="0"/>
  4514. - <enum name="QoS_UPGRADE_SUPPORTED" code="1"/>
  4515. - </avp>
  4516. - <avp name="Rule-Failure-Code" code="1031" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4517. - <type type-name="Enumerated"/>
  4518. - <enum name="UNKNOWN_RULE_NAME" code="1"/>
  4519. - <enum name="RATING_GROUP_ERROR" code="2"/>
  4520. - <enum name="SERVICE_IDENTIFIER_ERROR" code="3"/>
  4521. - <enum name="GW/PCEF_MALFUNCTION" code="4"/>
  4522. - <enum name="RESOURCES_LIMITATION" code="5"/>
  4523. - <enum name="MAX_NR_BEARERS_REACHED" code="6"/>
  4524. - <enum name="UNKNOWN_BEARER_ID" code="7"/>
  4525. - <enum name="MISSING_BEARER_ID" code="8"/>
  4526. - <enum name="MISSING_FLOW_DESCRIPTION" code="9"/>
  4527. - <enum name="RESOURCE_ALLOCATION_FAILURE" code="10"/>
  4528. - <enum name="UNSUCCESSFUL_QOS_VALIDATION" code="11"/>
  4529. - </avp>
  4530. - <avp name="RAT-Type" code="1032" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4531. - <type type-name="Enumerated" />
  4532. - <enum name="WLAN" code="0" />
  4533. - <enum name="UTRAN" code="1000" />
  4534. - <enum name="GERAN" code="1001" />
  4535. - <enum name="GAN" code="1002" />
  4536. - <enum name="HSPA_EVOLUTION" code="1003" />
  4537. - <enum name="EUTRAN" code="1004" />
  4538. - <enum name="CDMA2000_1X" code="2000" />
  4539. - <enum name="HRPD" code="2001" />
  4540. - <enum name="UMB" code="2002" />
  4541. - </avp>
  4542. - <avp name="Event-Report-Indication" code="1033" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4543. - <grouped>
  4544. - <gavp name="Event-Trigger"/>
  4545. - <gavp name="RAT-Type"/>
  4546. - <gavp name="QoS-Information"/>
  4547. - <gavp name="RAI"/>
  4548. - <gavp name="3GPP-User-Location-Info"/>
  4549. - </grouped>
  4550. - </avp>
  4551. - <avp name="Allocation-Retention-Priority" code="1034" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4552. - <grouped>
  4553. - <gavp name="Priority-Level"/>
  4554. - <gavp name="Pre-emption-Capability"/>
  4555. - <gavp name="Pre-emption-Vulnerability"/>
  4556. - </grouped>
  4557. - </avp>
  4558. - <avp name="CoA-IP-Address" code="1035" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4559. - <type type-name="IPAddress"/>
  4560. - </avp>
  4561. - <avp name="Tunnel-Header-Filter" code="1036" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4562. - <type type-name="IPFilterRule"/>
  4563. - </avp>
  4564. - <avp name="Tunnel-Header-Length" code="1037" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4565. - <type type-name="Unsigned32"/>
  4566. - </avp>
  4567. - <avp name="Tunnel-Information" code="1038" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4568. - <grouped>
  4569. - <gavp name="Tunnel-Header-Length"/>
  4570. - <gavp name="Tunnel-Header-Filter"/>
  4571. - </grouped>
  4572. - </avp>
  4573. - <avp name="CoA-Information" code="1039" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4574. - <grouped>
  4575. - <gavp name="Tunnel-Information"/>
  4576. - <gavp name="CoA-IP-Address"/>
  4577. - </grouped>
  4578. - </avp>
  4579. - <avp name="APN-Aggregate-Max-Bitrate-DL" code="1040" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4580. - <type type-name="Unsigned32"/>
  4581. - </avp>
  4582. - <avp name="APN-Aggregate-Max-Bitrate-UL" code="1041" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4583. - <type type-name="Unsigned32"/>
  4584. - </avp>
  4585. - <avp name="Revalidation-Time" code="1042" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4586. - <type type-name="Time"/>
  4587. - </avp>
  4588. - <avp name="Rule-Activation-Time" code="1043" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4589. - <type type-name="Time"/>
  4590. - </avp>
  4591. - <avp name="Rule-DeActivation-Time" code="1044" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4592. - <type type-name="Time"/>
  4593. - </avp>
  4594. - <avp name="Session-Release-Cause" code="1045" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4595. - <type type-name="Enumerated"/>
  4596. - <enum name="UNSPECIFIED_REASON" code="0"/>
  4597. - <enum name="UE_SUBSCRIPTION_REASON" code="1"/>
  4598. - <enum name="INSUFFICIENT_SERVER_RESOURCES" code="2"/>
  4599. - </avp>
  4600. - <avp name="Priority-Level" code="1046" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4601. - <type type-name="Unsigned32"/>
  4602. - </avp>
  4603. - <avp name="Pre-emption-Capability" code="1047" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4604. - <type type-name="Enumerated"/>
  4605. - <enum name="PRE-EMPTION_CAPABILITY_ENABLED" code="0"/>
  4606. - <enum name="PRE-EMPTION_CAPABILITY_DISABLED" code="1"/>
  4607. - </avp>
  4608. - <avp name="Pre-emption-Vulnerability" code="1048" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4609. - <type type-name="Enumerated"/>
  4610. - <enum name="PRE-EMPTION_VULNERABILITY_ENABLED" code="0"/>
  4611. - <enum name="PRE-EMPTION_VULNERABILITY_DISABLED" code="1"/>
  4612. - </avp>
  4613. - <avp name="Default-EPS-Bearer-QoS" code="1049" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4614. - <grouped>
  4615. - <gavp name="QoS-Class-Identifier"/>
  4616. - <gavp name="Allocation-Retention-Priority"/>
  4617. - </grouped>
  4618. - </avp>
  4619. - <avp name="AN-GW-Address" code="1050" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4620. - <type type-name="IPAddress"/>
  4621. - </avp>
  4622. - <avp name="Resource-Allocation-Notification" code="1051" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4623. - <type type-name="Enumerated"/>
  4624. - <enum name="ENABLE_NOTIFICATION" code="0"/>
  4625. - </avp>
  4626. - <avp name="QoS-Rule-Remove" code="1052" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4627. - <grouped>
  4628. - <gavp name="QoS-Rule-Name"/>
  4629. - </grouped>
  4630. - </avp>
  4631. - <avp name="QoS-Rule-Definition" code="1053" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4632. - <grouped>
  4633. - <gavp name="QoS-Rule-Name"/>
  4634. - <gavp name="Flow-Information"/>
  4635. - <gavp name="QoS-Information"/>
  4636. - <gavp name="Precedence"/>
  4637. - </grouped>
  4638. - </avp>
  4639. - <avp name="QoS-Rule-Name" code="1054" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4640. - <type type-name="OctetString,"/>
  4641. - </avp>
  4642. - <avp name="QoS-Rule-Report" code="1055" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4643. - <grouped>
  4644. - <gavp name="QoS-Rule-Name"/>
  4645. - <gavp name="PCC-Rule-Status"/>
  4646. - <gavp name="Rule-Failure-Code"/>
  4647. - </grouped>
  4648. - </avp>
  4649. - <avp name="Security-Parameter-Index" code="1056" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4650. - <type type-name="OctetString"/>
  4651. - </avp>
  4652. - <avp name="Flow-Label" code="1057" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4653. - <type type-name="OctetString"/>
  4654. - </avp>
  4655. - <avp name="Flow-Information" code="1058" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4656. - <grouped>
  4657. - <gavp name="Flow-Description"/>
  4658. - <gavp name="Packet-Filter-Identifier"/>
  4659. - <gavp name="ToS-Traffic-Class"/>
  4660. - <gavp name="Security-Parameter-Index"/>
  4661. - <gavp name="Flow-Label"/>
  4662. - </grouped>
  4663. - </avp>
  4664. - <avp name="Packet-Filter-Content" code="1059" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4665. - <type type-name="IPFilterRule"/>
  4666. - </avp>
  4667. - <avp name="Packet-Filter-Identifier" code="1060" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4668. - <type type-name="OctetString"/>
  4669. - </avp>
  4670. - <avp name="Packet-Filter-Information" code="1061" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4671. - <grouped>
  4672. - <gavp name="Packet-Filter-Identifier"/>
  4673. - <gavp name="Precedence"/>
  4674. - <gavp name="Packet-Filter-Content"/>
  4675. - <gavp name="ToS-Traffic-Class"/>
  4676. - <gavp name="Security-Parameter-Index"/>
  4677. - <gavp name="Flow-Label"/>
  4678. - </grouped>
  4679. - </avp>
  4680. - <avp name="Packet-Filter-Operation" code="1062" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4681. - <type type-name="Enumerated"/>
  4682. - <enum name="DELETION" code="0"/>
  4683. - <enum name="ADDITION" code="1"/>
  4684. - <enum name="MODIFICATION" code="2"/>
  4685. - </avp>
  4686. - <avp name="Resource-Allocation-Notification" code="1063" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4687. - <type type-name="Enumerated"/>
  4688. - <enum name="ENABLE_NOTIFICATION" code="0"/>
  4689. - </avp>
  4690. - <avp name="Session-Linking-Indicator" code="1064" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4691. - <type type-name="Enumerated"/>
  4692. - <enum name="SESSION_LINKING_IMMEDIATE" code="0"/>
  4693. - <enum name="SESSION_LINKING_DEFERRED" code="1"/>
  4694. - </avp>
  4695. - <avp name="PDN-Connection-ID" code="1065" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4696. - <type type-name="OctetString"/>
  4697. - </avp>
  4698. - <avp name="Monitoring-Key" code="1066" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4699. - <type type-name="OctetString"/>
  4700. - </avp>
  4701. - <avp name="Usage-Monitoring-Information" code="1067" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4702. - <grouped>
  4703. - <gavp name="Monitoring-Key"/>
  4704. - <gavp name="Granted-Service-Unit"/>
  4705. - <gavp name="Used-Service-Unit"/>
  4706. - <gavp name="Usage-Monitoring-Level"/>
  4707. - <gavp name="Usage-Monitoring-Report"/>
  4708. - <gavp name="Usage-Monitoring-Support"/>
  4709. - </grouped>
  4710. - </avp>
  4711. - <avp name="Usage-Monitoring-Level" code="1068" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4712. - <type type-name="Enumerated"/>
  4713. - <enum name="SESSION_LEVEL" code="0"/>
  4714. - <enum name="PCC_RULE_LEVEL" code="1"/>
  4715. - </avp>
  4716. - <avp name="Usage-Monitoring-Report" code="1069" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4717. - <type type-name="Enumerated"/>
  4718. - <enum name="USAGE_MONITORING_REPORT_REQUIRED" code="0"/>
  4719. - </avp>
  4720. - <avp name="Usage-Monitoring-Support" code="1070" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4721. - <type type-name="Enumerated"/>
  4722. - <enum name="USAGE_MONITORING_DISABLED" code="0"/>
  4723. - </avp>
  4724. - <avp name="CSG-Information-Reporting" code="1071" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4725. - <type type-name="Enumerated"/>
  4726. - <enum name="CHANGE_CSG_CELL" code="0"/>
  4727. - <enum name="CHANGE_CSG_SUBSCRIBED_HYBRID_CELL" code="1"/>
  4728. - <enum name="CHANGE_CSG_UNSUBSCRIBED_HYBRID_CELL" code="2"/>
  4729. - </avp>
  4730. - <!-- Note: The AVP codes from 1072 to 1099 are reserved for TS 29.212 -->
  4731. + <avp name="QoS-Negotiation" code="1029" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4732. + <type type-name="Enumerated"/>
  4733. + <enum name="NO_QoS_NEGOTIATION" code="0"/>
  4734. + <enum name="QoS_NEGOTIATION_SUPPORTED" code="1"/>
  4735. + </avp>
  4736. + <avp name="QoS-Upgrade" code="1030" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4737. + <type type-name="Enumerated"/>
  4738. + <enum name="QoS_UPGRADE_NOT_SUPPORTED" code="0"/>
  4739. + <enum name="QoS_UPGRADE_SUPPORTED" code="1"/>
  4740. + </avp>
  4741. + <avp name="Rule-Failure-Code" code="1031" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4742. + <type type-name="Enumerated"/>
  4743. + <enum name="UNKNOWN_RULE_NAME" code="1"/>
  4744. + <enum name="RATING_GROUP_ERROR" code="2"/>
  4745. + <enum name="SERVICE_IDENTIFIER_ERROR" code="3"/>
  4746. + <enum name="GW/PCEF_MALFUNCTION" code="4"/>
  4747. + <enum name="RESOURCES_LIMITATION" code="5"/>
  4748. + <enum name="MAX_NR_BEARERS_REACHED" code="6"/>
  4749. + <enum name="UNKNOWN_BEARER_ID" code="7"/>
  4750. + <enum name="MISSING_BEARER_ID" code="8"/>
  4751. + <enum name="MISSING_FLOW_DESCRIPTION" code="9"/>
  4752. + <enum name="RESOURCE_ALLOCATION_FAILURE" code="10"/>
  4753. + <enum name="UNSUCCESSFUL_QOS_VALIDATION" code="11"/>
  4754. + </avp>
  4755. + <avp name="RAT-Type" code="1032" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4756. + <type type-name="Enumerated" />
  4757. + <enum name="WLAN" code="0" />
  4758. + <enum name="UTRAN" code="1000" />
  4759. + <enum name="GERAN" code="1001" />
  4760. + <enum name="GAN" code="1002" />
  4761. + <enum name="HSPA_EVOLUTION" code="1003" />
  4762. + <enum name="EUTRAN" code="1004" />
  4763. + <enum name="CDMA2000_1X" code="2000" />
  4764. + <enum name="HRPD" code="2001" />
  4765. + <enum name="UMB" code="2002" />
  4766. + </avp>
  4767. + <avp name="Event-Report-Indication" code="1033" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4768. + <grouped>
  4769. + <gavp name="Event-Trigger"/>
  4770. + <gavp name="RAT-Type"/>
  4771. + <gavp name="QoS-Information"/>
  4772. + <gavp name="RAI"/>
  4773. + <gavp name="3GPP-User-Location-Info"/>
  4774. + </grouped>
  4775. + </avp>
  4776. + <avp name="Allocation-Retention-Priority" code="1034" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4777. + <grouped>
  4778. + <gavp name="Priority-Level"/>
  4779. + <gavp name="Pre-emption-Capability"/>
  4780. + <gavp name="Pre-emption-Vulnerability"/>
  4781. + </grouped>
  4782. + </avp>
  4783. + <avp name="CoA-IP-Address" code="1035" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4784. + <type type-name="IPAddress"/>
  4785. + </avp>
  4786. + <avp name="Tunnel-Header-Filter" code="1036" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4787. + <type type-name="IPFilterRule"/>
  4788. + </avp>
  4789. + <avp name="Tunnel-Header-Length" code="1037" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4790. + <type type-name="Unsigned32"/>
  4791. + </avp>
  4792. + <avp name="Tunnel-Information" code="1038" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4793. + <grouped>
  4794. + <gavp name="Tunnel-Header-Length"/>
  4795. + <gavp name="Tunnel-Header-Filter"/>
  4796. + </grouped>
  4797. + </avp>
  4798. + <avp name="CoA-Information" code="1039" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4799. + <grouped>
  4800. + <gavp name="Tunnel-Information"/>
  4801. + <gavp name="CoA-IP-Address"/>
  4802. + </grouped>
  4803. + </avp>
  4804. + <avp name="APN-Aggregate-Max-Bitrate-DL" code="1040" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4805. + <type type-name="Unsigned32"/>
  4806. + </avp>
  4807. + <avp name="APN-Aggregate-Max-Bitrate-UL" code="1041" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4808. + <type type-name="Unsigned32"/>
  4809. + </avp>
  4810. + <avp name="Revalidation-Time" code="1042" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4811. + <type type-name="Time"/>
  4812. + </avp>
  4813. + <avp name="Rule-Activation-Time" code="1043" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4814. + <type type-name="Time"/>
  4815. + </avp>
  4816. + <avp name="Rule-DeActivation-Time" code="1044" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4817. + <type type-name="Time"/>
  4818. + </avp>
  4819. + <avp name="Session-Release-Cause" code="1045" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4820. + <type type-name="Enumerated"/>
  4821. + <enum name="UNSPECIFIED_REASON" code="0"/>
  4822. + <enum name="UE_SUBSCRIPTION_REASON" code="1"/>
  4823. + <enum name="INSUFFICIENT_SERVER_RESOURCES" code="2"/>
  4824. + </avp>
  4825. + <avp name="Priority-Level" code="1046" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4826. + <type type-name="Unsigned32"/>
  4827. + </avp>
  4828. + <avp name="Pre-emption-Capability" code="1047" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4829. + <type type-name="Enumerated"/>
  4830. + <enum name="PRE-EMPTION_CAPABILITY_ENABLED" code="0"/>
  4831. + <enum name="PRE-EMPTION_CAPABILITY_DISABLED" code="1"/>
  4832. + </avp>
  4833. + <avp name="Pre-emption-Vulnerability" code="1048" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4834. + <type type-name="Enumerated"/>
  4835. + <enum name="PRE-EMPTION_VULNERABILITY_ENABLED" code="0"/>
  4836. + <enum name="PRE-EMPTION_VULNERABILITY_DISABLED" code="1"/>
  4837. + </avp>
  4838. + <avp name="Default-EPS-Bearer-QoS" code="1049" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4839. + <grouped>
  4840. + <gavp name="QoS-Class-Identifier"/>
  4841. + <gavp name="Allocation-Retention-Priority"/>
  4842. + </grouped>
  4843. + </avp>
  4844. + <avp name="AN-GW-Address" code="1050" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4845. + <type type-name="IPAddress"/>
  4846. + </avp>
  4847. + <avp name="QoS-Rule-Install" code="1051" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4848. + <grouped>
  4849. + <gavp name="QoS-Rule-Definition"/>
  4850. + <gavp name="Tunnel-Information"/>
  4851. + <gavp name="Access-Network-Charging-Identifier-Value"/>
  4852. + <gavp name="Resource-Allocation-Notification"/>
  4853. + </grouped>
  4854. + </avp>
  4855. + <avp name="QoS-Rule-Remove" code="1052" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4856. + <grouped>
  4857. + <gavp name="QoS-Rule-Name"/>
  4858. + </grouped>
  4859. + </avp>
  4860. + <avp name="QoS-Rule-Definition" code="1053" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4861. + <grouped>
  4862. + <gavp name="QoS-Rule-Name"/>
  4863. + <gavp name="Flow-Information"/>
  4864. + <gavp name="QoS-Information"/>
  4865. + <gavp name="Precedence"/>
  4866. + </grouped>
  4867. + </avp>
  4868. + <avp name="QoS-Rule-Name" code="1054" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4869. + <type type-name="OctetString"/>
  4870. + </avp>
  4871. + <avp name="QoS-Rule-Report" code="1055" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4872. + <grouped>
  4873. + <gavp name="QoS-Rule-Name"/>
  4874. + <gavp name="PCC-Rule-Status"/>
  4875. + <gavp name="Rule-Failure-Code"/>
  4876. + </grouped>
  4877. + </avp>
  4878. + <avp name="Security-Parameter-Index" code="1056" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4879. + <type type-name="OctetString"/>
  4880. + </avp>
  4881. + <avp name="Flow-Label" code="1057" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4882. + <type type-name="OctetString"/>
  4883. + </avp>
  4884. + <avp name="Flow-Information" code="1058" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4885. + <grouped>
  4886. + <gavp name="Flow-Description"/>
  4887. + <gavp name="Packet-Filter-Identifier"/>
  4888. + <gavp name="ToS-Traffic-Class"/>
  4889. + <gavp name="Security-Parameter-Index"/>
  4890. + <gavp name="Flow-Label"/>
  4891. + </grouped>
  4892. + </avp>
  4893. + <avp name="Packet-Filter-Content" code="1059" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4894. + <type type-name="IPFilterRule"/>
  4895. + </avp>
  4896. + <avp name="Packet-Filter-Identifier" code="1060" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4897. + <type type-name="OctetString"/>
  4898. + </avp>
  4899. + <avp name="Packet-Filter-Information" code="1061" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4900. + <grouped>
  4901. + <gavp name="Packet-Filter-Identifier"/>
  4902. + <gavp name="Precedence"/>
  4903. + <gavp name="Packet-Filter-Content"/>
  4904. + <gavp name="ToS-Traffic-Class"/>
  4905. + <gavp name="Security-Parameter-Index"/>
  4906. + <gavp name="Flow-Label"/>
  4907. + </grouped>
  4908. + </avp>
  4909. + <avp name="Packet-Filter-Operation" code="1062" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4910. + <type type-name="Enumerated"/>
  4911. + <enum name="DELETION" code="0"/>
  4912. + <enum name="ADDITION" code="1"/>
  4913. + <enum name="MODIFICATION" code="2"/>
  4914. + </avp>
  4915. + <avp name="Resource-Allocation-Notification" code="1063" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4916. + <type type-name="Enumerated"/>
  4917. + <enum name="ENABLE_NOTIFICATION" code="0"/>
  4918. + </avp>
  4919. + <avp name="Session-Linking-Indicator" code="1064" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4920. + <type type-name="Enumerated"/>
  4921. + <enum name="SESSION_LINKING_IMMEDIATE" code="0"/>
  4922. + <enum name="SESSION_LINKING_DEFERRED" code="1"/>
  4923. + </avp>
  4924. + <avp name="PDN-Connection-ID" code="1065" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4925. + <type type-name="OctetString"/>
  4926. + </avp>
  4927. + <avp name="Monitoring-Key" code="1066" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4928. + <type type-name="OctetString"/>
  4929. + </avp>
  4930. + <avp name="Usage-Monitoring-Information" code="1067" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4931. + <grouped>
  4932. + <gavp name="Monitoring-Key"/>
  4933. + <gavp name="Granted-Service-Unit"/>
  4934. + <gavp name="Used-Service-Unit"/>
  4935. + <gavp name="Usage-Monitoring-Level"/>
  4936. + <gavp name="Usage-Monitoring-Report"/>
  4937. + <gavp name="Usage-Monitoring-Support"/>
  4938. + </grouped>
  4939. + </avp>
  4940. + <avp name="Usage-Monitoring-Level" code="1068" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4941. + <type type-name="Enumerated"/>
  4942. + <enum name="SESSION_LEVEL" code="0"/>
  4943. + <enum name="PCC_RULE_LEVEL" code="1"/>
  4944. + </avp>
  4945. + <avp name="Usage-Monitoring-Report" code="1069" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4946. + <type type-name="Enumerated"/>
  4947. + <enum name="USAGE_MONITORING_REPORT_REQUIRED" code="0"/>
  4948. + </avp>
  4949. + <avp name="Usage-Monitoring-Support" code="1070" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4950. + <type type-name="Enumerated"/>
  4951. + <enum name="USAGE_MONITORING_DISABLED" code="0"/>
  4952. + </avp>
  4953. + <avp name="CSG-Information-Reporting" code="1071" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  4954. + <type type-name="Enumerated"/>
  4955. + <enum name="CHANGE_CSG_CELL" code="0"/>
  4956. + <enum name="CHANGE_CSG_SUBSCRIBED_HYBRID_CELL" code="1"/>
  4957. + <enum name="CHANGE_CSG_UNSUBSCRIBED_HYBRID_CELL" code="2"/>
  4958. + </avp>
  4959. +<!-- Note: The AVP codes from 1072 to 1099 are reserved for TS 29.212 -->
  4960. <!-- ETSI TS 129 140 V6.3.0 (2005-12) -->
  4961. <avp name="Served-User-Identity" code="1100" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  4962. <grouped>
  4963. @@ -2827,7 +3046,6 @@
  4964. <enum name="unresolved" code="0"/>
  4965. <enum name="resolved" code="1"/>
  4966. </avp>
  4967. -
  4968. <!--29.140 [16]
  4969. Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
  4970. 32.299
  4971. @@ -2877,93 +3095,93 @@
  4972. <enum name="application/*" code="16"/>
  4973. <enum name="application/java-vm" code="17"/>
  4974. <enum name="application/x-www-form-urlencoded" code="18"/>
  4975. - <enum name="application/x-hdmlc" code="19"/>
  4976. - <enum name="application/vnd.wap.wmlc" code="20"/>
  4977. - <enum name="application/vnd.wap.wmlscriptc" code="21"/>
  4978. - <enum name="application/vnd.wap.wta-eventc" code="22"/>
  4979. - <enum name="application/vnd.wap.uaprof" code="23"/>
  4980. - <enum name="application/vnd.wap.wtls-ca-certificate" code="24"/>
  4981. - <enum name="application/vnd.wap.wtls-user-certificate" code="25"/>
  4982. - <enum name="application/x-x509-ca-cert" code="26"/>
  4983. - <enum name="application/x-x509-user-cert" code="27"/>
  4984. - <enum name="image/*" code="28"/>
  4985. - <enum name="image/gif" code="29"/>
  4986. - <enum name="image/jpeg" code="30"/>
  4987. - <enum name="image/tiff" code="31"/>
  4988. - <enum name="image/png" code="32"/>
  4989. - <enum name="image/vnd.wap.wbmp" code="33"/>
  4990. - <enum name="application/vnd.wap.multipart.*" code="34"/>
  4991. - <enum name="application/vnd.wap.multipart.mixed" code="35"/>
  4992. - <enum name="application/vnd.wap.multipart.form-data" code="36"/>
  4993. - <enum name="application/vnd.wap.multipart.byteranges" code="37"/>
  4994. - <enum name="application/vnd.wap.multipart.alternative" code="38"/>
  4995. - <enum name="application/xml" code="39"/>
  4996. - <enum name="text/xml" code="40"/>
  4997. - <enum name="application/vnd.wap.wbxml" code="41"/>
  4998. - <enum name="application/x-x968-cross-cert" code="42"/>
  4999. - <enum name="application/x-x968-ca-cert" code="43"/>
  5000. - <enum name="application/x-x968-user-cert" code="44"/>
  5001. - <enum name="text/vnd.wap.si" code="45"/>
  5002. - <enum name="application/vnd.wap.sic" code="46"/>
  5003. - <enum name="text/vnd.wap.sl" code="47"/>
  5004. - <enum name="application/vnd.wap.slc" code="48"/>
  5005. - <enum name="text/vnd.wap.co" code="49"/>
  5006. - <enum name="application/vnd.wap.coc" code="50"/>
  5007. - <enum name="application/vnd.wap.multipart.related" code="51"/>
  5008. - <enum name="application/vnd.wap.sia" code="52"/>
  5009. - <enum name="text/vnd.wap.connectivity-xml" code="53"/>
  5010. - <enum name="application/vnd.wap.connectivity-wbxml" code="54"/>
  5011. - <enum name="application/pkcs7-mime" code="55"/>
  5012. - <enum name="application/vnd.wap.hashed-certificate" code="56"/>
  5013. - <enum name="application/vnd.wap.signed-certificate" code="57"/>
  5014. - <enum name="application/vnd.wap.cert-response" code="58"/>
  5015. - <enum name="application/xhtml+xml" code="59"/>
  5016. - <enum name="application/wml+xml" code="60"/>
  5017. - <enum name="text/css" code="61"/>
  5018. - <enum name="application/vnd.wap.mms-message" code="62"/>
  5019. - <enum name="application/vnd.wap.rollover-certificate" code="63"/>
  5020. - <enum name="application/vnd.wap.locc+wbxml" code="64"/>
  5021. - <enum name="application/vnd.wap.loc+xml" code="65"/>
  5022. - <enum name="application/vnd.syncml.dm+wbxml" code="66"/>
  5023. - <enum name="application/vnd.syncml.dm+xml" code="67"/>
  5024. - <enum name="application/vnd.syncml.notification" code="68"/>
  5025. - <enum name="application/vnd.wap.xhtml+xml" code="69"/>
  5026. - <enum name="application/vnd.wv.csp.cir" code="70"/>
  5027. - <enum name="application/vnd.oma.dd+xml" code="71"/>
  5028. - <enum name="application/vnd.oma.drm.message" code="72"/>
  5029. - <enum name="application/vnd.oma.drm.content" code="73"/>
  5030. - <enum name="application/vnd.oma.drm.rights+xml" code="74"/>
  5031. - <enum name="application/vnd.oma.drm.rights+wbxml" code="75"/>
  5032. - <enum name="application/vnd.wv.csp+xml" code="76"/>
  5033. - <enum name="application/vnd.wv.csp+wbxml" code="77"/>
  5034. - <enum name="application/vnd.syncml.ds.notification" code="78"/>
  5035. - <enum name="audio/*" code="79"/>
  5036. - <enum name="video/*" code="80"/>
  5037. - <enum name="application/vnd.oma.dd2+xml" code="81"/>
  5038. - <enum name="application/mikey" code="82"/>
  5039. - <enum name="application/vnd.oma.dcd" code="83"/>
  5040. - <enum name="application/vnd.oma.dcdc" code="84"/>
  5041. - </avp>
  5042. + <enum name="application/x-hdmlc" code="19"/>
  5043. + <enum name="application/vnd.wap.wmlc" code="20"/>
  5044. + <enum name="application/vnd.wap.wmlscriptc" code="21"/>
  5045. + <enum name="application/vnd.wap.wta-eventc" code="22"/>
  5046. + <enum name="application/vnd.wap.uaprof" code="23"/>
  5047. + <enum name="application/vnd.wap.wtls-ca-certificate" code="24"/>
  5048. + <enum name="application/vnd.wap.wtls-user-certificate" code="25"/>
  5049. + <enum name="application/x-x509-ca-cert" code="26"/>
  5050. + <enum name="application/x-x509-user-cert" code="27"/>
  5051. + <enum name="image/*" code="28"/>
  5052. + <enum name="image/gif" code="29"/>
  5053. + <enum name="image/jpeg" code="30"/>
  5054. + <enum name="image/tiff" code="31"/>
  5055. + <enum name="image/png" code="32"/>
  5056. + <enum name="image/vnd.wap.wbmp" code="33"/>
  5057. + <enum name="application/vnd.wap.multipart.*" code="34"/>
  5058. + <enum name="application/vnd.wap.multipart.mixed" code="35"/>
  5059. + <enum name="application/vnd.wap.multipart.form-data" code="36"/>
  5060. + <enum name="application/vnd.wap.multipart.byteranges" code="37"/>
  5061. + <enum name="application/vnd.wap.multipart.alternative" code="38"/>
  5062. + <enum name="application/xml" code="39"/>
  5063. + <enum name="text/xml" code="40"/>
  5064. + <enum name="application/vnd.wap.wbxml" code="41"/>
  5065. + <enum name="application/x-x968-cross-cert" code="42"/>
  5066. + <enum name="application/x-x968-ca-cert" code="43"/>
  5067. + <enum name="application/x-x968-user-cert" code="44"/>
  5068. + <enum name="text/vnd.wap.si" code="45"/>
  5069. + <enum name="application/vnd.wap.sic" code="46"/>
  5070. + <enum name="text/vnd.wap.sl" code="47"/>
  5071. + <enum name="application/vnd.wap.slc" code="48"/>
  5072. + <enum name="text/vnd.wap.co" code="49"/>
  5073. + <enum name="application/vnd.wap.coc" code="50"/>
  5074. + <enum name="application/vnd.wap.multipart.related" code="51"/>
  5075. + <enum name="application/vnd.wap.sia" code="52"/>
  5076. + <enum name="text/vnd.wap.connectivity-xml" code="53"/>
  5077. + <enum name="application/vnd.wap.connectivity-wbxml" code="54"/>
  5078. + <enum name="application/pkcs7-mime" code="55"/>
  5079. + <enum name="application/vnd.wap.hashed-certificate" code="56"/>
  5080. + <enum name="application/vnd.wap.signed-certificate" code="57"/>
  5081. + <enum name="application/vnd.wap.cert-response" code="58"/>
  5082. + <enum name="application/xhtml+xml" code="59"/>
  5083. + <enum name="application/wml+xml" code="60"/>
  5084. + <enum name="text/css" code="61"/>
  5085. + <enum name="application/vnd.wap.mms-message" code="62"/>
  5086. + <enum name="application/vnd.wap.rollover-certificate" code="63"/>
  5087. + <enum name="application/vnd.wap.locc+wbxml" code="64"/>
  5088. + <enum name="application/vnd.wap.loc+xml" code="65"/>
  5089. + <enum name="application/vnd.syncml.dm+wbxml" code="66"/>
  5090. + <enum name="application/vnd.syncml.dm+xml" code="67"/>
  5091. + <enum name="application/vnd.syncml.notification" code="68"/>
  5092. + <enum name="application/vnd.wap.xhtml+xml" code="69"/>
  5093. + <enum name="application/vnd.wv.csp.cir" code="70"/>
  5094. + <enum name="application/vnd.oma.dd+xml" code="71"/>
  5095. + <enum name="application/vnd.oma.drm.message" code="72"/>
  5096. + <enum name="application/vnd.oma.drm.content" code="73"/>
  5097. + <enum name="application/vnd.oma.drm.rights+xml" code="74"/>
  5098. + <enum name="application/vnd.oma.drm.rights+wbxml" code="75"/>
  5099. + <enum name="application/vnd.wv.csp+xml" code="76"/>
  5100. + <enum name="application/vnd.wv.csp+wbxml" code="77"/>
  5101. + <enum name="application/vnd.syncml.ds.notification" code="78"/>
  5102. + <enum name="audio/*" code="79"/>
  5103. + <enum name="video/*" code="80"/>
  5104. + <enum name="application/vnd.oma.dd2+xml" code="81"/>
  5105. + <enum name="application/mikey" code="82"/>
  5106. + <enum name="application/vnd.oma.dcd" code="83"/>
  5107. + <enum name="application/vnd.oma.dcdc" code="84"/>
  5108. + </avp>
  5109. <avp name="Additional-Type-Information" code="1205" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5110. <type type-name="UTF8String"/>
  5111. </avp>
  5112. - <avp name="Content-Size" code="1206" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5113. + <avp name="Content-Size" code="1206" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5114. <type type-name="Unsigned32"/>
  5115. </avp>
  5116. - <avp name="Additional-Content-Information" code="1207" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5117. - <grouped>
  5118. - <gavp name="Type-Number"/>
  5119. - <gavp name="Additional-Type-Information"/>
  5120. - <gavp name="Content-Size"/>
  5121. - </grouped>
  5122. - </avp>
  5123. - <avp name="Addressee-Type" code="1208" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5124. - <type type-name="Enumerated"/>
  5125. - <enum name="TO" code="0"/>
  5126. - <enum name="CC" code="1"/>
  5127. - <enum name="BCC" code="2"/>
  5128. - </avp>
  5129. - <avp name="Priority" code="1209" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5130. + <avp name="Additional-Content-Information" code="1207" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5131. + <grouped>
  5132. + <gavp name="Type-Number"/>
  5133. + <gavp name="Additional-Type-Information"/>
  5134. + <gavp name="Content-Size"/>
  5135. + </grouped>
  5136. + </avp>
  5137. + <avp name="Addressee-Type" code="1208" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5138. + <type type-name="Enumerated"/>
  5139. + <enum name="TO" code="0"/>
  5140. + <enum name="CC" code="1"/>
  5141. + <enum name="BCC" code="2"/>
  5142. + </avp>
  5143. + <avp name="Priority" code="1209" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5144. <type type-name="Enumerated"/>
  5145. <enum name="Low" code="0"/>
  5146. <enum name="Normal" code="2"/>
  5147. @@ -3006,7 +3224,7 @@
  5148. <enum name="Informational" code="2"/>
  5149. <enum name="Auto" code="3"/>
  5150. </avp>
  5151. - <avp name="Token-Text" code="1215">
  5152. + <avp name="Token-Text" code="1215" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5153. <type type-name="UTF8String"/>
  5154. </avp>
  5155. <avp name="Delivery-Report-Requested" code="1216" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5156. @@ -3036,16 +3254,16 @@
  5157. <enum name="content-basic" code="6"/>
  5158. <enum name="content-rich" code="7"/>
  5159. </avp>
  5160. - <avp name="DRM-Content" code="1221">
  5161. + <avp name="DRM-Content" code="1221" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5162. <type type-name="Enumerated"/>
  5163. <enum name="No" code="0"/>
  5164. <enum name="Yes" code="1"/>
  5165. </avp>
  5166. <avp name="Read-Reply-Report-Requested" code="1222" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5167. <type type-name="Enumerated"/>
  5168. - <enum name="No" code="0"/>
  5169. - <enum name="Yes" code="1"/>
  5170. - </avp>
  5171. + <enum name="No" code="0"/>
  5172. + <enum name="Yes" code="1"/>
  5173. + </avp>
  5174. <avp name="Reply-Applic-ID" code="1223" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5175. <type type-name="UTF8String"/>
  5176. </avp>
  5177. @@ -3068,7 +3286,7 @@
  5178. <avp name="SGSN-Address" code="1228" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5179. <type type-name="IPAddress"/>
  5180. </avp>
  5181. - <avp name="PoC-Session-Id" code="1229" mandatory="must" vendor-bit="must" vendor-id="TGPP">
  5182. + <avp name="PoC-Session-Id" code="1229" mandatory="must" vendor-bit="must" vendor-id="TGPP">
  5183. <type type-name="UTF8String"/>
  5184. </avp>
  5185. <avp name="Deferred-Location-Event-Type" code="1230" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
  5186. @@ -3164,11 +3382,11 @@
  5187. <enum name="Yes" code="1"/>
  5188. </avp>
  5189. <avp name="Service-Specific-Info" code="1249" vendor-bit="must" vendor-id="TGPP">
  5190. - <grouped>
  5191. - <gavp name="Service-Specific-Data"/>
  5192. - <gavp name="Service-Specific-Type"/>
  5193. - </grouped>
  5194. - </avp>
  5195. + <grouped>
  5196. + <gavp name="Service-Specific-Data"/>
  5197. + <gavp name="Service-Specific-Type"/>
  5198. + </grouped>
  5199. + </avp>
  5200. <avp name="Called-Asserted-Identity" code="1250" vendor-bit="must" vendor-id="TGPP">
  5201. <type type-name="UTF8String"/>
  5202. </avp>
  5203. @@ -3186,29 +3404,28 @@
  5204. </avp>
  5205. <avp name="PoC-User-Role-info-Units" code="1254" vendor-bit="must" vendor-id="TGPP">
  5206. <type type-name="Enumerated"/>
  5207. - <enum name="Moderator" code="1"/>
  5208. - <enum name="Dispatcher" code="2"/>
  5209. - <enum name="Session-Owner" code="3"/>
  5210. - <enum name="Session-Participant" code="4"/>
  5211. - </avp>
  5212. -
  5213. + <enum name="Moderator" code="1"/>
  5214. + <enum name="Dispatcher" code="2"/>
  5215. + <enum name="Session-Owner" code="3"/>
  5216. + <enum name="Session-Participant" code="4"/>
  5217. + </avp>
  5218. <avp name="Talk-Burst-Exchange" code="1255" vendor-bit="must" vendor-id="TGPP">
  5219. <grouped>
  5220. - <gavp name="PoC-Change-Time"/>
  5221. - <gavp name="Number-Of-Talk-Bursts"/>
  5222. - <gavp name="Talk-Burst-Volume"/>
  5223. - <gavp name="Talk-Burst-Time"/>
  5224. - <gavp name="Number-Of-Received-Talk-Bursts"/>
  5225. - <gavp name="Received-Talk-Burst-Volume"/>
  5226. - <gavp name="Received-Talk-Burst-Time"/>
  5227. - <gavp name="Number-Of-Participants"/>
  5228. - <gavp name="PoC-Change-Condition"/>
  5229. - </grouped>
  5230. + <gavp name="PoC-Change-Time"/>
  5231. + <gavp name="Number-Of-Talk-Bursts"/>
  5232. + <gavp name="Talk-Burst-Volume"/>
  5233. + <gavp name="Talk-Burst-Time"/>
  5234. + <gavp name="Number-Of-Received-Talk-Bursts"/>
  5235. + <gavp name="Received-Talk-Burst-Volume"/>
  5236. + <gavp name="Received-Talk-Burst-Time"/>
  5237. + <gavp name="Number-Of-Participants"/>
  5238. + <gavp name="PoC-Change-Condition"/>
  5239. + </grouped>
  5240. </avp>
  5241. <avp name="Service-Generic-Information" code="1256" vendor-bit="must" vendor-id="TGPP">
  5242. - <grouped>
  5243. - </grouped>
  5244. - </avp>
  5245. + <grouped>
  5246. + </grouped>
  5247. + </avp>
  5248. <avp name="Service-Specific-Type" code="1257" vendor-bit="must" vendor-id="TGPP">
  5249. <type type-name="Unsigned32"/>
  5250. </avp>
  5251. @@ -3217,27 +3434,27 @@
  5252. </avp>
  5253. <avp name="Participant-Access-Priority" code="1259" vendor-bit="must" vendor-id="TGPP">
  5254. <type type-name="Enumerated"/>
  5255. - <enum name="Pre-emptive priority" code="1"/>
  5256. - <enum name="High priority" code="2"/>
  5257. - <enum name="Normal priority" code="3"/>
  5258. - <enum name="Low priority" code="4"/>
  5259. - </avp>
  5260. + <enum name="Pre-emptive priority" code="1"/>
  5261. + <enum name="High priority" code="2"/>
  5262. + <enum name="Normal priority" code="3"/>
  5263. + <enum name="Low priority" code="4"/>
  5264. + </avp>
  5265. <avp name="Participant-Group" code="1260" vendor-bit="must" vendor-id="TGPP">
  5266. - <grouped>
  5267. - <gavp name="Called-Party-Address"/>
  5268. - <gavp name="Participant-Access-Priority"/>
  5269. - <gavp name="User-Participating-Type"/>
  5270. - </grouped>
  5271. - </avp>
  5272. + <grouped>
  5273. + <gavp name="Called-Party-Address"/>
  5274. + <gavp name="Participant-Access-Priority"/>
  5275. + <gavp name="User-Participating-Type"/>
  5276. + </grouped>
  5277. + </avp>
  5278. <avp name="PoC-Change-Condition" code="1261" vendor-bit="must" vendor-id="TGPP">
  5279. <type type-name="Enumerated"/>
  5280. - <enum name="serviceChange" code="0"/>
  5281. - <enum name="volumeLimit" code="1"/>
  5282. - <enum name="timeLimit" code="2"/>
  5283. - <enum name="numberofTalkBurstLimit" code="3"/>
  5284. - <enum name="numberofActiveParticipants" code="4"/>
  5285. - <enum name="tariffTime" code="5"/>
  5286. - </avp>
  5287. + <enum name="serviceChange" code="0"/>
  5288. + <enum name="volumeLimit" code="1"/>
  5289. + <enum name="timeLimit" code="2"/>
  5290. + <enum name="numberofTalkBurstLimit" code="3"/>
  5291. + <enum name="numberofActiveParticipants" code="4"/>
  5292. + <enum name="tariffTime" code="5"/>
  5293. + </avp>
  5294. <avp name="PoC-Change-Time" code="1262" vendor-bit="must" vendor-id="TGPP">
  5295. <type type-name="Time"/>
  5296. </avp>
  5297. @@ -3267,38 +3484,38 @@
  5298. </avp>
  5299. <avp name="Envelope-Reporting" code="1268" vendor-bit="must" vendor-id="TGPP">
  5300. <type type-name="Enumerated"/>
  5301. - <enum name="DO_NOT_REPORT_ENVELOPES" code="0"/>
  5302. - <enum name="REPORT_ENVELOPES" code="1"/>
  5303. - <enum name="REPORT_ENVELOPES_WITH_VOLUME" code="2"/>
  5304. - <enum name="REPORT_ENVELOPES_WITH_EVENTS" code="3"/>
  5305. - <enum name="REPORT_ENVELOPES_WITH_VOLUME_AND_EVENTS" code="4"/>
  5306. - </avp>
  5307. + <enum name="DO_NOT_REPORT_ENVELOPES" code="0"/>
  5308. + <enum name="REPORT_ENVELOPES" code="1"/>
  5309. + <enum name="REPORT_ENVELOPES_WITH_VOLUME" code="2"/>
  5310. + <enum name="REPORT_ENVELOPES_WITH_EVENTS" code="3"/>
  5311. + <enum name="REPORT_ENVELOPES_WITH_VOLUME_AND_EVENTS" code="4"/>
  5312. + </avp>
  5313. <avp name="Envelope-Start-Time" code="1269" vendor-bit="must" vendor-id="TGPP">
  5314. <type type-name="Time"/>
  5315. </avp>
  5316. <avp name="Time-Quota-Mechanism" code="1270" vendor-bit="must" vendor-id="TGPP">
  5317. - <grouped>
  5318. - <gavp name="Time-Quota-Type"/>
  5319. - <gavp name="Base-Time-Interval"/>
  5320. - </grouped>
  5321. - </avp>
  5322. + <grouped>
  5323. + <gavp name="Time-Quota-Type"/>
  5324. + <gavp name="Base-Time-Interval"/>
  5325. + </grouped>
  5326. + </avp>
  5327. <avp name="Time-Quota-Type" code="1271" vendor-bit="must" vendor-id="TGPP">
  5328. <type type-name="Enumerated"/>
  5329. - <enum name="DISCRETE_TIME_PERIOD" code="0"/>
  5330. - <enum name="CONTINUOUS_TIME_PERIOD" code="1"/>
  5331. - </avp>
  5332. + <enum name="DISCRETE_TIME_PERIOD" code="0"/>
  5333. + <enum name="CONTINUOUS_TIME_PERIOD" code="1"/>
  5334. + </avp>
  5335. <avp name="Early-Media-Description" code="1272" vendor-bit="must" vendor-id="TGPP">
  5336. - <grouped>
  5337. - <gavp name="SDP-TimeStamps"/>
  5338. - <gavp name="SDP-Media-Component"/>
  5339. - <gavp name="SDP-Session-Description"/>
  5340. - </grouped>
  5341. + <grouped>
  5342. + <gavp name="SDP-TimeStamps"/>
  5343. + <gavp name="SDP-Media-Component"/>
  5344. + <gavp name="SDP-Session-Description"/>
  5345. + </grouped>
  5346. </avp>
  5347. <avp name="SDP-TimeStamps" code="1273" vendor-bit="must" vendor-id="TGPP">
  5348. - <grouped>
  5349. - <gavp name="SDP-Offer-Timestamp"/>
  5350. - <gavp name="SDP-Answer-Timestamp"/>
  5351. - </grouped>
  5352. + <grouped>
  5353. + <gavp name="SDP-Offer-Timestamp"/>
  5354. + <gavp name="SDP-Answer-Timestamp"/>
  5355. + </grouped>
  5356. </avp>
  5357. <avp name="SDP-Offer-Timestamp" code="1274" vendor-bit="must" vendor-id="TGPP">
  5358. <type type-name="Time"/>
  5359. @@ -3307,61 +3524,61 @@
  5360. <type type-name="Time"/>
  5361. </avp>
  5362. <avp name="AF-Correlation-Information" code="1276" vendor-bit="must" vendor-id="TGPP">
  5363. - <grouped>
  5364. - <gavp name="AF-Charging-Identifier"/>
  5365. - <gavp name="Flows"/>
  5366. - </grouped>
  5367. + <grouped>
  5368. + <gavp name="AF-Charging-Identifier"/>
  5369. + <gavp name="Flows"/>
  5370. + </grouped>
  5371. </avp>
  5372. <avp name="PoC-Session-Initiation-type" code="1277" vendor-bit="must" vendor-id="TGPP">
  5373. <type type-name="Enumerated"/>
  5374. - <enum name="Pre-established" code="0"/>
  5375. - <enum name="On-demand" code="1"/>
  5376. - </avp>
  5377. + <enum name="Pre-established" code="0"/>
  5378. + <enum name="On-demand" code="1"/>
  5379. + </avp>
  5380. <avp name="Offline-Charging" code="1278" vendor-bit="must" vendor-id="TGPP">
  5381. - <grouped>
  5382. - <gavp name="Quota-Consumption-Time"/>
  5383. - <gavp name="Time-Quota-Mechanism"/>
  5384. - <gavp name="Envelope-Reporting"/>
  5385. - <gavp name="Multiple-Services-Credit-Control"/>
  5386. - </grouped>
  5387. + <grouped>
  5388. + <gavp name="Quota-Consumption-Time"/>
  5389. + <gavp name="Time-Quota-Mechanism"/>
  5390. + <gavp name="Envelope-Reporting"/>
  5391. + <gavp name="Multiple-Services-Credit-Control"/>
  5392. + </grouped>
  5393. </avp>
  5394. <avp name="User-Participating-Type" code="1279" vendor-bit="must" vendor-id="TGPP">
  5395. <type type-name="Enumerated"/>
  5396. - <enum name="Normal" code="0"/>
  5397. - <enum name="NW PoC Box" code="1"/>
  5398. - <enum name="UE PoC Box" code="2"/>
  5399. - </avp>
  5400. + <enum name="Normal" code="0"/>
  5401. + <enum name="NW PoC Box" code="1"/>
  5402. + <enum name="UE PoC Box" code="2"/>
  5403. + </avp>
  5404. <avp name="Alternate-Charged-Party-Address" code="1280" vendor-bit="must" vendor-id="TGPP">
  5405. <type type-name="UTF8String"/>
  5406. </avp>
  5407. <avp name="IMS-Communication-Service-Identifier" code="1281" vendor-bit="must" vendor-id="TGPP">
  5408. <type type-name="UTF8String"/>
  5409. </avp>
  5410. - <avp name="Number-Of-Received-Talk-Bursts" code="1282" vendor-bit="must" vendor-id="TGPP">
  5411. - <type type-name="Unsigned32"/>
  5412. - </avp>
  5413. - <avp name="Number-Of-Talk-Bursts" code="1283" vendor-bit="must" vendor-id="TGPP">
  5414. - <type type-name="Unsigned32"/>
  5415. - </avp>
  5416. - <avp name="Received-Talk-Burst-Time" code="1284" vendor-bit="must" vendor-id="TGPP">
  5417. - <type type-name="Unsigned32"/>
  5418. - </avp>
  5419. - <avp name="Received-Talk-Burst-Volume" code="1285" vendor-bit="must" vendor-id="TGPP">
  5420. - <type type-name="Unsigned32"/>
  5421. - </avp>
  5422. - <avp name="Talk-Burst-Time" code="1286" vendor-bit="must" vendor-id="TGPP">
  5423. - <type type-name="Unsigned32"/>
  5424. - </avp>
  5425. - <avp name="Talk-Burst-Volume" code="1287" vendor-bit="must" vendor-id="TGPP">
  5426. - <type type-name="Unsigned32"/>
  5427. - </avp>
  5428. + <avp name="Number-Of-Received-Talk-Bursts" code="1282" vendor-bit="must" vendor-id="TGPP">
  5429. + <type type-name="Unsigned32"/>
  5430. + </avp>
  5431. + <avp name="Number-Of-Talk-Bursts" code="1283" vendor-bit="must" vendor-id="TGPP">
  5432. + <type type-name="Unsigned32"/>
  5433. + </avp>
  5434. + <avp name="Received-Talk-Burst-Time" code="1284" vendor-bit="must" vendor-id="TGPP">
  5435. + <type type-name="Unsigned32"/>
  5436. + </avp>
  5437. + <avp name="Received-Talk-Burst-Volume" code="1285" vendor-bit="must" vendor-id="TGPP">
  5438. + <type type-name="Unsigned32"/>
  5439. + </avp>
  5440. + <avp name="Talk-Burst-Time" code="1286" vendor-bit="must" vendor-id="TGPP">
  5441. + <type type-name="Unsigned32"/>
  5442. + </avp>
  5443. + <avp name="Talk-Burst-Volume" code="1287" vendor-bit="must" vendor-id="TGPP">
  5444. + <type type-name="Unsigned32"/>
  5445. + </avp>
  5446. <avp name="Media-Initiator-Party" code="1288" vendor-bit="must" vendor-id="TGPP">
  5447. <type type-name="UTF8String"/>
  5448. </avp>
  5449. - <!--
  5450. +<!--
  5451. Note: The AVP codes from 1289 to 1399 are reserved for TS 32.299
  5452. -->
  5453. -<!--
  5454. +<!--
  5455. 3GPP TS 29.272 V9.1.0 (2009-12
  5456. -->
  5457. <avp name="Subscription-Data" code="1400" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  5458. @@ -3399,7 +3616,7 @@
  5459. <type type-name="UTF8String"/>
  5460. </avp>
  5461. <avp name="QoS-Subscribed" code="1404" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  5462. - <type type-name="OctetString"/>
  5463. + <type type-name="UTF8String"/>
  5464. </avp>
  5465. <avp name="ULR-Flags" code="1405" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  5466. <type type-name="Unsigned32"/>
  5467. @@ -3564,7 +3781,7 @@
  5468. <gavp name="Max-Requested-Bandwidth-DL"/>
  5469. </grouped>
  5470. </avp>
  5471. - <avp name="AMBR" code="1436" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  5472. + <avp name="CSG-Subscription-Data" code="1436" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  5473. <grouped>
  5474. <gavp name="CSG-Id"/>
  5475. <gavp name="Expiration-Date"/>
  5476. @@ -3805,445 +4022,534 @@
  5477. <enum name="FALSE" code="0"/>
  5478. <enum name="TRUE" code="1"/>
  5479. </avp>
  5480. - <avp name="Non-3GPP-User-Data" code="1500" vendor-bit="must" vendor-id="TGPP">
  5481. - <grouped>
  5482. - <gavp name="Subscription-ID"/>
  5483. - <gavp name="Non-3GPP-IP-Access"/>
  5484. - <gavp name="Non-3GPP-IP-Access-APN"/>
  5485. - <gavp name="RAT-Type"/>
  5486. - <gavp name="Session-Timeout"/>
  5487. - <gavp name="MIP6-Feature-Vector"/>
  5488. - <gavp name="AMBR"/>
  5489. - <gavp name="3GPP-Charging-Characteristics"/>
  5490. - <gavp name="APN-OI-Replacement"/>
  5491. - <gavp name="APN-Configuration"/>
  5492. - <gavp name="Trace-Info"/>
  5493. - </grouped>
  5494. - </avp>
  5495. - <avp name="Non-3GPP-IP-Access" code="1501" vendor-bit="must" mandatory="mustnot" may-encrypt="no" vendor-id="TGPP">
  5496. - <type type-name="Enumerated"/>
  5497. - <enum name="NON_3GPP_SUBSCRIPTION_ALLOWED" code="0"/>
  5498. - <enum name="NON_3GPP_SUBSCRIPTION_BARRED" code="1"/>
  5499. - </avp>
  5500. - <avp name="Non-3GPP-IP-Access-APN" code="1502" vendor-bit="must" mandatory="mustnot" may-encrypt="no" vendor-id="TGPP">
  5501. - <type type-name="Enumerated"/>
  5502. - <enum name="NON_3GPP_APNS_ENABLE" code="0"/>
  5503. - <enum name="NON_3GPP_APNS_DISABLE" code="1"/>
  5504. - </avp>
  5505. - <avp name="AN-Trusted" code="1503" vendor-bit="must" mandatory="mustnot" may-encrypt="no" vendor-id="TGPP">
  5506. - <type type-name="Enumerated"/>
  5507. - <enum name="TRUSTED" code="0"/>
  5508. - <enum name="UNTRUSTED" code="1"/>
  5509. - </avp>
  5510. - <avp name="ANID" code="1504" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  5511. - <type type-name="UTF8String"/>
  5512. - </avp>
  5513. - <avp name="Trace-Info" code="1505" vendor-bit="must" vendor-id="TGPP">
  5514. - <grouped>
  5515. - <gavp name="Trace-Data"/>
  5516. - <gavp name="Trace-Reference"/>
  5517. - </grouped>
  5518. - </avp>
  5519. - <!--
  5520. + <avp name="IMS-Voice-Over-PSSessions-Supported" code="1492" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  5521. + <type type-name="Enumerated"/>
  5522. + <enum name="NOT_SUPPORTED" code="0"/>
  5523. + <enum name="SUPPORTED" code="1"/>
  5524. + </avp>
  5525. + <avp name="Homogeneous-Support-of-IMS-Voice-Over-PS-Sessions" code="1493" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  5526. + <type type-name="Enumerated"/>
  5527. + <enum name="NOT_SUPPORTED" code="0"/>
  5528. + <enum name="SUPPORTED" code="1"/>
  5529. + </avp>
  5530. + <avp name="Last-UE-Activity-Time" code="1494" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  5531. + <type type-name="Time"/>
  5532. + </avp>
  5533. + <avp name="EPS-User-State" code="1495" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  5534. + <grouped>
  5535. + <gavp name="MME-User-State"/>
  5536. + <gavp name="SGSN-User-State"/>
  5537. + </grouped>
  5538. + </avp>
  5539. + <avp name="EPS-Location-Information" code="1496" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  5540. + <grouped>
  5541. + <gavp name="MME-Location-Information"/>
  5542. + <gavp name="SGSN-Location-Information"/>
  5543. + </grouped>
  5544. + </avp>
  5545. + <avp name="MME-User-State" code="1497" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  5546. + <grouped>
  5547. + <gavp name="User-State"/>
  5548. + </grouped>
  5549. + </avp>
  5550. + <avp name="SGSN-User-State" code="1498" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  5551. + <grouped>
  5552. + <gavp name="User-State"/>
  5553. + </grouped>
  5554. + </avp>
  5555. + <avp name="User-State" code="1499" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  5556. + <type type-name="Enumerated"/>
  5557. + <enum name="DETACHED" code="0"/>
  5558. + <enum name="ATTACHED_NOT_REACHABLE_FOR_PAGING" code="1"/>
  5559. + <enum name="ATTACHED_REACHABLE_FOR_PAGING" code="2"/>
  5560. + <enum name="CONNECTED_NOT_REACHABLE_FOR_PAGING" code="3"/>
  5561. + <enum name="CONNECTED_REACHABLE_FOR_PAGING" code="4"/>
  5562. + <enum name="NETWORK_DETERMINED_NOT_REACHABLE" code="5"/>
  5563. + </avp>
  5564. + <avp name="Non-3GPP-User-Data" code="1500" vendor-bit="must" vendor-id="TGPP">
  5565. + <grouped>
  5566. + <gavp name="Subscription-ID"/>
  5567. + <gavp name="Non-3GPP-IP-Access"/>
  5568. + <gavp name="Non-3GPP-IP-Access-APN"/>
  5569. + <gavp name="RAT-Type"/>
  5570. + <gavp name="Session-Timeout"/>
  5571. + <gavp name="MIP6-Feature-Vector"/>
  5572. + <gavp name="AMBR"/>
  5573. + <gavp name="3GPP-Charging-Characteristics"/>
  5574. + <gavp name="APN-OI-Replacement"/>
  5575. + <gavp name="APN-Configuration"/>
  5576. + <gavp name="Trace-Info"/>
  5577. + </grouped>
  5578. + </avp>
  5579. + <avp name="Non-3GPP-IP-Access" code="1501" vendor-bit="must" mandatory="mustnot" may-encrypt="no" vendor-id="TGPP">
  5580. + <type type-name="Enumerated"/>
  5581. + <enum name="NON_3GPP_SUBSCRIPTION_ALLOWED" code="0"/>
  5582. + <enum name="NON_3GPP_SUBSCRIPTION_BARRED" code="1"/>
  5583. + </avp>
  5584. + <avp name="Non-3GPP-IP-Access-APN" code="1502" vendor-bit="must" mandatory="mustnot" may-encrypt="no" vendor-id="TGPP">
  5585. + <type type-name="Enumerated"/>
  5586. + <enum name="NON_3GPP_APNS_ENABLE" code="0"/>
  5587. + <enum name="NON_3GPP_APNS_DISABLE" code="1"/>
  5588. + </avp>
  5589. + <avp name="AN-Trusted" code="1503" vendor-bit="must" mandatory="mustnot" may-encrypt="no" vendor-id="TGPP">
  5590. + <type type-name="Enumerated"/>
  5591. + <enum name="TRUSTED" code="0"/>
  5592. + <enum name="UNTRUSTED" code="1"/>
  5593. + </avp>
  5594. + <avp name="ANID" code="1504" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
  5595. + <type type-name="UTF8String"/>
  5596. + </avp>
  5597. + <avp name="Trace-Info" code="1505" vendor-bit="must" vendor-id="TGPP">
  5598. + <grouped>
  5599. + <gavp name="Trace-Data"/>
  5600. + <gavp name="Trace-Reference"/>
  5601. + </grouped>
  5602. + </avp>
  5603. +<!--
  5604. Note: The AVP codes from 1485 to 1499 are reserved for TS 29.272.
  5605. -1505 Trace-Info Grouped
  5606. Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
  5607. -->
  5608. + <avp name="MME-Location-Information" code="1600" vendor-bit="must" vendor-id="TGPP">
  5609. + <grouped>
  5610. + <gavp name="E-UTRAN-Cell-Global-Identity"/>
  5611. + <gavp name="Tracking-Area-Identity"/>
  5612. + <gavp name="Geographical-Information"/>
  5613. + <gavp name="Geodetic-Information"/>
  5614. + <gavp name="Current-Location-Retrieved"/>
  5615. + <gavp name="Age-Of-Location-Information"/>
  5616. + </grouped>
  5617. + </avp>
  5618. + <avp name="SGSN-Location-Information" code="1601" vendor-bit="must" vendor-id="TGPP">
  5619. + <grouped>
  5620. + <gavp name="Cell-Global-Identity"/>
  5621. + <gavp name="Location-Area-Identity"/>
  5622. + <gavp name="Service-Area-Identity"/>
  5623. + <gavp name="Routing-Area-Identity"/>
  5624. + <gavp name="Geographical-Information"/>
  5625. + <gavp name="Geodetic-Information"/>
  5626. + <gavp name="Current-Location-Retrieved"/>
  5627. + <gavp name="Age-Of-Location-Information"/>
  5628. + </grouped>
  5629. + </avp>
  5630. + <avp name="E-UTRAN-Cell-Global-Identity" code="1602" vendor-bit="must" vendor-id="TGPP">
  5631. + <type type-name="OctetString"/>
  5632. + </avp>
  5633. + <avp name="Tracking-Area-Identity" code="1603" vendor-bit="must" vendor-id="TGPP">
  5634. + <type type-name="OctetString"/>
  5635. + </avp>
  5636. + <avp name="Cell-Global-Identity" code="1604" vendor-bit="must" vendor-id="TGPP">
  5637. + <type type-name="OctetString"/>
  5638. + </avp>
  5639. + <avp name="Routing-Area-Identity" code="1605" vendor-bit="must" vendor-id="TGPP">
  5640. + <type type-name="OctetString"/>
  5641. + </avp>
  5642. +
  5643. <avp name="SMS-Information" code="2000" vendor-bit="must" vendor-id="TGPP">
  5644. - <grouped>
  5645. - <gavp name="SMS-Node"/>
  5646. - <gavp name="Client-Address"/>
  5647. - <gavp name="Originator-SCCP-Address"/>
  5648. - <gavp name="Recipient-SCCP-Address"/>
  5649. - <gavp name="SMSC-Address"/>
  5650. - <gavp name="Data-Coding-Scheme"/>
  5651. - <gavp name="Destination-Interface"/>
  5652. - <gavp name="SM-Discharge-Time"/>
  5653. - <gavp name="SM-Message-Type"/>
  5654. - <gavp name="Originator-Interface"/>
  5655. - <gavp name="SM-Protocol-ID"/>
  5656. - <gavp name="Reply-Path-Requested"/>
  5657. - <gavp name="SM-Status"/>
  5658. - <gavp name="SM-User-Data-Header"/>
  5659. - <gavp name="Number-Of-Messages-Sent"/>
  5660. - <gavp name="Recipients"/>
  5661. - </grouped>
  5662. + <grouped>
  5663. + <gavp name="SMS-Node"/>
  5664. + <gavp name="Client-Address"/>
  5665. + <gavp name="Originator-SCCP-Address"/>
  5666. + <gavp name="Recipient-SCCP-Address"/>
  5667. + <gavp name="SMSC-Address"/>
  5668. + <gavp name="Data-Coding-Scheme"/>
  5669. + <gavp name="Destination-Interface"/>
  5670. + <gavp name="SM-Discharge-Time"/>
  5671. + <gavp name="SM-Message-Type"/>
  5672. + <gavp name="Originator-Interface"/>
  5673. + <gavp name="SM-Protocol-ID"/>
  5674. + <gavp name="Reply-Path-Requested"/>
  5675. + <gavp name="SM-Status"/>
  5676. + <gavp name="SM-User-Data-Header"/>
  5677. + <gavp name="Number-Of-Messages-Sent"/>
  5678. + <gavp name="Recipients"/>
  5679. + </grouped>
  5680. </avp>
  5681. <avp name="Data-Coding-Scheme" code="2001" vendor-bit="must" vendor-id="TGPP">
  5682. - <type type-name="Integer32"/>
  5683. + <type type-name="Integer32"/>
  5684. </avp>
  5685. <avp name="Destination-Interface" code="2002" vendor-bit="must" vendor-id="TGPP">
  5686. - <grouped>
  5687. - <gavp name="Interface-Id"/>
  5688. - <gavp name="Interface-Text"/>
  5689. - <gavp name="Interface-Port"/>
  5690. - <gavp name="Interface-Type"/>
  5691. - </grouped>
  5692. + <grouped>
  5693. + <gavp name="Interface-Id"/>
  5694. + <gavp name="Interface-Text"/>
  5695. + <gavp name="Interface-Port"/>
  5696. + <gavp name="Interface-Type"/>
  5697. + </grouped>
  5698. </avp>
  5699. <avp name="Interface-Id" code="2003" vendor-bit="must" vendor-id="TGPP">
  5700. - <type type-name="UTF8String"/>
  5701. + <type type-name="UTF8String"/>
  5702. </avp>
  5703. <avp name="Interface-Port" code="2004" vendor-bit="must" vendor-id="TGPP">
  5704. - <type type-name="UTF8String"/>
  5705. + <type type-name="UTF8String"/>
  5706. </avp>
  5707. <avp name="Interface-Text" code="2005" vendor-bit="must" vendor-id="TGPP">
  5708. - <type type-name="UTF8String"/>
  5709. + <type type-name="UTF8String"/>
  5710. </avp>
  5711. <avp name="Interface-Type" code="2006" vendor-bit="must" vendor-id="TGPP">
  5712. - <type type-name="Enumerated"/>
  5713. - <enum name="Unknown" code="0"/>
  5714. - <enum name="MOBILE_ORIGINATING" code="1"/>
  5715. - <enum name="MOBILE_TERMINATING" code="2"/>
  5716. - <enum name="APPLICATION_ORIGINATING" code="3"/>
  5717. - <enum name="APPLICATION_TERMINATION" code="4"/>
  5718. - </avp>
  5719. + <type type-name="Enumerated"/>
  5720. + <enum name="Unknown" code="0"/>
  5721. + <enum name="MOBILE_ORIGINATING" code="1"/>
  5722. + <enum name="MOBILE_TERMINATING" code="2"/>
  5723. + <enum name="APPLICATION_ORIGINATING" code="3"/>
  5724. + <enum name="APPLICATION_TERMINATION" code="4"/>
  5725. + </avp>
  5726. <avp name="SM-Message-Type" code="2007" vendor-bit="must" vendor-id="TGPP">
  5727. - <type type-name="Enumerated"/>
  5728. - <enum name="SUBMISSION" code="0"/>
  5729. - <enum name="DELIVERY_REPORT" code="1"/>
  5730. - <enum name="SM Service Request" code="1"/>
  5731. - </avp>
  5732. + <type type-name="Enumerated"/>
  5733. + <enum name="SUBMISSION" code="0"/>
  5734. + <enum name="DELIVERY_REPORT" code="1"/>
  5735. + <enum name="SM Service Request" code="1"/>
  5736. + </avp>
  5737. <avp name="Originating-SCCP-Address" code="2008" vendor-bit="must" vendor-id="TGPP">
  5738. - <type type-name="Address"/>
  5739. + <type type-name="Address"/>
  5740. </avp>
  5741. <avp name="Originator-Interface" code="2009" vendor-bit="must" vendor-id="TGPP">
  5742. - <grouped>
  5743. - <gavp name="Interface-Id"/>
  5744. - <gavp name="Interface-Text"/>
  5745. - <gavp name="Interface-Port"/>
  5746. - <gavp name="Interface-Type"/>
  5747. - </grouped>
  5748. - </avp>
  5749. - <avp name="Recipient-SCCP-Address" code="2010" vendor-bit="must" vendor-id="TGPP">
  5750. - <type type-name="Address"/>
  5751. + <grouped>
  5752. + <gavp name="Interface-Id"/>
  5753. + <gavp name="Interface-Text"/>
  5754. + <gavp name="Interface-Port"/>
  5755. + <gavp name="Interface-Type"/>
  5756. + </grouped>
  5757. + </avp>
  5758. + <avp name="Recipient-SCCP-Address" code="2010" vendor-bit="must" vendor-id="TGPP">
  5759. + <type type-name="Address"/>
  5760. </avp>
  5761. <avp name="Reply-Path-Requested" code="2011" vendor-bit="must" vendor-id="TGPP">
  5762. - <type type-name="Enumerated"/>
  5763. - <enum name="No Reply Path Set" code="0"/>
  5764. - <enum name="Reply path Set" code="1"/>
  5765. - </avp>
  5766. + <type type-name="Enumerated"/>
  5767. + <enum name="No Reply Path Set" code="0"/>
  5768. + <enum name="Reply path Set" code="1"/>
  5769. + </avp>
  5770. <avp name="SM-Discharge-Time" code="2012" vendor-bit="must" vendor-id="TGPP">
  5771. - <type type-name="Time"/>
  5772. + <type type-name="Time"/>
  5773. </avp>
  5774. <avp name="SM-Protocol-ID" code="2013" vendor-bit="must" vendor-id="TGPP">
  5775. - <type type-name="OctetString"/>
  5776. + <type type-name="OctetString"/>
  5777. </avp>
  5778. <avp name="SM-Status" code="2014" vendor-bit="must" vendor-id="TGPP">
  5779. - <type type-name="OctetString"/>
  5780. + <type type-name="OctetString"/>
  5781. </avp>
  5782. <avp name="SM-User-Data-Header" code="2015" vendor-bit="must" vendor-id="TGPP">
  5783. - <type type-name="OctetString"/>
  5784. + <type type-name="OctetString"/>
  5785. </avp>
  5786. <avp name="SMS-Node" code="2016" vendor-bit="must" vendor-id="TGPP">
  5787. - <type type-name="Enumerated"/>
  5788. - <enum name="SMS Router" code="0"/>
  5789. - <enum name="IP-SM-GW" code="1"/>
  5790. - <enum name="SMS Router and IP-SM-GW" code="2"/>
  5791. - <enum name="SMS-SC" code="4"/>
  5792. - </avp>
  5793. + <type type-name="Enumerated"/>
  5794. + <enum name="SMS Router" code="0"/>
  5795. + <enum name="IP-SM-GW" code="1"/>
  5796. + <enum name="SMS Router and IP-SM-GW" code="2"/>
  5797. + <enum name="SMS-SC" code="4"/>
  5798. + </avp>
  5799. <avp name="SMSC-Address" code="2017" vendor-bit="must" vendor-id="TGPP">
  5800. - <type type-name="Address"/>
  5801. + <type type-name="Address"/>
  5802. </avp>
  5803. <avp name="Client-Address" code="2018" vendor-bit="must" vendor-id="TGPP">
  5804. - <type type-name="Address"/>
  5805. + <type type-name="Address"/>
  5806. </avp>
  5807. <avp name="Number-of-Messages-Sent" code="2019" vendor-bit="must" vendor-id="TGPP">
  5808. - <type type-name="Unsigned32"/>
  5809. + <type type-name="Unsigned32"/>
  5810. </avp>
  5811. <avp name="Low-Balance-Indication" code="2020" vendor-bit="must" vendor-id="TGPP">
  5812. - <type type-name="Enumerated"/>
  5813. - <enum name="NOT-APPLICABLE" code="0"/>
  5814. - <enum name="YES" code="1"/>
  5815. - </avp>
  5816. + <type type-name="Enumerated"/>
  5817. + <enum name="NOT-APPLICABLE" code="0"/>
  5818. + <enum name="YES" code="1"/>
  5819. + </avp>
  5820. <avp name="Remaining-Balance" code="2021" vendor-bit="must" vendor-id="TGPP">
  5821. - <grouped>
  5822. - <gavp name="Unit-Value"/>
  5823. - <gavp name="Currency-Code"/>
  5824. - </grouped>
  5825. - </avp>
  5826. - <avp name="Refund-Information" code="2022" vendor-bit="must" vendor-id="TGPP">
  5827. - <type type-name="OctetString"/>
  5828. + <grouped>
  5829. + <gavp name="Unit-Value"/>
  5830. + <gavp name="Currency-Code"/>
  5831. + </grouped>
  5832. + </avp>
  5833. + <avp name="Refund-Information" code="2022" vendor-bit="must" vendor-id="TGPP">
  5834. + <type type-name="OctetString"/>
  5835. </avp>
  5836. -
  5837. <avp name="Carrier-Select-Routing-Information" code="2023" vendor-bit="must" vendor-id="TGPP">
  5838. - <type type-name="UTF8String"/>
  5839. + <type type-name="UTF8String"/>
  5840. </avp>
  5841. <avp name="Number-Portability-Routing-Information" code="2024" vendor-bit="must" vendor-id="TGPP">
  5842. - <type type-name="UTF8String"/>
  5843. + <type type-name="UTF8String"/>
  5844. </avp>
  5845. <avp name="PoC-Event-Type" code="2025" vendor-bit="must" vendor-id="TGPP">
  5846. - <type type-name="Enumerated"/>
  5847. - <enum name="Normal" code="0"/>
  5848. - <enum name="Instant Personal Aalert event" code="1"/>
  5849. - <enum name="PoC Group Advertisement event" code="2"/>
  5850. - <enum name="Early Ssession Setting-up event" code="3"/>
  5851. - <enum name="PoC Talk Burst" code="4"/>
  5852. - </avp>
  5853. + <type type-name="Enumerated"/>
  5854. + <enum name="Normal" code="0"/>
  5855. + <enum name="Instant Personal Aalert event" code="1"/>
  5856. + <enum name="PoC Group Advertisement event" code="2"/>
  5857. + <enum name="Early Ssession Setting-up event" code="3"/>
  5858. + <enum name="PoC Talk Burst" code="4"/>
  5859. + </avp>
  5860. <avp name="Recipients" code="2026" vendor-bit="must" vendor-id="TGPP">
  5861. - <grouped>
  5862. - <gavp name="Recipient-Address"/>
  5863. - </grouped>
  5864. - </avp>
  5865. - <avp name="Destination-Interface" code="2027" vendor-bit="must" vendor-id="TGPP">
  5866. - <grouped>
  5867. - <gavp name="Address-Type"/>
  5868. - <gavp name="Address-Data"/>
  5869. - <gavp name="Address-Domain"/>
  5870. - </grouped>
  5871. - </avp>
  5872. - <avp name="Recipient-Received-Address" code="2028" vendor-bit="must" vendor-id="TGPP">
  5873. - <grouped>
  5874. - <gavp name="Address-Type"/>
  5875. - <gavp name="Address-Data"/>
  5876. - <gavp name="Address-Domain"/>
  5877. - </grouped>
  5878. - </avp>
  5879. - <avp name="SM-Service-Type" code="2029" vendor-bit="must" vendor-id="TGPP">
  5880. - <type type-name="Enumerated"/>
  5881. - <enum name="VAS4SMS Short Message content processing" code="0"/>
  5882. - <enum name="VAS4SMS Short Message forwarding" code="1"/>
  5883. - <enum name="VAS4SMS Short Message Forwarding multiple subscriptions" code="2"/>
  5884. - <enum name="VAS4SMS Short Message filtering" code="3"/>
  5885. - <enum name="VAS4SMS Short Message receipt" code="4"/>
  5886. - <enum name="VAS4SMS Short Message Network Storage" code="5"/>
  5887. - <enum name="VAS4SMS Short Message to multiple destinations" code="6"/>
  5888. - <enum name="VAS4SMS Short Message Virtual Private Network (VPN)" code="7"/>
  5889. - <enum name="VAS4SMS Short Message Auto Reply" code="8"/>
  5890. - <enum name="VAS4SMS Short Message Personal Signature" code="9"/>
  5891. - <enum name="VAS4SMS Short Message Deferred Delivery" code="10"/>
  5892. - </avp>
  5893. + <grouped>
  5894. + <gavp name="Recipient-Address"/>
  5895. + </grouped>
  5896. + </avp>
  5897. + <avp name="Destination-Interface" code="2027" vendor-bit="must" vendor-id="TGPP">
  5898. + <grouped>
  5899. + <gavp name="Address-Type"/>
  5900. + <gavp name="Address-Data"/>
  5901. + <gavp name="Address-Domain"/>
  5902. + </grouped>
  5903. + </avp>
  5904. + <avp name="Recipient-Received-Address" code="2028" vendor-bit="must" vendor-id="TGPP">
  5905. + <grouped>
  5906. + <gavp name="Address-Type"/>
  5907. + <gavp name="Address-Data"/>
  5908. + <gavp name="Address-Domain"/>
  5909. + </grouped>
  5910. + </avp>
  5911. + <avp name="SM-Service-Type" code="2029" vendor-bit="must" vendor-id="TGPP">
  5912. + <type type-name="Enumerated"/>
  5913. + <enum name="VAS4SMS Short Message content processing" code="0"/>
  5914. + <enum name="VAS4SMS Short Message forwarding" code="1"/>
  5915. + <enum name="VAS4SMS Short Message Forwarding multiple subscriptions" code="2"/>
  5916. + <enum name="VAS4SMS Short Message filtering" code="3"/>
  5917. + <enum name="VAS4SMS Short Message receipt" code="4"/>
  5918. + <enum name="VAS4SMS Short Message Network Storage" code="5"/>
  5919. + <enum name="VAS4SMS Short Message to multiple destinations" code="6"/>
  5920. + <enum name="VAS4SMS Short Message Virtual Private Network (VPN)" code="7"/>
  5921. + <enum name="VAS4SMS Short Message Auto Reply" code="8"/>
  5922. + <enum name="VAS4SMS Short Message Personal Signature" code="9"/>
  5923. + <enum name="VAS4SMS Short Message Deferred Delivery" code="10"/>
  5924. + </avp>
  5925. <avp name="MMTel-Information" code="2030" vendor-bit="must" vendor-id="TGPP">
  5926. - <grouped>
  5927. - <gavp name="Service-type"/>
  5928. - <gavp name="Service-mode"/>
  5929. - <gavp name="Subscriber-Role"/>
  5930. - <gavp name="Number-Of-Diversions"/>
  5931. - <gavp name="Associated-Party-Address"/>
  5932. - </grouped>
  5933. - </avp>
  5934. - <avp name="Service-type" code="2031" vendor-bit="must" vendor-id="TGPP">
  5935. - <type type-name="Enumerated"/>
  5936. + <grouped>
  5937. + <gavp name="Service-type"/>
  5938. + <gavp name="Service-mode"/>
  5939. + <gavp name="Subscriber-Role"/>
  5940. + <gavp name="Number-Of-Diversions"/>
  5941. + <gavp name="Associated-Party-Address"/>
  5942. + </grouped>
  5943. + </avp>
  5944. + <avp name="Service-type" code="2031" vendor-bit="must" vendor-id="TGPP">
  5945. + <type type-name="Enumerated"/>
  5946. </avp>
  5947. <avp name="Service-Mode" code="2032" vendor-bit="must" vendor-id="TGPP">
  5948. - <type type-name="Enumerated"/>
  5949. + <type type-name="Enumerated"/>
  5950. </avp>
  5951. <avp name="Subscriber-Role" code="2033" vendor-bit="must" vendor-id="TGPP">
  5952. - <type type-name="Enumerated"/>
  5953. - <enum name="ORIGINATING" code="0"/>
  5954. - <enum name="TERMINATING" code="1"/>
  5955. - </avp>
  5956. + <type type-name="Enumerated"/>
  5957. + <enum name="ORIGINATING" code="0"/>
  5958. + <enum name="TERMINATING" code="1"/>
  5959. + </avp>
  5960. <avp name="Number-Of-Diversions" code="2034" vendor-bit="must" vendor-id="TGPP">
  5961. - <type type-name="Unsigned32"/>
  5962. + <type type-name="Unsigned32"/>
  5963. </avp>
  5964. <avp name="Associated-Party-Address" code="2035" vendor-bit="must" vendor-id="TGPP">
  5965. - <type type-name="UTF8String"/>
  5966. + <type type-name="UTF8String"/>
  5967. </avp>
  5968. <avp name="SDP-Type" code="2036" vendor-bit="must" vendor-id="TGPP">
  5969. - <type type-name="Enumerated"/>
  5970. - <enum name="SDP Offer" code="0"/>
  5971. - <enum name="SDP Answer" code="1"/>
  5972. + <type type-name="Enumerated"/>
  5973. + <enum name="SDP Offer" code="0"/>
  5974. + <enum name="SDP Answer" code="1"/>
  5975. </avp>
  5976. <avp name="Change-Condition" code="2037" vendor-bit="must" vendor-id="TGPP">
  5977. - <type type-name="Integer32"/>
  5978. + <type type-name="Integer32"/>
  5979. </avp>
  5980. <avp name="Change-Time" code="2038" vendor-bit="must" vendor-id="TGPP">
  5981. - <type type-name="Time"/>
  5982. + <type type-name="Time"/>
  5983. </avp>
  5984. <avp name="Diagnostics" code="2039" vendor-bit="must" vendor-id="TGPP">
  5985. - <type type-name="Time"/>
  5986. + <type type-name="Time"/>
  5987. </avp>
  5988. <avp name="Service-Data-Container" code="2040" vendor-bit="must" vendor-id="TGPP">
  5989. - <grouped>
  5990. - <gavp name="QoS-Information"/>
  5991. - <gavp name="AF-Correlation-Information"/>
  5992. - <gavp name="Charging-Rule-Base-Name "/>
  5993. - <gavp name="Accounting-Input-Octets "/>
  5994. - <gavp name="Accounting-Output-Octets "/>
  5995. - <gavp name="Accounting-Input-Packets "/>
  5996. - <gavp name="Accounting-Output-Packets "/>
  5997. - <gavp name="Local-Sequence-Number "/>
  5998. - <gavp name="QoS-Information "/>
  5999. - <gavp name="Rating-Group "/>
  6000. - <gavp name="Change-Time "/>
  6001. - <gavp name="Service-Identifier "/>
  6002. - <gavp name="Service-Specific-Info "/>
  6003. - <gavp name="SGSN-Address "/>
  6004. - <gavp name="Time-First-Usage "/>
  6005. - <gavp name="Time-Last-Usage "/>
  6006. - <gavp name="Time-Usage "/>
  6007. - <gavp name="Change-Condition"/>
  6008. - <gavp name="3GPP-User-Location-Info "/>
  6009. - </grouped>
  6010. - </avp>
  6011. + <grouped>
  6012. + <gavp name="AF-Correlation-Information"/>
  6013. + <gavp name="Charging-Rule-Base-Name"/>
  6014. + <gavp name="Accounting-Input-Octets"/>
  6015. + <gavp name="Accounting-Output-Octets"/>
  6016. + <gavp name="Accounting-Input-Packets"/>
  6017. + <gavp name="Accounting-Output-Packets"/>
  6018. + <gavp name="Local-Sequence-Number"/>
  6019. + <gavp name="QoS-Information"/>
  6020. + <gavp name="Rating-Group"/>
  6021. + <gavp name="Change-Time"/>
  6022. + <gavp name="Service-Identifier"/>
  6023. + <gavp name="Service-Specific-Info"/>
  6024. + <gavp name="SGSN-Address"/>
  6025. + <gavp name="Time-First-Usage"/>
  6026. + <gavp name="Time-Last-Usage"/>
  6027. + <gavp name="Time-Usage"/>
  6028. + <gavp name="Change-Condition"/>
  6029. + <gavp name="3GPP-User-Location-Info"/>
  6030. + <gavp name="3GPP2-BSID"/>
  6031. + </grouped>
  6032. + </avp>
  6033. <avp name="Start-Time" code="2041" vendor-bit="must" vendor-id="TGPP">
  6034. - <type type-name="Time"/>
  6035. + <type type-name="Time"/>
  6036. </avp>
  6037. <avp name="Stop-Time" code="2042" vendor-bit="must" vendor-id="TGPP">
  6038. - <type type-name="Time"/>
  6039. + <type type-name="Time"/>
  6040. </avp>
  6041. <avp name="Time-First-Usage" code="2043" vendor-bit="must" vendor-id="TGPP">
  6042. - <type type-name="Time"/>
  6043. + <type type-name="Time"/>
  6044. </avp>
  6045. <avp name="Time-Last-Usage" code="2044" vendor-bit="must" vendor-id="TGPP">
  6046. - <type type-name="Time"/>
  6047. + <type type-name="Time"/>
  6048. </avp>
  6049. <avp name="Time-Usage" code="2045" vendor-bit="must" vendor-id="TGPP">
  6050. - <type type-name="Unsigned32"/>
  6051. + <type type-name="Unsigned32"/>
  6052. </avp>
  6053. <avp name="Traffic-Data-Volumes" code="2046" vendor-bit="must" vendor-id="TGPP">
  6054. - <grouped>
  6055. - <gavp name="QoS-Information"/>
  6056. - <gavp name="Accounting-Input-Octets"/>
  6057. - <gavp name="Accounting-Input-Packets"/>
  6058. - <gavp name="Accounting-Output-Octets"/>
  6059. - <gavp name="Accounting-Output-Packets"/>
  6060. - <gavp name="Change-condition"/>
  6061. - <gavp name="Change-Time"/>
  6062. - <gavp name="3GPP-User-Location-Info"/>
  6063. - </grouped>
  6064. - </avp>
  6065. + <grouped>
  6066. + <gavp name="QoS-Information"/>
  6067. + <gavp name="Accounting-Input-Octets"/>
  6068. + <gavp name="Accounting-Input-Packets"/>
  6069. + <gavp name="Accounting-Output-Octets"/>
  6070. + <gavp name="Accounting-Output-Packets"/>
  6071. + <gavp name="Change-condition"/>
  6072. + <gavp name="Change-Time"/>
  6073. + <gavp name="3GPP-User-Location-Info"/>
  6074. + </grouped>
  6075. + </avp>
  6076. <avp name="Serving-Node-Type" code="2047" vendor-bit="must" vendor-id="TGPP">
  6077. - <type type-name="Enumerated"/>
  6078. - <enum name="SGSN" code="0"/>
  6079. - <enum name="PMIPSGW" code="1"/>
  6080. - <enum name="GTPSGW" code="2"/>
  6081. - <enum name="ePDG" code="3"/>
  6082. - <enum name="hSGW" code="4"/>
  6083. - <enum name="MME" code="5"/>
  6084. + <type type-name="Enumerated"/>
  6085. + <enum name="SGSN" code="0"/>
  6086. + <enum name="PMIPSGW" code="1"/>
  6087. + <enum name="GTPSGW" code="2"/>
  6088. + <enum name="ePDG" code="3"/>
  6089. + <enum name="hSGW" code="4"/>
  6090. + <enum name="MME" code="5"/>
  6091. </avp>
  6092. <avp name="Supplementary-Service" code="2048" vendor-bit="must" vendor-id="TGPP">
  6093. - <grouped>
  6094. - <gavp name="Service-Type"/>
  6095. - <gavp name="Service-Mode"/>
  6096. - <gavp name="Number-Of-Diversions"/>
  6097. - <gavp name="Associated-Party-Address"/>
  6098. - <gavp name="Service-ID"/>
  6099. - <gavp name="Change-Time"/>
  6100. - <gavp name="Number-Of-Participants"/>
  6101. - <gavp name="Participant-Action-Type"/>
  6102. - </grouped>
  6103. - </avp>
  6104. + <grouped>
  6105. + <gavp name="Service-Type"/>
  6106. + <gavp name="Service-Mode"/>
  6107. + <gavp name="Number-Of-Diversions"/>
  6108. + <gavp name="Associated-Party-Address"/>
  6109. + <gavp name="Service-ID"/>
  6110. + <gavp name="Change-Time"/>
  6111. + <gavp name="Number-Of-Participants"/>
  6112. + <gavp name="Participant-Action-Type"/>
  6113. + </grouped>
  6114. + </avp>
  6115. <avp name="Participant-Action-Type" code="2049" vendor-bit="must" vendor-id="TGPP">
  6116. - <type type-name="Enumerated"/>
  6117. - <enum name="CREATE_CONF" code="0"/>
  6118. - <enum name="JOIN_CONF" code="1"/>
  6119. - <enum name="INVITE_INTO_CONF" code="2"/>
  6120. - <enum name="QUIT_CONF" code="3"/>
  6121. + <type type-name="Enumerated"/>
  6122. + <enum name="CREATE_CONF" code="0"/>
  6123. + <enum name="JOIN_CONF" code="1"/>
  6124. + <enum name="INVITE_INTO_CONF" code="2"/>
  6125. + <enum name="QUIT_CONF" code="3"/>
  6126. </avp>
  6127. <avp name="PDN-Conncetion-ID" code="2050" vendor-bit="must" vendor-id="TGPP">
  6128. - <type type-name="Unsigned32"/>
  6129. + <type type-name="Unsigned32"/>
  6130. </avp>
  6131. <avp name="Dynamic-Address-Flag" code="2051" vendor-bit="must" vendor-id="TGPP">
  6132. - <type type-name="Enumerated"/>
  6133. - <enum name="Static" code="0"/>
  6134. - <enum name="Dynamic" code="1"/>
  6135. + <type type-name="Enumerated"/>
  6136. + <enum name="Static" code="0"/>
  6137. + <enum name="Dynamic" code="1"/>
  6138. </avp>
  6139. <avp name="Accumulated-Cost" code="2052" vendor-bit="must" vendor-id="TGPP">
  6140. - <grouped>
  6141. - <gavp name="Value-Digits"/>
  6142. - <gavp name="Exponent"/>
  6143. - </grouped>
  6144. - </avp>
  6145. + <grouped>
  6146. + <gavp name="Value-Digits"/>
  6147. + <gavp name="Exponent"/>
  6148. + </grouped>
  6149. + </avp>
  6150. <avp name="AoC-Cost-Information" code="2053" vendor-bit="must" vendor-id="TGPP">
  6151. - <grouped>
  6152. - <gavp name="Accumulated-Cost"/>
  6153. - <gavp name="Incremental-Cost"/>
  6154. - <gavp name="Currency-Code"/>
  6155. - </grouped>
  6156. - </avp>
  6157. + <grouped>
  6158. + <gavp name="Accumulated-Cost"/>
  6159. + <gavp name="Incremental-Cost"/>
  6160. + <gavp name="Currency-Code"/>
  6161. + </grouped>
  6162. + </avp>
  6163. <avp name="AoC-Information" code="2054" vendor-bit="must" vendor-id="TGPP">
  6164. - <grouped>
  6165. - <gavp name="AoC-Cost-Information"/>
  6166. - <gavp name="Incremental-Cost"/>
  6167. - <gavp name="Tariff-Information"/>
  6168. - </grouped>
  6169. - </avp>
  6170. + <grouped>
  6171. + <gavp name="AoC-Cost-Information"/>
  6172. + <gavp name="Incremental-Cost"/>
  6173. + <gavp name="Tariff-Information"/>
  6174. + </grouped>
  6175. + </avp>
  6176. <avp name="AoC-Request-Type" code="2055" vendor-bit="must" vendor-id="TGPP">
  6177. - <type type-name="Enumerated"/>
  6178. - <enum name="AoC_NOT_REQUESTED" code="0"/>
  6179. - <enum name="AoC_FULL" code="1"/>
  6180. - <enum name="AoC_COST_ONLY" code="2"/>
  6181. - <enum name="AoC_TARIFF_ONLY" code="3"/>
  6182. + <type type-name="Enumerated"/>
  6183. + <enum name="AoC_NOT_REQUESTED" code="0"/>
  6184. + <enum name="AoC_FULL" code="1"/>
  6185. + <enum name="AoC_COST_ONLY" code="2"/>
  6186. + <enum name="AoC_TARIFF_ONLY" code="3"/>
  6187. </avp>
  6188. <avp name="Current-Tariff" code="2056" vendor-bit="must" vendor-id="TGPP">
  6189. - <grouped>
  6190. - <gavp name="Value-Digits"/>
  6191. - <gavp name="Exponent"/>
  6192. - </grouped>
  6193. - </avp>
  6194. - <avp name="Next-Tariff" code="2057" vendor-bit="must" vendor-id="TGPP">
  6195. - <grouped>
  6196. - <gavp name="Currency-Code"/>
  6197. - <gavp name="Scale-Factor"/>
  6198. - <gavp name="Rate-Element"/>
  6199. - </grouped>
  6200. - </avp>
  6201. - <avp name="Rate-Element" code="2058" vendor-bit="must" vendor-id="TGPP">
  6202. - <grouped>
  6203. - <gavp name="CC-Unit-Type"/>
  6204. - <gavp name="Unit-Value"/>
  6205. - <gavp name="Unit-Cost"/>
  6206. - <gavp name="Unit-Threshold"/>
  6207. - </grouped>
  6208. - </avp>
  6209. - <avp name="Scale-Factor" code="2059" vendor-bit="must" vendor-id="TGPP">
  6210. - <grouped>
  6211. - <gavp name="Value-Digits"/>
  6212. - <gavp name="Exponent"/>
  6213. - </grouped>
  6214. - </avp>
  6215. - <avp name="Tariff-Information" code="2060" vendor-bit="must" vendor-id="TGPP">
  6216. - <grouped>
  6217. - <gavp name="Current-Tariff"/>
  6218. - <gavp name="Tariff-Time-Change"/>
  6219. - <gavp name="Next-Tariff"/>
  6220. - </grouped>
  6221. - </avp>
  6222. - <avp name="Unit-Cost" code="2061" vendor-bit="must" vendor-id="TGPP">
  6223. - <grouped>
  6224. - <gavp name="Value-Digits"/>
  6225. - <gavp name="Exponent"/>
  6226. - </grouped>
  6227. - </avp>
  6228. - <avp name="Incremental-Cost" code="2062" vendor-bit="must" vendor-id="TGPP">
  6229. - <grouped>
  6230. - <gavp name="Value-Digits"/>
  6231. - <gavp name="Exponent"/>
  6232. - </grouped>
  6233. - </avp>
  6234. - <avp name="Local-Sequence-Number" code="2063" vendor-bit="must" vendor-id="TGPP">
  6235. - <type type-name="Unsigned32"/>
  6236. - </avp>
  6237. - <avp name="Node-Id" code="2064" vendor-bit="must" vendor-id="TGPP">
  6238. - <type type-name="UTF8String"/>
  6239. - </avp>
  6240. - <!--
  6241. -2065 SGW-Change Enumerated
  6242. -2066 Charging-Characteristic-Selection-Mode Enumerated
  6243. - Note: The AVP codes from 2067 to 2099 are reserved for TS 32.299
  6244. - -->
  6245. - <!--
  6246. + <grouped>
  6247. + <gavp name="Value-Digits"/>
  6248. + <gavp name="Exponent"/>
  6249. + </grouped>
  6250. + </avp>
  6251. + <avp name="Next-Tariff" code="2057" vendor-bit="must" vendor-id="TGPP">
  6252. + <grouped>
  6253. + <gavp name="Currency-Code"/>
  6254. + <gavp name="Scale-Factor"/>
  6255. + <gavp name="Rate-Element"/>
  6256. + </grouped>
  6257. + </avp>
  6258. + <avp name="Rate-Element" code="2058" vendor-bit="must" vendor-id="TGPP">
  6259. + <grouped>
  6260. + <gavp name="CC-Unit-Type"/>
  6261. + <gavp name="Unit-Value"/>
  6262. + <gavp name="Unit-Cost"/>
  6263. + <gavp name="Unit-Threshold"/>
  6264. + </grouped>
  6265. + </avp>
  6266. + <avp name="Scale-Factor" code="2059" vendor-bit="must" vendor-id="TGPP">
  6267. + <grouped>
  6268. + <gavp name="Value-Digits"/>
  6269. + <gavp name="Exponent"/>
  6270. + </grouped>
  6271. + </avp>
  6272. + <avp name="Tariff-Information" code="2060" vendor-bit="must" vendor-id="TGPP">
  6273. + <grouped>
  6274. + <gavp name="Current-Tariff"/>
  6275. + <gavp name="Tariff-Time-Change"/>
  6276. + <gavp name="Next-Tariff"/>
  6277. + </grouped>
  6278. + </avp>
  6279. + <avp name="Unit-Cost" code="2061" vendor-bit="must" vendor-id="TGPP">
  6280. + <grouped>
  6281. + <gavp name="Value-Digits"/>
  6282. + <gavp name="Exponent"/>
  6283. + </grouped>
  6284. + </avp>
  6285. + <avp name="Incremental-Cost" code="2062" vendor-bit="must" vendor-id="TGPP">
  6286. + <grouped>
  6287. + <gavp name="Value-Digits"/>
  6288. + <gavp name="Exponent"/>
  6289. + </grouped>
  6290. + </avp>
  6291. + <avp name="Local-Sequence-Number" code="2063" vendor-bit="must" vendor-id="TGPP">
  6292. + <type type-name="Unsigned32"/>
  6293. + </avp>
  6294. + <avp name="Node-Id" code="2064" vendor-bit="must" vendor-id="TGPP">
  6295. + <type type-name="UTF8String"/>
  6296. + </avp>
  6297. + <avp name="SGW-Change" code="2065" mandatory="must" protected="may" vendor-bit="must" vendor-id="TGPP">
  6298. + <type type-name="Enumerated"/>
  6299. + <enum name="ARC_Start_NOT_due_to_SGW_Change" code="0"/>
  6300. + <enum name="ARC_Start_due_to_SGW_Change" code="1"/>
  6301. + </avp>
  6302. + <avp name="Charging-Characteristic-Selection-Mode" code="2066" mandatory="must" protected="may" vendor-bit="must" vendor-id="TGPP">
  6303. + <type type-name="Enumerated"/>
  6304. + <enum name="Serving-Node-Supplied" code="0"/>
  6305. + <enum name="Subscription-specific" code="1"/>
  6306. + <enum name="APN-specific" code="2"/>
  6307. + <enum name="Home-Default" code="3"/>
  6308. + <enum name="Roaming-Default" code="4"/>
  6309. + <enum name="Visiting-Default" code="5"/>
  6310. + </avp>
  6311. +<!--
  6312. +Note: The AVP codes from 2067 to 2099 are reserved for TS 32.299
  6313. +-->
  6314. +<!--
  6315. 2100 reserved - 32.299 [5]
  6316. -->
  6317. - <avp name="Application-Server-ID" code="2101" vendor-bit="must" vendor-id="TGPP">
  6318. - <type type-name="Unsigned32"/>
  6319. - </avp>
  6320. + <avp name="Application-Server-ID" code="2101" vendor-bit="must" vendor-id="TGPP">
  6321. + <type type-name="Unsigned32"/>
  6322. + </avp>
  6323. <avp name="Application-Service-Type" code="2102" vendor-bit="must" vendor-id="TGPP">
  6324. - <type type-name="Enumerated"/>
  6325. - <enum name="SENDING" code="100"/>
  6326. - <enum name="RECEIVING" code="101"/>
  6327. - <enum name="RETRIEVAL" code="102"/>
  6328. - <enum name="INVITING" code="103"/>
  6329. - <enum name="LEAVING" code="104"/>
  6330. - <enum name="JOINING" code="105"/>
  6331. - </avp>
  6332. - <avp name="Application-Session-ID" code="2103" vendor-bit="must" vendor-id="TGPP">
  6333. - <type type-name="Unsigned32"/>
  6334. - </avp>
  6335. - <avp name="Delivery-Status" code="2104" vendor-bit="must" vendor-id="TGPP">
  6336. - <type type-name="UTF8String"/>
  6337. - </avp>
  6338. - <!--
  6339. + <type type-name="Enumerated"/>
  6340. + <enum name="SENDING" code="100"/>
  6341. + <enum name="RECEIVING" code="101"/>
  6342. + <enum name="RETRIEVAL" code="102"/>
  6343. + <enum name="INVITING" code="103"/>
  6344. + <enum name="LEAVING" code="104"/>
  6345. + <enum name="JOINING" code="105"/>
  6346. + </avp>
  6347. + <avp name="Application-Session-ID" code="2103" vendor-bit="must" vendor-id="TGPP">
  6348. + <type type-name="Unsigned32"/>
  6349. + </avp>
  6350. + <avp name="Delivery-Status" code="2104" vendor-bit="must" vendor-id="TGPP">
  6351. + <type type-name="UTF8String"/>
  6352. + </avp>
  6353. +<!--
  6354. 2105 reserved -
  6355. 2106 reserved -
  6356. 2107 reserved -
  6357. @@ -4251,26 +4557,26 @@
  6358. 2109 reserved -
  6359. -->
  6360. <avp name="IM-Information" code="2110" vendor-bit="must" vendor-id="TGPP">
  6361. - <grouped>
  6362. - <gavp name="Interface-Id"/>
  6363. - <gavp name="Interface-Text"/>
  6364. - <gavp name="Interface-Port"/>
  6365. - <gavp name="Interface-Type"/>
  6366. - </grouped>
  6367. - </avp>
  6368. - <avp name="Number-Of-Messages-Successfully-Exploded" code="2111" vendor-bit="must" vendor-id="TGPP">
  6369. - <type type-name="Unsigned32"/>
  6370. - </avp>
  6371. - <avp name="Number-Of-Messages-Successfully-Sent" code="2112" vendor-bit="must" vendor-id="TGPP">
  6372. - <type type-name="Unsigned32"/>
  6373. - </avp>
  6374. - <avp name="Total-Number-Of-Messages-Exploded" code="2113" vendor-bit="must" vendor-id="TGPP">
  6375. - <type type-name="Unsigned32"/>
  6376. - </avp>
  6377. - <avp name="Total-Number-Of-Messages-Sen" code="2114" vendor-bit="must" vendor-id="TGPP">
  6378. - <type type-name="Unsigned32"/>
  6379. - </avp>
  6380. - <!--
  6381. + <grouped>
  6382. + <gavp name="Interface-Id"/>
  6383. + <gavp name="Interface-Text"/>
  6384. + <gavp name="Interface-Port"/>
  6385. + <gavp name="Interface-Type"/>
  6386. + </grouped>
  6387. + </avp>
  6388. + <avp name="Number-Of-Messages-Successfully-Exploded" code="2111" vendor-bit="must" vendor-id="TGPP">
  6389. + <type type-name="Unsigned32"/>
  6390. + </avp>
  6391. + <avp name="Number-Of-Messages-Successfully-Sent" code="2112" vendor-bit="must" vendor-id="TGPP">
  6392. + <type type-name="Unsigned32"/>
  6393. + </avp>
  6394. + <avp name="Total-Number-Of-Messages-Exploded" code="2113" vendor-bit="must" vendor-id="TGPP">
  6395. + <type type-name="Unsigned32"/>
  6396. + </avp>
  6397. + <avp name="Total-Number-Of-Messages-Sen" code="2114" vendor-bit="must" vendor-id="TGPP">
  6398. + <type type-name="Unsigned32"/>
  6399. + </avp>
  6400. +<!--
  6401. 2115 DCD-Information Grouped
  6402. 2116 Content-ID UTF8String
  6403. 2117 Content-provider-ID UTF8String
  6404. @@ -4283,36 +4589,36 @@
  6405. 29.215 [22]
  6406. Note: The AVP codes from 2204 to 2299 are reserved for TS 29.215
  6407. -->
  6408. - <avp name="SIP-Request-Timestamp-Fraction" code="2301" vendor-bit="must" vendor-id="TGPP">
  6409. - <type type-name="Unsigned32"/>
  6410. - </avp>
  6411. - <avp name="SIP-Response-Timestamp-Fraction" code="2302" vendor-bit="must" vendor-id="TGPP">
  6412. - <type type-name="Unsigned32"/>
  6413. - </avp>
  6414. + <avp name="SIP-Request-Timestamp-Fraction" code="2301" vendor-bit="must" vendor-id="TGPP">
  6415. + <type type-name="Unsigned32"/>
  6416. + </avp>
  6417. + <avp name="SIP-Response-Timestamp-Fraction" code="2302" vendor-bit="must" vendor-id="TGPP">
  6418. + <type type-name="Unsigned32"/>
  6419. + </avp>
  6420. <avp name="Online-Charging-Flag" code="2303" vendor-bit="must" vendor-id="TGPP">
  6421. - <type type-name="Enumerated"/>
  6422. - <enum name="ECF address not provided" code="0"/>
  6423. - <enum name="ECF address provided" code="1"/>
  6424. - </avp>
  6425. - <avp name="CUG-Information" code="2304" vendor-bit="must" vendor-id="TGPP">
  6426. - <type type-name="OctetString"/>
  6427. - </avp>
  6428. + <type type-name="Enumerated"/>
  6429. + <enum name="ECF address not provided" code="0"/>
  6430. + <enum name="ECF address provided" code="1"/>
  6431. + </avp>
  6432. + <avp name="CUG-Information" code="2304" vendor-bit="must" vendor-id="TGPP">
  6433. + <type type-name="OctetString"/>
  6434. + </avp>
  6435. <avp name="Real-Time-Tariff-Information" code="2305" vendor-bit="must" vendor-id="TGPP">
  6436. - <grouped>
  6437. - <gavp name="Tariff-Information"/>
  6438. - <gavp name="Tariff-XML"/>
  6439. - </grouped>
  6440. - </avp>
  6441. - <avp name="Tariff-XML" code="2306" vendor-bit="must" vendor-id="TGPP">
  6442. - <type type-name="UTF8String"/>
  6443. - </avp>
  6444. - <avp name="MBMS-GW-Address" code="2307" vendor-bit="must" vendor-id="TGPP">
  6445. - <type type-name="Address"/>
  6446. - </avp>
  6447. + <grouped>
  6448. + <gavp name="Tariff-Information"/>
  6449. + <gavp name="Tariff-XML"/>
  6450. + </grouped>
  6451. + </avp>
  6452. + <avp name="Tariff-XML" code="2306" vendor-bit="must" vendor-id="TGPP">
  6453. + <type type-name="UTF8String"/>
  6454. + </avp>
  6455. + <avp name="MBMS-GW-Address" code="2307" vendor-bit="must" vendor-id="TGPP">
  6456. + <type type-name="Address"/>
  6457. + </avp>
  6458. <avp name="IMSI-Unauthenticated-Flag" code="2308" vendor-bit="must" vendor-id="TGPP">
  6459. - <type type-name="Enumerated"/>
  6460. - <enum name="Authenticated" code="0"/>
  6461. - <enum name="Unauthenticated" code="1"/>
  6462. + <type type-name="Enumerated"/>
  6463. + <enum name="Authenticated" code="0"/>
  6464. + <enum name="Unauthenticated" code="1"/>
  6465. </avp>
  6466. <!--
  6467. 2309 Account-Expiration Time
  6468. @@ -4392,7 +4698,7 @@
  6469. <gavp name="Rating-Group"/>
  6470. <gavp name="Flow-Description"/>
  6471. <gavp name="Reporting-Level"/>
  6472. - <gavp name="Online"/>
  6473. + <gavp name="Online"/>
  6474. <gavp name="Offline"/>
  6475. <gavp name="Metering-Method"/>
  6476. <gavp name="Precedence"/>
  6477. @@ -4462,32 +4768,27 @@
  6478. <avp name="ToS-Traffic-Class" code="1019" vendor-bit="must" vendor-id="TGPP2">
  6479. <type type-name="OctetString"/>
  6480. </avp>
  6481. -
  6482. </base>
  6483. <application id="0" name="Diameter Common Messages" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
  6484. </application>
  6485. -
  6486. <application id="3" name="Diameter Base Accounting" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
  6487. </application>
  6488. -
  6489. <application id="16777216" name="3GPP Cx" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
  6490. </application>
  6491. - <application id="16777224" name="3GPP Gx(Obsolete)" uri="http://www.3gpp.org/ftp/Specs/html-info/29210.htm">
  6492. - </application>
  6493. - <application id="16777238" name="3GPP Gx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
  6494. - </application>
  6495. - <application id="16777251" name="3GPP S6a/S6d" uri="http://www.ietf.org/rfc/rfc5516.txt?number=5516">
  6496. - </application>
  6497. - <application id="16777252" name="3GPP S13/S13'" uri="http://www.ietf.org/rfc/rfc5516.txt?number=5516">
  6498. - <!-- http://www.3gpp.org/ftp/Specs/html-info/29272.htm -->
  6499. - <command name="3GPP-ME-Identity-Check" code="324" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
  6500. - </application>
  6501. - <application id="16777265" name="3GPP SWx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
  6502. - </application>
  6503. - <application id="16777266" name="3GPP Gxx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
  6504. - </application>
  6505. - &nasreq;
  6506. - &eap;
  6507. + <application id="16777224" name="3GPP Gx(Obsolete)" uri="http://www.3gpp.org/ftp/Specs/html-info/29210.htm">
  6508. + </application>
  6509. + <application id="16777238" name="3GPP Gx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
  6510. + </application>
  6511. + <application id="16777251" name="3GPP S6a/S6d" uri="http://www.ietf.org/rfc/rfc5516.txt?number=5516">
  6512. + </application>
  6513. + <application id="16777252" name="3GPP S13/S13'" uri="http://www.ietf.org/rfc/rfc5516.txt?number=5516">
  6514. + </application>
  6515. + <application id="16777265" name="3GPP SWx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
  6516. + </application>
  6517. + <application id="16777266" name="3GPP Gxx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
  6518. + </application>
  6519. + &nasreq;
  6520. + &eap;
  6521. &mobileipv4;
  6522. &chargecontrol;
  6523. &sunping;
  6524. diff -urN wireshark-1.2.8/diameter/eap.xml wireshark-1.2.9/diameter/eap.xml
  6525. --- wireshark-1.2.8/diameter/eap.xml 2010-05-05 10:11:34.000000000 -0700
  6526. +++ wireshark-1.2.9/diameter/eap.xml 2010-06-08 16:25:45.000000000 -0700
  6527. @@ -1,5 +1,5 @@
  6528. <?xml version="1.0" encoding="UTF-8"?>
  6529. -<!-- $Id: eap.xml 30660 2009-10-22 01:50:22Z etxrab $ -->
  6530. +<!-- $Id: eap.xml 33127 2010-06-07 12:51:23Z etxrab $ -->
  6531. <application id="5" name="EAP Application" uri="http://www.ietf.org/rfc/rfc4072.txt">
  6532.  
  6533. <command name="Diameter-EAP" code="268" vendor-id="None"/>
  6534. @@ -13,9 +13,6 @@
  6535. <avp name="EAP-Master-Session-Key" code="464">
  6536. <type type-name="OctetString"/>
  6537. </avp>
  6538. - <avp name="EAP-Key-Name" code="102">
  6539. - <type type-name="OctetString"/>
  6540. - </avp>
  6541. <avp name="Accounting-EAP-Auth-Method" code="465">
  6542. <type type-name="Unsigned64"/>
  6543. </avp>
  6544. diff -urN wireshark-1.2.8/diameter/nasreq.xml wireshark-1.2.9/diameter/nasreq.xml
  6545. --- wireshark-1.2.8/diameter/nasreq.xml 2010-05-05 10:11:34.000000000 -0700
  6546. +++ wireshark-1.2.9/diameter/nasreq.xml 2010-06-08 16:25:45.000000000 -0700
  6547. @@ -4,29 +4,52 @@
  6548.  
  6549. <command name="AA" code="265" vendor-id="None"/>
  6550.  
  6551. - <avp name="Accounting-Input-Octets" code="363">
  6552. + <avp name="Accounting-Input-Octets" code="363" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  6553. <type type-name="Unsigned64"/>
  6554. </avp>
  6555. - <avp name="Accounting-Output-Octets" code="364">
  6556. + <avp name="Accounting-Output-Octets" code="364" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  6557. <type type-name="Unsigned64"/>
  6558. </avp>
  6559. - <avp name="Accounting-Input-Packets" code="365">
  6560. + <avp name="Accounting-Input-Packets" code="365" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  6561. <type type-name="Unsigned64"/>
  6562. </avp>
  6563. - <avp name="Accounting-Output-Packets" code="366">
  6564. + <avp name="Accounting-Output-Packets" code="366" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  6565. <type type-name="Unsigned64"/>
  6566. </avp>
  6567. - <avp name="NAS-Filter-Rule" code="400">
  6568. +<!--
  6569. +368 - 393 is in sip.xml
  6570. +368 SIP-Accounting-Information [RFC4740]
  6571. +369 SIP-Accounting-Server-URI [RFC4740]
  6572. +370 SIP-Credit-Control-Server-URI [RFC4740]
  6573. +371 SIP-Server-URI [RFC4740]
  6574. +372 SIP-Server-Capabilities [RFC4740]
  6575. +373 SIP-Mandatory-Capability [RFC4740]
  6576. +374 SIP-Optional-Capability [RFC4740]
  6577. +375 SIP-Server-Assignment-Type [RFC4740]
  6578. +376 SIP-Auth-Data-Item [RFC4740]
  6579. +377 SIP-Authentication-Scheme [RFC4740]
  6580. +378 SIP-Item-Number [RFC4740]
  6581. +379 SIP-Authenticate [RFC4740]
  6582. +380 SIP-Authorization [RFC4740]
  6583. +381 SIP-Authentication-Info [RFC4740]
  6584. +382 SIP-Number-Auth-Items [RFC4740]
  6585. +383 SIP-Deregistration-Reason [RFC4740]
  6586. +384 SIP-Reason-Code [RFC4740]
  6587. +385 SIP-Reason-Info [RFC4740]
  6588. +386 SIP-Visited-Network-Id [RFC4740]
  6589. +387 SIP-User-Authorization-Type [RFC4740]
  6590. +388 SIP-Supported-User-Data-Type [RFC4740]
  6591. +389 SIP-User-Data [RFC4740]
  6592. +390 SIP-User-Data-Type [RFC4740]
  6593. +391 SIP-User-Data-Contents [RFC4740]
  6594. +392 SIP-User-Data-Already-Available [RFC4740]
  6595. +393 SIP-Method [RFC4740]
  6596. +394-399 Unassigned
  6597. +-->
  6598. + <avp name="NAS-Filter-Rule" code="400" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  6599. <type type-name="IPFilterRule"/>
  6600. </avp>
  6601. - <avp name="Tunneling" code="401">
  6602. - <grouped>
  6603. - <gavp name="CHAP-Algorithm"/>
  6604. - <gavp name="CHAP-Ident"/>
  6605. - <gavp name="CHAP-Response"/>
  6606. - </grouped>
  6607. - </avp>
  6608. - <avp name="CHAP-Auth" code="402">
  6609. + <avp name="Tunneling" code="401" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
  6610. <grouped>
  6611. <gavp name="Tunnel-Type"/>
  6612. <gavp name="Tunnel-Medium-Type"/>
  6613. @@ -40,18 +63,25 @@
  6614. <gavp name="Tunnel-Private-Group-Id"/>
  6615. </grouped>
  6616. </avp>
  6617. - <avp name="CHAP-Algorithm" code="403">
  6618. + <avp name="CHAP-Auth" code="402" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  6619. + <grouped>
  6620. + <gavp name="CHAP-Algorithm"/>
  6621. + <gavp name="CHAP-Ident"/>
  6622. + <gavp name="CHAP-Response"/>
  6623. + </grouped>
  6624. + </avp>
  6625. + <avp name="CHAP-Algorithm" code="403" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  6626. <type type-name="Enumerated"/>
  6627. <enum name="CHAP with MD5" code="5"/>
  6628. </avp>
  6629. - <avp name="CHAP-Ident" code="404">
  6630. + <avp name="CHAP-Ident" code="404" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  6631. <type type-name="OctetString"/>
  6632. </avp>
  6633. - <avp name="OctetString" code="405">
  6634. - <type type-name="IPFilterRule"/>
  6635. + <avp name="CHAP-Response" code="405" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  6636. + <type type-name="OctetString"/>
  6637. </avp>
  6638. - <avp name="Accounting-Auth-Method" code="406">
  6639. - <type type-name="Unsigned32"/>
  6640. + <avp name="Accounting-Auth-Method" code="406" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  6641. + <type type-name="Enumerated"/>
  6642. <enum name="PAP" code="1"/>
  6643. <enum name="CHAP" code="2"/>
  6644. <enum name="MS-CHAP-1" code="3"/>
  6645. @@ -62,7 +92,7 @@
  6646. <avp name="QoS-Filter-Rule" code="407">
  6647. <type type-name="QoSFilterRule"/>
  6648. </avp>
  6649. - <avp name="Origin-AAA-Protocol" code="408">
  6650. + <avp name="Origin-AAA-Protocol" code="408" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
  6651. <type type-name="Enumerated"/>
  6652. <enum name="RADIUS" code="1"/>
  6653. </avp>
  6654. diff -urN wireshark-1.2.8/diameter/sip.xml wireshark-1.2.9/diameter/sip.xml
  6655. --- wireshark-1.2.8/diameter/sip.xml 2010-05-05 10:11:34.000000000 -0700
  6656. +++ wireshark-1.2.9/diameter/sip.xml 2010-06-08 16:25:45.000000000 -0700
  6657. @@ -1,5 +1,5 @@
  6658. <?xml version="1.0" encoding="UTF-8"?>
  6659. -<!-- $Id: sip.xml 20009 2006-11-28 05:59:24Z etxrab $ -->
  6660. +<!-- $Id: sip.xml 33127 2010-06-07 12:51:23Z etxrab $ -->
  6661.  
  6662.  
  6663. <application id="6" name="Diameter Session Initiation Protocol (SIP) Application" uri="http://www.ietf.org/internet-drafts/draft-ietf-aaa-diameter-sip-app-12.txt">
  6664. @@ -19,13 +19,13 @@
  6665. <gavp name="SIP-Credit-Control-Server-URI"/>
  6666. </grouped>
  6667. </avp>
  6668. - <avp name="SIP-Accounting-Server-URI" code="369" mandatory="must" vendor-bit="mustnot" vendor-id="TGPP" may-encrypt="yes">
  6669. + <avp name="SIP-Accounting-Server-URI" code="369" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
  6670. <type type-name="DiameterURI"/>
  6671. </avp>
  6672. - <avp name="SIP-Credit-Control-Server-URI" code="370" mandatory="must" vendor-bit="mustnot" vendor-id="TGPP" may-encrypt="yes">
  6673. + <avp name="SIP-Credit-Control-Server-URI" code="370" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
  6674. <type type-name="DiameterURI"/>
  6675. </avp>
  6676. - <avp name="SIP-Server-URI" code="371" mandatory="must" vendor-bit="mustnot" vendor-id="TGPP" may-encrypt="yes">
  6677. + <avp name="SIP-Server-URI" code="371" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
  6678. <type type-name="UTF8String"/>
  6679. </avp>
  6680. <avp name="SIP-Server-Capabilities" code="372" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
  6681. @@ -127,19 +127,19 @@
  6682. <enum name="SIP_SERVER_CHANGE" code="2"/>
  6683. <enum name="REMOVE_SIP_SERVER" code="3"/>
  6684. </avp>
  6685. - <avp name="SIP-Reason-Info" code="385" mandatory="must" vendor-bit="mustnot" vendor-id="TGPP" may-encrypt="yes">
  6686. + <avp name="SIP-Reason-Info" code="385" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
  6687. <type type-name="UTF8String"/>
  6688. </avp>
  6689. - <avp name="SIP-Visited-Network-Id" code="386" mandatory="must" vendor-bit="mustnot" vendor-id="TGPP" may-encrypt="yes">
  6690. + <avp name="SIP-Visited-Network-Id" code="386" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
  6691. <type type-name="UTF8String"/>
  6692. </avp>
  6693. - <avp name="SIP-User-Authorization-Type" code="387" mandatory="must" may-encrypt="yes">
  6694. + <avp name="SIP-User-Authorization-Type" code="387" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
  6695. <type type-name="Enumerated"/>
  6696. <enum name="REGISTRATION" code="0"/>
  6697. <enum name="DEREGISTRATION" code="1"/>
  6698. <enum name="REGISTRATION_AND_CAPABILITIES" code="2"/>
  6699. </avp>
  6700. - <avp name="SIP-Supported-User-Data-Type" code="388" mandatory="must" vendor-bit="mustnot" vendor-id="TGPP" may-encrypt="yes">
  6701. + <avp name="SIP-Supported-User-Data-Type" code="388" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
  6702. <type type-name="UTF8String"/>
  6703. </avp>
  6704. <avp name="SIP-User-Data" code="389" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
  6705. @@ -148,18 +148,18 @@
  6706. <gavp name="SIP-User-Data-Contents"/>
  6707. </grouped>
  6708. </avp>
  6709. - <avp name="SIP-User-Data-Type" code="390" mandatory="must" vendor-bit="mustnot" vendor-id="TGPP" may-encrypt="yes">
  6710. + <avp name="SIP-User-Data-Type" code="390" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
  6711. <type type-name="UTF8String"/>
  6712. </avp>
  6713. - <avp name="SIP-User-Data-Contents" code="391" mandatory="must" vendor-bit="mustnot" vendor-id="TGPP" may-encrypt="yes">
  6714. + <avp name="SIP-User-Data-Contents" code="391" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
  6715. <type type-name="OctetString"/>
  6716. </avp>
  6717. - <avp name="SIP-User-Data-Already-Available" code="392" mandatory="must" may-encrypt="yes">
  6718. + <avp name="SIP-User-Data-Already-Available" code="392" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
  6719. <type type-name="Enumerated"/>
  6720. <enum name="USER_DATA_NOT_AVAILABLE" code="0"/>
  6721. <enum name="USER_DATA_ALREADY_AVAILABLE" code="1"/>
  6722. </avp>
  6723. - <avp name="SIP-Method" code="393" mandatory="must" vendor-bit="mustnot" vendor-id="TGPP" may-encrypt="yes">
  6724. + <avp name="SIP-Method" code="393" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
  6725. <type type-name="UTF8String"/>
  6726. </avp>
  6727. </application>
  6728. diff -urN wireshark-1.2.8/diameter/TGPPGmb.xml wireshark-1.2.9/diameter/TGPPGmb.xml
  6729. --- wireshark-1.2.8/diameter/TGPPGmb.xml 2010-05-05 10:11:34.000000000 -0700
  6730. +++ wireshark-1.2.9/diameter/TGPPGmb.xml 2010-06-08 16:25:45.000000000 -0700
  6731. @@ -1,6 +1,6 @@
  6732. -<!-- $Id: TGPPGmb.xml 32642 2010-05-03 07:49:50Z etxrab $ -->
  6733. +<!-- $Id: TGPPGmb.xml 33127 2010-06-07 12:51:23Z etxrab $ -->
  6734.  
  6735. - <!-- 3GPP TS 29.061 version 7.5.0 Release 7 -->
  6736. + <!-- 3GPP TS 29.061 version 9.2.0 Release 9 -->
  6737.  
  6738. <application id="16777223" name="3GPP Gmb" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
  6739. <!--
  6740. @@ -10,61 +10,61 @@
  6741. <avp name="3GPP-IMSI" code="1" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6742. <type type-name="UTF8String"/>
  6743. </avp>
  6744. - <avp name="3GPP-Charging ID" code="2" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6745. - <type type-name="Integer32"/>
  6746. - </avp>
  6747. - <avp name="3GPP-PDP type" code="3" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6748. - <type type-name="Integer32"/>
  6749. - </avp>
  6750. - <avp name="3GPP-Charging Gateway address" code="4" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6751. - <type type-name="IPAddress"/>
  6752. - </avp>
  6753. - <avp name="3GPP-GPRS Negotiated QoS profile" code="5" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6754. - <type type-name="UTF8String"/>
  6755. - </avp>
  6756. - <avp name="3GPP-SGSNAddress" code="6" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6757. + <avp name="3GPP-Charging-Id" code="2" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6758. + <type type-name="Integer32"/>
  6759. + </avp>
  6760. + <avp name="3GPP-PDP-Type" code="3" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6761. + <type type-name="Integer32"/>
  6762. + </avp>
  6763. + <avp name="3GPP-CG-Address" code="4" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6764. + <type type-name="IPAddress"/>
  6765. + </avp>
  6766. + <avp name="3GPP-GPRS-Negotiated-QoS-profile" code="5" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6767. + <type type-name="UTF8String"/>
  6768. + </avp>
  6769. + <avp name="3GPP-SGSN-Address" code="6" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6770. + <type type-name="IPAddress"/>
  6771. + </avp>
  6772. + <avp name="3GPP-GGSN-Address" code="7" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6773. <type type-name="IPAddress"/>
  6774. </avp>
  6775. - <avp name="3GPP-GGSN address" code="7" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6776. - <type type-name="IPAddress"/>
  6777. - </avp>
  6778. - <avp name="3GPP-IMSI-MCC-MNC" code="8" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6779. - <type type-name="UTF8String"/>
  6780. - </avp>
  6781. - <avp name="3GPP-GGSN-MCC-MNC" code="9" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6782. - <type type-name="UTF8String"/>
  6783. - </avp>
  6784. - <avp name="3GPP-NSAPI" code="10" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6785. - <type type-name="UTF8String"/>
  6786. - </avp>
  6787. - <avp name="3GPP-Session Stop Indicator" code="11" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6788. - <type type-name="UTF8String"/>
  6789. - </avp>
  6790. - <avp name="3GPP-Selection-Mode" code="12" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6791. - <type type-name="UTF8String"/>
  6792. - </avp>
  6793. - <avp name="3GPP-Charging-Characteristics" code="13" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6794. - <type type-name="UTF8String"/>
  6795. - </avp>
  6796. - <avp name="3GPP-Charging Gateway IPv6 address" code="14" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6797. - <type type-name="OctetString"/>
  6798. - </avp>
  6799. - <avp name="3GPP-SGSN-IPv6-Address" code="15" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6800. - <type type-name="OctetString"/>
  6801. - </avp>
  6802. - <avp name="3GPP-GGSN IPv6 address" code="16" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6803. - <type type-name="OctetString"/>
  6804. - </avp>
  6805. - <avp name="3GPP-IPv6-DNS-Server" code="17" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6806. - <type type-name="OctetString"/>
  6807. - </avp>
  6808. - <avp name="3GPP-SGSN-MCC-MNC" code="18" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6809. - <type type-name="UTF8String"/>
  6810. - </avp>
  6811. - <avp name="3GPP-Teardown Indicator" code="19" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6812. - <type type-name="OctetString"/>
  6813. - </avp>
  6814. - <avp name="3GPP-IMEISV" code="20" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6815. + <avp name="3GPP-IMSI-MCC-MNC" code="8" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6816. + <type type-name="UTF8String"/>
  6817. + </avp>
  6818. + <avp name="3GPP-GGSN-MCC-MNC" code="9" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6819. + <type type-name="UTF8String"/>
  6820. + </avp>
  6821. + <avp name="3GPP-NSAPI" code="10" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6822. + <type type-name="UTF8String"/>
  6823. + </avp>
  6824. + <avp name="3GPP-Session-Stop-Indicator" code="11" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6825. + <type type-name="UTF8String"/>
  6826. + </avp>
  6827. + <avp name="3GPP-Selection-Mode" code="12" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6828. + <type type-name="UTF8String"/>
  6829. + </avp>
  6830. + <avp name="3GPP-Charging-Characteristics" code="13" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6831. + <type type-name="UTF8String"/>
  6832. + </avp>
  6833. + <avp name="3GPP-CG-IPv6-Address" code="14" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6834. + <type type-name="OctetString"/>
  6835. + </avp>
  6836. + <avp name="3GPP-SGSN-IPv6-Address" code="15" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6837. + <type type-name="OctetString"/>
  6838. + </avp>
  6839. + <avp name="3GPP-GGSN-IPv6-Address" code="16" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6840. + <type type-name="OctetString"/>
  6841. + </avp>
  6842. + <avp name="3GPP-IPv6-DNS-Server" code="17" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6843. + <type type-name="OctetString"/>
  6844. + </avp>
  6845. + <avp name="3GPP-SGSN-MCC-MNC" code="18" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6846. + <type type-name="UTF8String"/>
  6847. + </avp>
  6848. + <avp name="3GPP-Teardown-Indicator" code="19" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6849. + <type type-name="OctetString"/>
  6850. + </avp>
  6851. + <avp name="3GPP-IMEISV" code="20" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6852. <type type-name="OctetString"/>
  6853. </avp>
  6854. <avp name="3GPP-RAT-Type" code="21" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6855. @@ -73,75 +73,68 @@
  6856. <avp name="3GPP-User-Location-Info" code="22" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6857. <type type-name="OctetString"/>
  6858. </avp>
  6859. - <avp name="3GPP-MSTimeZone" code="23" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6860. + <avp name="3GPP-MS-TimeZone" code="23" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6861. + <type type-name="OctetString"/>
  6862. + </avp>
  6863. + <avp name="3GPP-CAMEL-Charging-Info" code="24" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6864. + <type type-name="OctetString"/>
  6865. + </avp>
  6866. + <avp name="3GPP-Packet-Filter" code="25" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6867. + <type type-name="OctetString"/>
  6868. + </avp>
  6869. + <avp name="3GPP-Negotiated-DSCP" code="26" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6870. <type type-name="OctetString"/>
  6871. </avp>
  6872. - <avp name="3GPP-Camel-Charging-Info" code="24" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6873. - <type type-name="OctetString"/>
  6874. - </avp>
  6875. - <avp name="3GPP-Packet-Filter" code="25" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6876. - <type type-name="OctetString"/>
  6877. - </avp>
  6878. - <avp name="3GPP-Negotiated-DSCP" code="26" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6879. - <type type-name="OctetString"/>
  6880. - </avp>
  6881. - <avp name="3GPP-Allocate-IPType" code="27" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6882. - <type type-name="OctetString"/>
  6883. - </avp>
  6884. -
  6885. - <avp name="TMGI" code="900" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6886. + <avp name="3GPP-Allocate-IP-Type" code="27" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6887. <type type-name="OctetString"/>
  6888. </avp>
  6889.  
  6890. - <avp name="Required-MBMSBearer-Capabilities" code="901" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6891. + <avp name="TMGI" code="900" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6892. + <type type-name="OctetString"/>
  6893. + </avp>
  6894. + <avp name="Required-MBMS-Bearer-Capabilities" code="901" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6895. <type type-name="UTF8String"/>
  6896. </avp>
  6897. -
  6898. <avp name="MBMS-StartStop-Indication" code="902" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6899. <type type-name="Enumerated"/>
  6900. <enum name="START" code="0"/>
  6901. <enum name="STOP" code="1"/>
  6902. + <enum name="UPDATE" code="1"/>
  6903. </avp>
  6904. -
  6905. <avp name="MBMS-Service-Area" code="903" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6906. <type type-name="OctetString"/>
  6907. </avp>
  6908. -
  6909. <avp name="MBMS-Session-Duration" code="904" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6910. <type type-name="OctetString"/>
  6911. </avp>
  6912. -
  6913. <avp name="Alternative-APN" code="905" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6914. <type type-name="UTF8String"/>
  6915. </avp>
  6916. -
  6917. <avp name="MBMS-Service-Type" code="906" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6918. <type type-name="Enumerated"/>
  6919. <enum name="MULTICAST" code="0"/>
  6920. <enum name="BROADCAST" code="1"/>
  6921. </avp>
  6922. -
  6923. <avp name="MBMS-2G-3G-Indicator" code="907" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6924. <type type-name="Enumerated"/>
  6925. <enum name="2G" code="0"/>
  6926. <enum name="3G" code="1"/>
  6927. <enum name="2G-AND-3G" code="2"/>
  6928. </avp>
  6929. -
  6930. + <avp name="MBMS-Session-Identity" code="908" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6931. + <type type-name="OctetString"/>
  6932. + </avp>
  6933. <avp name="RAI" code="909" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6934. <type type-name="UTF8String"/>
  6935. </avp>
  6936. -
  6937. <avp name="Additional-MBMS-Trace-Info" code="910" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6938. <type type-name="OctetString"/>
  6939. </avp>
  6940. -
  6941. <avp name="MBMS-Time-To-Data-Transfer" code="911" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6942. <type type-name="OctetString"/>
  6943. </avp>
  6944. -
  6945. - <avp name="MBMS-Session-Identity-Repetition-Number" code="912" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6946. - <type type-name="Unsigned32"/>
  6947. + <avp name="MBMS-Session-Repetition-Number" code="912" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6948. + <type type-name="OctetString"/>
  6949. </avp>
  6950. <avp name="MBMS-Required-QoS" code="913" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6951. <type type-name="UTF8String"/>
  6952. @@ -168,7 +161,20 @@
  6953. <avp name="MBMS-BMSC-SSM-IPv6-Address" code="919" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6954. <type type-name="OctetString"/>
  6955. </avp>
  6956. + <avp name="MBMS-Flow-Identifier" code="920" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6957. + <type type-name="OctetString"/>
  6958. + </avp>
  6959. + <avp name="CN-IP-Multicast-Distribution" code="921" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6960. + <type type-name="Enumerated"/>
  6961. + <enum name="NO-IP-MULTICAST" code="0"/>
  6962. + <enum name="IP-MULTICAST" code="1"/>
  6963. + </avp>
  6964. + <avp name="MBMS-HC-Indicator" code="922" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
  6965. + <type type-name="Enumerated"/>
  6966. + <enum name="uncompressed-header" code="0"/>
  6967. + <enum name="compressed-header" code="1"/>
  6968. + </avp>
  6969. <!--
  6970. -Note: The AVP codes from 915 to 999 are reserved for TS 29.061
  6971. +Note: The AVP codes from 923 to 999 are reserved for TS 29.061
  6972. -->
  6973. </application>
  6974. diff -urN wireshark-1.2.8/doc/dfilter2pod.pl wireshark-1.2.9/doc/dfilter2pod.pl
  6975. --- wireshark-1.2.8/doc/dfilter2pod.pl 2010-05-05 10:11:28.000000000 -0700
  6976. +++ wireshark-1.2.9/doc/dfilter2pod.pl 2010-06-08 16:25:41.000000000 -0700
  6977. @@ -1,6 +1,6 @@
  6978. #!/usr/bin/perl
  6979. #
  6980. -# Reads the display filter keyword dump produced by 'wireshark -G' and
  6981. +# Reads the display filter keyword dump produced by 'tshark -G' and
  6982. # formats it for a pod document. The pod document is then used to
  6983. # make a manpage
  6984. #
  6985. @@ -9,7 +9,7 @@
  6986. # will be replaced by the pod-formatted glossary
  6987. # STDOUT is the output
  6988. #
  6989. -# $Id: dfilter2pod.pl 28071 2009-04-17 03:53:19Z gerald $
  6990. +# $Id: dfilter2pod.pl 33115 2010-06-06 22:13:16Z gerald $
  6991.  
  6992. use Getopt::Std;
  6993.  
  6994. @@ -27,18 +27,24 @@
  6995. 'FT_INT24', 'Signed 24-bit integer',
  6996. 'FT_INT32', 'Signed 32-bit integer',
  6997. 'FT_INT64', 'Signed 64-bit integer',
  6998. + 'FT_FLOAT', 'Single-precision floating point',
  6999. 'FT_DOUBLE', 'Double-precision floating point',
  7000. 'FT_ABSOLUTE_TIME', 'Date/Time stamp',
  7001. 'FT_RELATIVE_TIME', 'Time duration',
  7002. 'FT_STRING', 'String',
  7003. - 'FT_STRINGZ', 'String',
  7004. - 'FT_UINT_STRING', 'String',
  7005. + 'FT_STRINGZ', 'NULL terminated string',
  7006. + 'FT_EBCDIC', 'EBCDIC string',
  7007. + 'FT_UINT_STRING', 'Length string pair',
  7008. 'FT_ETHER', '6-byte Hardware (MAC) Address',
  7009. 'FT_BYTES', 'Byte array',
  7010. + 'FT_UINT_BYTES', 'Length byte array pair',
  7011. 'FT_IPv4', 'IPv4 address',
  7012. 'FT_IPv6', 'IPv6 address',
  7013. 'FT_IPXNET', 'IPX network or server name',
  7014. 'FT_FRAMENUM', 'Frame number',
  7015. + 'FT_PCRE', 'Perl Compatible Regular Expression',
  7016. + 'FT_GUID', 'Globally Unique Identifier',
  7017. + 'FT_OID', 'Object Identifier',
  7018. );
  7019.  
  7020. getopts('e');
  7021. diff -urN wireshark-1.2.8/doc/README.developer wireshark-1.2.9/doc/README.developer
  7022. --- wireshark-1.2.8/doc/README.developer 2010-05-05 10:11:28.000000000 -0700
  7023. +++ wireshark-1.2.9/doc/README.developer 2010-06-08 16:25:41.000000000 -0700
  7024. @@ -1,5 +1,5 @@
  7025. -$Revision: 31596 $
  7026. -$Date: 2010-01-20 14:53:59 -0800 (Wed, 20 Jan 2010) $
  7027. +$Revision: 33123 $
  7028. +$Date: 2010-06-06 18:58:57 -0700 (Sun, 06 Jun 2010) $
  7029. $Author: gerald $
  7030. Tabsize: 4
  7031.  
  7032. @@ -194,6 +194,26 @@
  7033.  
  7034. 11644473600ULL
  7035.  
  7036. +Don't assume that you can scan through a va_list initialized by va_start
  7037. +more than once without closing it with va_end and re-initalizing it with
  7038. +va_start. This applies even if you're not scanning through it yourself,
  7039. +but are calling a routine that scans through it, such as vfprintf() or
  7040. +one of the routines in Wireshark that takes a format and a va_list as an
  7041. +argument. You must do
  7042. +
  7043. + va_start(ap, format);
  7044. + call_routine1(xxx, format, ap);
  7045. + va_end(ap);
  7046. + va_start(ap, format);
  7047. + call_routine2(xxx, format, ap);
  7048. + va_end(ap);
  7049. +
  7050. +rather
  7051. + va_start(ap, format);
  7052. + call_routine1(xxx, format, ap);
  7053. + call_routine2(xxx, format, ap);
  7054. + va_end(ap);
  7055. +
  7056. Don't use a label without a statement following it. For example,
  7057. something such as
  7058.  
  7059. diff -urN wireshark-1.2.8/epan/column-utils.c wireshark-1.2.9/epan/column-utils.c
  7060. --- wireshark-1.2.8/epan/column-utils.c 2010-05-05 10:13:00.000000000 -0700
  7061. +++ wireshark-1.2.9/epan/column-utils.c 2010-06-08 16:27:30.000000000 -0700
  7062. @@ -1,7 +1,7 @@
  7063. /* column-utils.c
  7064. * Routines for column utilities.
  7065. *
  7066. - * $Id: column-utils.c 27984 2009-04-07 16:36:52Z gerald $
  7067. + * $Id: column-utils.c 33123 2010-06-07 01:58:57Z gerald $
  7068. *
  7069. * Wireshark - Network traffic analyzer
  7070. * By Gerald Combs <gerald@wireshark.org>
  7071. @@ -251,7 +251,6 @@
  7072. else
  7073. max_len = COL_MAX_LEN;
  7074.  
  7075. - va_start(ap, format);
  7076. for (i = cinfo->col_first[el]; i <= cinfo->col_last[el]; i++) {
  7077. if (cinfo->fmt_matx[i][el]) {
  7078. fence = cinfo->col_fence[i];
  7079. @@ -267,11 +266,12 @@
  7080. */
  7081. cinfo->col_data[i] = cinfo->col_buf[i];
  7082. }
  7083. + va_start(ap, format);
  7084. g_vsnprintf(&cinfo->col_buf[i][fence], max_len - fence, format, ap);
  7085. + va_end(ap);
  7086. cinfo->col_buf[i][max_len - 1] = '\0';
  7087. }
  7088. }
  7089. - va_end(ap);
  7090. }
  7091.  
  7092. void
  7093. @@ -283,13 +283,14 @@
  7094. if (!have_custom_cols(ci))
  7095. return;
  7096.  
  7097. - va_start(ap, format);
  7098. for (i = ci->col_first[COL_CUSTOM];
  7099. i <= ci->col_last[COL_CUSTOM]; i++) {
  7100. if (ci->fmt_matx[i][COL_CUSTOM] &&
  7101. strcmp(ci->col_custom_field[i], hfinfo->abbrev) == 0) {
  7102. ci->col_data[i] = ci->col_buf[i];
  7103. + va_start(ap, format);
  7104. g_vsnprintf(ci->col_buf[i], COL_MAX_LEN, format, ap);
  7105. + va_end(ap);
  7106.  
  7107. g_strlcpy(ci->col_expr.col_expr[i], hfinfo->abbrev, COL_MAX_LEN);
  7108.  
  7109. @@ -306,7 +307,6 @@
  7110. }
  7111. }
  7112. }
  7113. - va_end(ap);
  7114. }
  7115.  
  7116. void
  7117. @@ -449,7 +449,6 @@
  7118. else
  7119. max_len = COL_MAX_LEN;
  7120.  
  7121. - va_start(ap, format);
  7122. for (i = cinfo->col_first[el]; i <= cinfo->col_last[el]; i++) {
  7123. if (cinfo->fmt_matx[i][el]) {
  7124. if (cinfo->col_data[i] != cinfo->col_buf[i]) {
  7125. @@ -459,7 +458,9 @@
  7126. g_strlcpy(orig_buf, cinfo->col_buf[i], max_len);
  7127. orig = orig_buf;
  7128. }
  7129. + va_start(ap, format);
  7130. g_vsnprintf(cinfo->col_buf[i], max_len, format, ap);
  7131. + va_end(ap);
  7132. cinfo->col_buf[i][max_len - 1] = '\0';
  7133.  
  7134. /*
  7135. @@ -472,7 +473,6 @@
  7136. cinfo->col_data[i] = cinfo->col_buf[i];
  7137. }
  7138. }
  7139. - va_end(ap);
  7140. }
  7141. void
  7142. col_prepend_fence_fstr(column_info *cinfo, gint el, const gchar *format, ...)
  7143. @@ -491,7 +491,6 @@
  7144. else
  7145. max_len = COL_MAX_LEN;
  7146.  
  7147. - va_start(ap, format);
  7148. for (i = cinfo->col_first[el]; i <= cinfo->col_last[el]; i++) {
  7149. if (cinfo->fmt_matx[i][el]) {
  7150. if (cinfo->col_data[i] != cinfo->col_buf[i]) {
  7151. @@ -501,7 +500,9 @@
  7152. g_strlcpy(orig_buf, cinfo->col_buf[i], max_len);
  7153. orig = orig_buf;
  7154. }
  7155. + va_start(ap, format);
  7156. g_vsnprintf(cinfo->col_buf[i], max_len, format, ap);
  7157. + va_end(ap);
  7158. cinfo->col_buf[i][max_len - 1] = '\0';
  7159.  
  7160. /*
  7161. @@ -517,7 +518,6 @@
  7162. cinfo->col_data[i] = cinfo->col_buf[i];
  7163. }
  7164. }
  7165. - va_end(ap);
  7166. }
  7167.  
  7168. /* Use this if "str" points to something that won't stay around (and
  7169. diff -urN wireshark-1.2.8/epan/dissectors/packet-ber.c wireshark-1.2.9/epan/dissectors/packet-ber.c
  7170. --- wireshark-1.2.8/epan/dissectors/packet-ber.c 2010-05-05 10:12:52.000000000 -0700
  7171. +++ wireshark-1.2.9/epan/dissectors/packet-ber.c 2010-06-08 16:27:13.000000000 -0700
  7172. @@ -29,7 +29,7 @@
  7173. * Helpers for ASN.1/BER dissection
  7174. * Ronnie Sahlberg (C) 2004
  7175. *
  7176. - * $Id: packet-ber.c 30658 2009-10-22 00:15:46Z gerald $
  7177. + * $Id: packet-ber.c 33122 2010-06-07 01:26:43Z gerald $
  7178. *
  7179. * Wireshark - Network traffic analyzer
  7180. * By Gerald Combs <gerald@wireshark.org>
  7181. @@ -756,20 +756,24 @@
  7182. return offset;
  7183. }
  7184.  
  7185. -/* this function gets the length octets of the BER TLV.
  7186. - * We only handle (TAGs and) LENGTHs that fit inside 32 bit integers.
  7187. +/** Try to get the length octets of the BER TLV.
  7188. + * Only (TAGs and) LENGTHs that fit inside 32 bit integers are supported.
  7189. + *
  7190. + * @return TRUE if we have the entire length, FALSE if we're in the middle of
  7191. + * an indefinite length and haven't reached EOC.
  7192. */
  7193. /* 8.1.3 Length octets */
  7194. -int
  7195. -get_ber_length(tvbuff_t *tvb, int offset, guint32 *length, gboolean *ind) {
  7196. +static gboolean
  7197. +try_get_ber_length(tvbuff_t *tvb, int *bl_offset, guint32 *length, gboolean *ind) {
  7198. + int offset = *bl_offset;
  7199. guint8 oct, len;
  7200. - guint32 tmp_len;
  7201. + guint32 tmp_len;
  7202. guint32 tmp_length;
  7203. gboolean tmp_ind;
  7204. - int tmp_offset,s_offset;
  7205. + int tmp_offset;
  7206. gint8 tclass;
  7207. - gboolean tpc;
  7208. gint32 ttag;
  7209. +
  7210. tmp_length = 0;
  7211. tmp_ind = FALSE;
  7212.  
  7213. @@ -791,24 +795,21 @@
  7214. } else {
  7215. /* 8.1.3.6 */
  7216.  
  7217. + /* indefinite length encoded - must be constructed */
  7218. tmp_offset = offset;
  7219. - /* ok in here we can traverse the BER to find the length, this will fix most indefinite length issues */
  7220. - /* Assumption here is that indefinite length is always used on constructed types*/
  7221. - /* check for EOC */
  7222. - while (tvb_get_guint8(tvb, offset) || tvb_get_guint8(tvb, offset+1)) {
  7223. - /* not an EOC at offset */
  7224. - s_offset=offset;
  7225. - offset= get_ber_identifier(tvb, offset, &tclass, &tpc, &ttag);
  7226. - offset= get_ber_length(tvb,offset, &tmp_len, NULL);
  7227. - tmp_length += tmp_len+(offset-s_offset); /* length + tag and length */
  7228. - offset += tmp_len;
  7229. - /* Make sure we've moved forward in the packet */
  7230. - if (offset <= s_offset)
  7231. - THROW(ReportedBoundsError);
  7232. - }
  7233. - tmp_length += 2;
  7234. +
  7235. + do {
  7236. + tmp_offset = get_ber_identifier(tvb, tmp_offset, &tclass, NULL, &ttag);
  7237. +
  7238. + try_get_ber_length(tvb, &tmp_offset, &tmp_len, &tmp_ind);
  7239. +
  7240. + tmp_offset += tmp_len;
  7241. +
  7242. + } while (!((tclass == BER_CLASS_UNI) && (ttag == 0) && (tmp_len == 0)));
  7243. +
  7244. + tmp_length = tmp_offset - offset;
  7245. tmp_ind = TRUE;
  7246. - offset = tmp_offset;
  7247. +
  7248. }
  7249. }
  7250.  
  7251. @@ -821,7 +822,22 @@
  7252. printf("get BER length %d, offset %d (remaining %d)\n", tmp_length, offset, tvb_length_remaining(tvb, offset));
  7253. #endif
  7254.  
  7255. - return offset;
  7256. + *bl_offset = offset;
  7257. + return TRUE;
  7258. +}
  7259. +
  7260. +int
  7261. +get_ber_length(tvbuff_t *tvb, int offset, guint32 *length, gboolean *ind)
  7262. +{
  7263. + int bl_offset = offset;
  7264. + guint32 bl_length;
  7265. +
  7266. + try_get_ber_length(tvb, &bl_offset, &bl_length, ind);
  7267. +
  7268. + if (length)
  7269. + *length = bl_length;
  7270. +
  7271. + return bl_offset;
  7272. }
  7273.  
  7274. /* this function dissects the length octets of the BER TLV.
  7275. diff -urN wireshark-1.2.8/epan/dissectors/packet-bgp.h wireshark-1.2.9/epan/dissectors/packet-bgp.h
  7276. --- wireshark-1.2.8/epan/dissectors/packet-bgp.h 2010-05-05 10:12:52.000000000 -0700
  7277. +++ wireshark-1.2.9/epan/dissectors/packet-bgp.h 2010-06-08 16:27:13.000000000 -0700
  7278. @@ -1,7 +1,7 @@
  7279. /* packet-bgp.c
  7280. * Definitions for BGP packet disassembly structures and routine
  7281. *
  7282. - * $Id: packet-bgp.h 28467 2009-05-25 06:48:40Z jake $
  7283. + * $Id: packet-bgp.h 33123 2010-06-07 01:58:57Z gerald $
  7284. *
  7285. * Wireshark - Network traffic analyzer
  7286. * By Gerald Combs <gerald@wireshark.org>
  7287. @@ -132,9 +132,9 @@
  7288. #define BGP_ORF_ADD 0x00
  7289. #define BGP_ORF_REMOVE 0x40
  7290. #define BGP_ORF_REMOVEALL 0x80
  7291. -#define BGP_ORF_MATCH 0x10
  7292. +#define BGP_ORF_MATCH 0x20
  7293. #define BGP_ORF_PERMIT 0x00
  7294. -#define BGP_ORF_DENY 0x10
  7295. +#define BGP_ORF_DENY 0x20
  7296.  
  7297. /* well-known communities, from RFC1997 */
  7298. #define BGP_COMM_NO_EXPORT 0xFFFFFF01
  7299. diff -urN wireshark-1.2.8/epan/dissectors/packet-http.c wireshark-1.2.9/epan/dissectors/packet-http.c
  7300. --- wireshark-1.2.8/epan/dissectors/packet-http.c 2010-05-05 10:12:58.000000000 -0700
  7301. +++ wireshark-1.2.9/epan/dissectors/packet-http.c 2010-06-08 16:27:22.000000000 -0700
  7302. @@ -9,7 +9,7 @@
  7303. * Copyright 2002, Tim Potter <tpot@samba.org>
  7304. * Copyright 1999, Andrew Tridgell <tridge@samba.org>
  7305. *
  7306. - * $Id: packet-http.c 32661 2010-05-04 19:13:29Z gerald $
  7307. + * $Id: packet-http.c 33115 2010-06-06 22:13:16Z gerald $
  7308. *
  7309. * Wireshark - Network traffic analyzer
  7310. * By Gerald Combs <gerald@wireshark.org>
  7311. @@ -36,6 +36,7 @@
  7312.  
  7313. #include <string.h>
  7314. #include <ctype.h>
  7315. +#include <errno.h>
  7316.  
  7317. #include <glib.h>
  7318. #include <epan/conversation.h>
  7319. @@ -2055,6 +2056,7 @@
  7320. break;
  7321.  
  7322. case HDR_CONTENT_LENGTH:
  7323. + errno = 0;
  7324. #if GLIB_CHECK_VERSION(2,12,0)
  7325. eh_ptr->content_length = g_ascii_strtoll(value, &p, 10);
  7326. #elif defined(HAVE_STRTOLL)
  7327. @@ -2065,7 +2067,9 @@
  7328. #endif
  7329.  
  7330. up = (guchar *)p;
  7331. - if (eh_ptr->content_length < 0 || p == value ||
  7332. + if (eh_ptr->content_length < 0 ||
  7333. + p == value ||
  7334. + errno == ERANGE ||
  7335. (*up != '\0' && !isspace(*up))) {
  7336. /*
  7337. * Content length not valid; pretend
  7338. diff -urN wireshark-1.2.8/epan/dissectors/packet-igmp.c wireshark-1.2.9/epan/dissectors/packet-igmp.c
  7339. --- wireshark-1.2.8/epan/dissectors/packet-igmp.c 2010-05-05 10:12:52.000000000 -0700
  7340. +++ wireshark-1.2.9/epan/dissectors/packet-igmp.c 2010-06-08 16:27:13.000000000 -0700
  7341. @@ -4,7 +4,7 @@
  7342. * 2007 Thomas Morin
  7343. * <See AUTHORS for emails>
  7344. *
  7345. - * $Id: packet-igmp.c 27050 2008-12-18 19:08:49Z wmeier $
  7346. + * $Id: packet-igmp.c 33115 2010-06-06 22:13:16Z gerald $
  7347. *
  7348. * Wireshark - Network traffic analyzer
  7349. * By Gerald Combs <gerald@wireshark.org>
  7350. @@ -314,16 +314,20 @@
  7351. };
  7352.  
  7353. #define PRINT_IGMP_VERSION(version) \
  7354. + do { \
  7355. + proto_item *ti; \
  7356. if (check_col(pinfo->cinfo, COL_INFO)) { \
  7357. col_add_fstr(pinfo->cinfo, COL_INFO, \
  7358. "V%d %s",version,val_to_str(type, commands, \
  7359. "Unknown Type:0x%02x")); \
  7360. } \
  7361. /* version of IGMP protocol */ \
  7362. - proto_tree_add_uint(tree, hf_version, tvb, 0, 0, version); \
  7363. + ti = proto_tree_add_uint(tree, hf_version, tvb, 0, 0, version); \
  7364. + PROTO_ITEM_SET_GENERATED(ti); \
  7365. /* type of command */ \
  7366. proto_tree_add_uint(tree, hf_type, tvb, offset, 1, type); \
  7367. - offset += 1;
  7368. + offset += 1; \
  7369. + } while (0);
  7370.  
  7371. void igmp_checksum(proto_tree *tree, tvbuff_t *tvb, int hf_index,
  7372. int hf_index_bad, packet_info *pinfo, guint len)
  7373. diff -urN wireshark-1.2.8/epan/dissectors/packet-ipsec.c wireshark-1.2.9/epan/dissectors/packet-ipsec.c
  7374. --- wireshark-1.2.8/epan/dissectors/packet-ipsec.c 2010-05-05 10:12:51.000000000 -0700
  7375. +++ wireshark-1.2.9/epan/dissectors/packet-ipsec.c 2010-06-08 16:27:12.000000000 -0700
  7376. @@ -1,7 +1,7 @@
  7377. /* packet-ipsec.c
  7378. * Routines for IPsec/IPComp packet disassembly
  7379. *
  7380. - * $Id: packet-ipsec.c 31608 2010-01-21 21:32:51Z gerald $
  7381. + * $Id: packet-ipsec.c 33135 2010-06-07 16:20:00Z gerald $
  7382. *
  7383. * Wireshark - Network traffic analyzer
  7384. * By Gerald Combs <gerald@wireshark.org>
  7385. @@ -1562,7 +1562,7 @@
  7386. int auth_algo_libgcrypt = 0;
  7387. unsigned char *authenticator_data_computed = NULL;
  7388. unsigned char *authenticator_data_computed_md;
  7389. -
  7390. + unsigned char ctr_block[16];
  7391.  
  7392. /*
  7393. * load the top pane info. This should be overwritten by
  7394. @@ -2328,11 +2328,19 @@
  7395.  
  7396. else
  7397. {
  7398. - err = gcry_cipher_setkey (cypher_hd, esp_crypt_key, esp_crypt_key_len);
  7399. + if (crypt_mode_libgcrypt == GCRY_CIPHER_MODE_CTR)
  7400. + {
  7401. + /* Counter mode key includes a 4 byte, (32 bit), nonce following the key */
  7402. + err = gcry_cipher_setkey (cypher_hd, esp_crypt_key, esp_crypt_key_len - 4);
  7403. + }
  7404. + else
  7405. + {
  7406. + err = gcry_cipher_setkey (cypher_hd, esp_crypt_key, esp_crypt_key_len);
  7407. + }
  7408. if (err)
  7409. {
  7410. - fprintf(stderr,"<IPsec/ESP Dissector> Error in Algorithm %s Mode %d, gcry_cipher_setkey failed: %s\n",
  7411. - gcry_cipher_algo_name(crypt_algo_libgcrypt), crypt_mode_libgcrypt, gpg_strerror (err));
  7412. + fprintf(stderr,"<IPsec/ESP Dissector> Error in Algorithm %s Mode %d, gcry_cipher_setkey(key_len=%d) failed: %s\n",
  7413. + gcry_cipher_algo_name(crypt_algo_libgcrypt), crypt_mode_libgcrypt, esp_crypt_key_len, gpg_strerror (err));
  7414. gcry_cipher_close (cypher_hd);
  7415. g_free(encrypted_data);
  7416. g_free(decrypted_data);
  7417. @@ -2340,7 +2348,25 @@
  7418. }
  7419. else
  7420. {
  7421. - err = gcry_cipher_decrypt (cypher_hd, decrypted_data, decrypted_len_alloc + esp_iv_len, encrypted_data, decrypted_len_alloc);
  7422. + if (crypt_mode_libgcrypt == GCRY_CIPHER_MODE_CTR)
  7423. + {
  7424. + memset(ctr_block, 0, 16);
  7425. + memcpy(ctr_block, esp_crypt_key + esp_crypt_key_len - 4, 4);
  7426. + memcpy(ctr_block + 4, encrypted_data, 8);
  7427. + ctr_block[15] = 1;
  7428. + err = gcry_cipher_setctr (cypher_hd, ctr_block, 16);
  7429. + if (!err)
  7430. + {
  7431. + memcpy(decrypted_data, encrypted_data, esp_iv_len);
  7432. + err = gcry_cipher_decrypt (cypher_hd, decrypted_data + esp_iv_len, decrypted_len_alloc,
  7433. + encrypted_data + esp_iv_len, decrypted_len_alloc - esp_iv_len);
  7434. + }
  7435. + }
  7436. + else
  7437. + {
  7438. + err = gcry_cipher_decrypt (cypher_hd, decrypted_data, decrypted_len_alloc + esp_iv_len,
  7439. + encrypted_data, decrypted_len_alloc);
  7440. + }
  7441. if (err)
  7442. {
  7443. fprintf(stderr,"<IPsec/ESP Dissector> Error in Algorithm %s, Mode %d, gcry_cipher_decrypt failed: %s\n",
  7444. diff -urN wireshark-1.2.8/epan/dissectors/packet-kerberos.c wireshark-1.2.9/epan/dissectors/packet-kerberos.c
  7445. --- wireshark-1.2.8/epan/dissectors/packet-kerberos.c 2010-05-05 10:12:50.000000000 -0700
  7446. +++ wireshark-1.2.9/epan/dissectors/packet-kerberos.c 2010-06-08 16:27:11.000000000 -0700
  7447. @@ -28,7 +28,7 @@
  7448. * in Heimdal:
  7449. * http://loka.it.su.se/source/xref/heimdal/heimdal/lib/asn1/k5.asn1
  7450. *
  7451. - * $Id: packet-kerberos.c 31627 2010-01-22 22:36:47Z gerald $
  7452. + * $Id: packet-kerberos.c 33115 2010-06-06 22:13:16Z gerald $
  7453. *
  7454. * Wireshark - Network traffic analyzer
  7455. * By Gerald Combs <gerald@wireshark.org>
  7456. @@ -1009,7 +1009,7 @@
  7457. #define KRB5_CHKSUM_KRB_DES_MAC_K 5
  7458. #define KRB5_CHKSUM_MD5 7
  7459. #define KRB5_CHKSUM_MD5_DES 8
  7460. -/* the following four comes from packetcable */
  7461. +/* the following four come from packetcable */
  7462. #define KRB5_CHKSUM_MD5_DES3 9
  7463. #define KRB5_CHKSUM_HMAC_SHA1_DES3_KD 12
  7464. #define KRB5_CHKSUM_HMAC_SHA1_DES3 13
  7465. @@ -1069,11 +1069,15 @@
  7466. /* preauthentication types >127 (i.e. negative ones) are app specific.
  7467. Hopefully there will be no collisions here or we will have to
  7468. come up with something better.
  7469. - Note: These values are compared against 32-bit values in the code.
  7470. + XXX: Although KRB5_PA_PAC_REQUEST is " >127 " and thus presumably
  7471. + would be encoded as a negative number, various captures seen all
  7472. + have this pa-data-type encoded as a positive number (0x0080).
  7473. + We'll assume that KRB5_PA_S4U2SELF is also encoded as a positive number.
  7474. */
  7475. -#define KRB5_PA_PAC_REQUEST -128 /* = 0xFFFFFF80 = (gint32)((gint8)0x80) MS extension */
  7476. -#define KRB5_PA_S4U2SELF -127 /* = 0xFFFFFF81 = (gint32)((gint8)0x81) Impersonation (Microsoft extension) */
  7477. -#define KRB5_PA_PROV_SRV_LOCATION -1 /* = 0xFFFFFFFF = (gint32)((gint8)0xFF) packetcable stuff */
  7478. +#define KRB5_PA_PAC_REQUEST 128 /* (Microsoft extension) */
  7479. +#define KRB5_PA_S4U2SELF 129 /* Impersonation (Microsoft extension) */
  7480. +
  7481. +#define KRB5_PA_PROV_SRV_LOCATION 0xffffffff /* (gint32)0xFF) packetcable stuff */
  7482.  
  7483. /* Principal name-type */
  7484. #define KRB5_NT_UNKNOWN 0
  7485. @@ -5123,7 +5127,7 @@
  7486. "Signature", "kerberos.pac.signature.signature", FT_BYTES, BASE_HEX,
  7487. NULL, 0, "A PAC signature blob", HFILL }},
  7488. { &hf_krb_PA_DATA_type, {
  7489. - "Type", "kerberos.padata.type", FT_INT8, BASE_DEC,
  7490. + "Type", "kerberos.padata.type", FT_INT32, BASE_DEC,
  7491. VALS(krb5_preauthentication_types), 0, "Type of preauthentication data", HFILL }},
  7492. { &hf_krb_nonce, {
  7493. "Nonce", "kerberos.nonce", FT_UINT32, BASE_DEC,
  7494. @@ -5234,7 +5238,7 @@
  7495. "TransitedEncoding", "kerberos.TransitedEncoding", FT_NONE, BASE_DEC,
  7496. NULL, 0, "This is a Kerberos TransitedEncoding sequence", HFILL }},
  7497. { &hf_krb_PA_PAC_REQUEST_flag, {
  7498. - "PAC Request", "kerberos.pac_request.flag", FT_UINT32, BASE_DEC,
  7499. + "PAC Request", "kerberos.pac_request.flag", FT_BOOLEAN, 32,
  7500. NULL, 0, "This is a MS PAC Request Flag", HFILL }},
  7501. { &hf_krb_w2k_pac_entries, {
  7502. "Num Entries", "kerberos.pac.entries", FT_UINT32, BASE_DEC,
  7503. diff -urN wireshark-1.2.8/epan/dissectors/packet-nfs.c wireshark-1.2.9/epan/dissectors/packet-nfs.c
  7504. --- wireshark-1.2.8/epan/dissectors/packet-nfs.c 2010-05-05 10:12:49.000000000 -0700
  7505. +++ wireshark-1.2.9/epan/dissectors/packet-nfs.c 2010-06-08 16:27:10.000000000 -0700
  7506. @@ -3,7 +3,7 @@
  7507. * Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
  7508. * Copyright 2000-2004, Mike Frisch <frisch@hummingbird.com> (NFSv4 decoding)
  7509. *
  7510. - * $Id: packet-nfs.c 27887 2009-03-29 18:26:06Z etxrab $
  7511. + * $Id: packet-nfs.c 33133 2010-06-07 16:07:15Z gerald $
  7512. *
  7513. * Wireshark - Network traffic analyzer
  7514. * By Gerald Combs <gerald@wireshark.org>
  7515. @@ -40,6 +40,7 @@
  7516. #include <epan/packet.h>
  7517. #include <epan/emem.h>
  7518. #include <epan/strutil.h>
  7519. +#include <epan/crc32.h>
  7520.  
  7521. static int proto_nfs = -1;
  7522.  
  7523. @@ -2057,17 +2058,15 @@
  7524. }
  7525. }
  7526.  
  7527. - /* create a semiunique hash value for the filehandle */
  7528. + /* Create a unique hash value for the filehandle using CRC32 */
  7529. {
  7530. guint32 fhhash;
  7531. - guint32 i;
  7532. + guint8 *fh_array;
  7533. proto_item *fh_item;
  7534.  
  7535. - for(fhhash=0,i=0;i<(fhlen-3);i+=4){
  7536. - guint32 val;
  7537. - val = tvb_get_ntohl(tvb, offset+i);
  7538. - fhhash ^= (val >> 16) ^ val;
  7539. - }
  7540. + fh_array = tvb_get_string(tvb, offset, fhlen);
  7541. + fhhash = crc32_ccitt(fh_array, fhlen);
  7542. +
  7543. if(hidden){
  7544. fh_item=proto_tree_add_uint(tree, hf_nfs_fh_hash, tvb, offset,
  7545. fhlen, fhhash);
  7546. @@ -9608,7 +9607,7 @@
  7547. "length", "nfs.fh.length", FT_UINT32, BASE_DEC,
  7548. NULL, 0, "file handle length", HFILL }},
  7549. { &hf_nfs_fh_hash, {
  7550. - "hash", "nfs.fh.hash", FT_UINT32, BASE_HEX,
  7551. + "hash (CRC-32)", "nfs.fh.hash", FT_UINT32, BASE_HEX,
  7552. NULL, 0, "file handle hash", HFILL }},
  7553. { &hf_nfs_fh_mount_fileid, {
  7554. "fileid", "nfs.fh.mount.fileid", FT_UINT32, BASE_DEC,
  7555. diff -urN wireshark-1.2.8/epan/dissectors/packet-pgm.c wireshark-1.2.9/epan/dissectors/packet-pgm.c
  7556. --- wireshark-1.2.8/epan/dissectors/packet-pgm.c 2010-05-05 10:12:55.000000000 -0700
  7557. +++ wireshark-1.2.9/epan/dissectors/packet-pgm.c 2010-06-08 16:27:18.000000000 -0700
  7558. @@ -1,7 +1,7 @@
  7559. /* packet-pgm.c
  7560. * Routines for PGM packet disassembly, RFC 3208
  7561. *
  7562. - * $Id: packet-pgm.c 27822 2009-03-22 20:55:31Z wmeier $
  7563. + * $Id: packet-pgm.c 33123 2010-06-07 01:58:57Z gerald $
  7564. *
  7565. * Copyright (c) 2000 by Talarian Corp
  7566. * Rewritten by Jaap Keuter
  7567. @@ -200,6 +200,7 @@
  7568. static int hf_pgm_opt_len = -1;
  7569. static int hf_pgm_opt_tlen = -1;
  7570.  
  7571. +static int hf_pgm_genopt_end = -1;
  7572. static int hf_pgm_genopt_type = -1;
  7573. static int hf_pgm_genopt_len = -1;
  7574. static int hf_pgm_genopt_opx = -1;
  7575. @@ -423,6 +424,7 @@
  7576. opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_join);
  7577. ptvcursor_set_tree(cursor, opt_tree);
  7578.  
  7579. + ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
  7580. ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
  7581.  
  7582. if (genopts_len < PGM_OPT_JOIN_SIZE) {
  7583. @@ -445,8 +447,10 @@
  7584. opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_parityprm);
  7585. ptvcursor_set_tree(cursor, opt_tree);
  7586.  
  7587. + ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
  7588. ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
  7589.  
  7590. +
  7591. if (genopts_len < PGM_OPT_PARITY_PRM_SIZE) {
  7592. proto_tree_add_uint_format(opt_tree, hf_pgm_genopt_len, ptvcursor_tvbuff(cursor),
  7593. ptvcursor_current_offset(cursor), 1, genopts_len,
  7594. @@ -470,6 +474,7 @@
  7595. opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_paritygrp);
  7596. ptvcursor_set_tree(cursor, opt_tree);
  7597.  
  7598. + ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
  7599. ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
  7600.  
  7601. if (genopts_len < PGM_OPT_PARITY_GRP_SIZE) {
  7602. @@ -496,6 +501,7 @@
  7603. opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_naklist);
  7604. ptvcursor_set_tree(cursor, opt_tree);
  7605.  
  7606. + ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
  7607. ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
  7608.  
  7609. optdata_len = tvb_get_guint8(tvb, ptvcursor_current_offset(cursor));
  7610. @@ -554,6 +560,7 @@
  7611. opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_ccdata);
  7612. ptvcursor_set_tree(cursor, opt_tree);
  7613.  
  7614. + ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
  7615. ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
  7616.  
  7617. if (genopts_len < PGM_OPT_PGMCC_DATA_SIZE) {
  7618. @@ -568,8 +575,8 @@
  7619. ptvcursor_add(cursor, hf_pgm_opt_ccdata_res, 1, FALSE);
  7620. ptvcursor_add(cursor, hf_pgm_opt_ccdata_tsp, 4, FALSE);
  7621. optdata_afi = tvb_get_ntohs(tvb, ptvcursor_current_offset(cursor));
  7622. - ptvcursor_add(cursor, hf_pgm_opt_ccdata_afi, 1, FALSE);
  7623. - ptvcursor_add(cursor, hf_pgm_opt_ccdata_res2, 1, FALSE);
  7624. + ptvcursor_add(cursor, hf_pgm_opt_ccdata_afi, 2, FALSE);
  7625. + ptvcursor_add(cursor, hf_pgm_opt_ccdata_res2, 2, FALSE);
  7626.  
  7627. switch (optdata_afi) {
  7628.  
  7629. @@ -595,6 +602,7 @@
  7630. opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_ccdata);
  7631. ptvcursor_set_tree(cursor, opt_tree);
  7632.  
  7633. + ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
  7634. ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
  7635.  
  7636. if (genopts_len < PGM_OPT_PGMCC_FEEDBACK_SIZE) {
  7637. @@ -634,6 +642,7 @@
  7638. opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_nak_bo_ivl);
  7639. ptvcursor_set_tree(cursor, opt_tree);
  7640.  
  7641. + ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
  7642. ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
  7643.  
  7644. if (genopts_len < PGM_OPT_NAK_BO_IVL_SIZE) {
  7645. @@ -646,8 +655,8 @@
  7646. ptvcursor_add(cursor, hf_pgm_genopt_len, 1, FALSE);
  7647. ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, FALSE);
  7648. ptvcursor_add(cursor, hf_pgm_opt_nak_bo_ivl_res, 1, FALSE);
  7649. - ptvcursor_add(cursor, hf_pgm_opt_nak_bo_ivl_bo_ivl, 1, FALSE);
  7650. - ptvcursor_add(cursor, hf_pgm_opt_nak_bo_ivl_bo_ivl_sqn, 1, FALSE);
  7651. + ptvcursor_add(cursor, hf_pgm_opt_nak_bo_ivl_bo_ivl, 4, FALSE);
  7652. + ptvcursor_add(cursor, hf_pgm_opt_nak_bo_ivl_bo_ivl_sqn, 4, FALSE);
  7653.  
  7654. break;
  7655. }
  7656. @@ -655,6 +664,7 @@
  7657. opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_nak_bo_rng);
  7658. ptvcursor_set_tree(cursor, opt_tree);
  7659.  
  7660. + ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
  7661. ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
  7662.  
  7663. if (genopts_len < PGM_OPT_NAK_BO_RNG_SIZE) {
  7664. @@ -678,6 +688,7 @@
  7665. opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_redirect);
  7666. ptvcursor_set_tree(cursor, opt_tree);
  7667.  
  7668. + ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
  7669. ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
  7670.  
  7671. if (genopts_len < PGM_OPT_REDIRECT_SIZE) {
  7672. @@ -691,8 +702,8 @@
  7673. ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, FALSE);
  7674. ptvcursor_add(cursor, hf_pgm_opt_redirect_res, 1, FALSE);
  7675. optdata_afi = tvb_get_ntohs(tvb, ptvcursor_current_offset(cursor));
  7676. - ptvcursor_add(cursor, hf_pgm_opt_redirect_afi, 1, FALSE);
  7677. - ptvcursor_add(cursor, hf_pgm_opt_redirect_res2, 1, FALSE);
  7678. + ptvcursor_add(cursor, hf_pgm_opt_redirect_afi, 2, FALSE);
  7679. + ptvcursor_add(cursor, hf_pgm_opt_redirect_res2, 2, FALSE);
  7680.  
  7681. switch (optdata_afi) {
  7682.  
  7683. @@ -716,6 +727,7 @@
  7684. opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_fragment);
  7685. ptvcursor_set_tree(cursor, opt_tree);
  7686.  
  7687. + ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
  7688. ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
  7689.  
  7690. if (genopts_len < PGM_OPT_FRAGMENT_SIZE) {
  7691. @@ -1238,9 +1250,12 @@
  7692. { &hf_pgm_opt_tlen,
  7693. { "Total Length", "pgm.opts.tlen", FT_UINT16, BASE_DEC,
  7694. NULL, 0x0, "", HFILL }},
  7695. + { &hf_pgm_genopt_end,
  7696. + { "Option end", "pgm.genopts.end", FT_BOOLEAN, 8,
  7697. + TFS(&tfs_yes_no), 0x80, NULL, HFILL }},
  7698. { &hf_pgm_genopt_type,
  7699. { "Type", "pgm.genopts.type", FT_UINT8, BASE_HEX,
  7700. - VALS(opt_vals), 0x0, "", HFILL }},
  7701. + VALS(opt_vals), 0x7f, NULL, HFILL }},
  7702. { &hf_pgm_genopt_len,
  7703. { "Length", "pgm.genopts.len", FT_UINT8, BASE_DEC,
  7704. NULL, 0x0, "", HFILL }},
  7705. diff -urN wireshark-1.2.8/epan/dissectors/packet-ptp.c wireshark-1.2.9/epan/dissectors/packet-ptp.c
  7706. --- wireshark-1.2.8/epan/dissectors/packet-ptp.c 2010-05-05 10:12:52.000000000 -0700
  7707. +++ wireshark-1.2.9/epan/dissectors/packet-ptp.c 2010-06-08 16:27:13.000000000 -0700
  7708. @@ -16,7 +16,7 @@
  7709. * updated support for PTPv2
  7710. * - Markus Renz added Management for PTPv2, update to Draft 2.2
  7711. *
  7712. - * $Id: packet-ptp.c 32661 2010-05-04 19:13:29Z gerald $
  7713. + * $Id: packet-ptp.c 33121 2010-06-07 01:13:14Z gerald $
  7714. *
  7715. * Wireshark - Network traffic analyzer
  7716. * By Gerald Combs <gerald@wireshark.org>
  7717. @@ -2186,7 +2186,7 @@
  7718. time_subns = tvb_get_ntohs(tvb, *cur_offset+6);
  7719.  
  7720. ptptimeInterval_ti = proto_tree_add_text(tree, tvb, *cur_offset, 8,
  7721. - "%s: %f nanoseconds", name, time);
  7722. + "%s: %f nanoseconds", name, time_double);
  7723.  
  7724. ptptimeInterval_subtree = proto_item_add_subtree(ptptimeInterval_ti, ett_ptp_v2_timeInterval);
  7725.  
  7726. diff -urN wireshark-1.2.8/epan/dissectors/packet-sabp.c wireshark-1.2.9/epan/dissectors/packet-sabp.c
  7727. --- wireshark-1.2.8/epan/dissectors/packet-sabp.c 2010-05-05 10:12:55.000000000 -0700
  7728. +++ wireshark-1.2.9/epan/dissectors/packet-sabp.c 2010-06-08 16:27:18.000000000 -0700
  7729. @@ -10,7 +10,7 @@
  7730. * Routines for UTRAN Iu-BC Interface: Service Area Broadcast Protocol (SBAP) packet dissection
  7731. * Copyright 2007, Tomas Kukosa <tomas.kukosa@siemens.com>
  7732. *
  7733. - * $Id: packet-sabp.c 31280 2009-12-16 00:43:19Z gerald $
  7734. + * $Id: packet-sabp.c 33115 2010-06-06 22:13:16Z gerald $
  7735. *
  7736. * Wireshark - Network traffic analyzer
  7737. * By Gerald Combs <gerald@wireshark.org>
  7738. @@ -30,7 +30,7 @@
  7739. * along with this program; if not, write to the Free Software
  7740. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  7741. *
  7742. - * Ref: 3GPP TS 25.419 version 7.7.0 (2006-03)
  7743. + * Ref: 3GPP TS 25.419 version V9.0.0 (2009-12)
  7744. */
  7745.  
  7746. #ifdef HAVE_CONFIG_H
  7747. @@ -51,11 +51,6 @@
  7748. #include "packet-gsm_map.h"
  7749. #include "packet-gsm_sms.h"
  7750.  
  7751. -#ifdef _MSC_VER
  7752. -/* disable: "warning C4146: unary minus operator applied to unsigned type, result still unsigned" */
  7753. -#pragma warning(disable:4146)
  7754. -#endif
  7755. -
  7756. #define PNAME "UTRAN IuBC interface SABP signaling"
  7757. #define PSNAME "SABP"
  7758. #define PFNAME "sabp"
  7759. @@ -102,7 +97,7 @@
  7760. } ProtocolIE_ID_enum;
  7761.  
  7762. /*--- End of included file: packet-sabp-val.h ---*/
  7763. -#line 56 "packet-sabp-template.c"
  7764. +#line 51 "packet-sabp-template.c"
  7765.  
  7766. /* Initialize the protocol and registered fields */
  7767. static int proto_sabp = -1;
  7768. @@ -188,7 +183,7 @@
  7769. static int hf_sabp_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */
  7770.  
  7771. /*--- End of included file: packet-sabp-hf.c ---*/
  7772. -#line 62 "packet-sabp-template.c"
  7773. +#line 57 "packet-sabp-template.c"
  7774.  
  7775. /* Initialize the subtree pointers */
  7776. static int ett_sabp = -1;
  7777. @@ -240,7 +235,7 @@
  7778. static gint ett_sabp_UnsuccessfulOutcome = -1;
  7779.  
  7780. /*--- End of included file: packet-sabp-ett.c ---*/
  7781. -#line 70 "packet-sabp-template.c"
  7782. +#line 65 "packet-sabp-template.c"
  7783.  
  7784. /* Global variables */
  7785. static guint32 ProcedureCode;
  7786. @@ -1591,7 +1586,7 @@
  7787.  
  7788.  
  7789. /*--- End of included file: packet-sabp-fn.c ---*/
  7790. -#line 94 "packet-sabp-template.c"
  7791. +#line 89 "packet-sabp-template.c"
  7792.  
  7793. static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
  7794. {
  7795. @@ -1633,7 +1628,15 @@
  7796. /* Get the length of the sabp packet. offset in bits */
  7797. offset = dissect_per_length_determinant(tvb, bit_offset, &asn1_ctx, NULL, -1, &type_length);
  7798.  
  7799. - /* return the remaining length of the PDU */
  7800. + /*
  7801. + * Return the length of the PDU
  7802. + * which is 3 + the length of the length, we only care about lenght up to 16K
  7803. + * ("n" less than 128) a single octet containing "n" with bit 8 set to zero;
  7804. + * ("n" less than 16K) two octets containing "n" with bit 8 of the first octet set to 1 and bit 7 set to zero;
  7805. + */
  7806. + if (type_length < 128)
  7807. + return type_length+4;
  7808. +
  7809. return type_length+5;
  7810. }
  7811.  
  7812. @@ -1979,7 +1982,7 @@
  7813. "sabp.UnsuccessfulOutcome_value", HFILL }},
  7814.  
  7815. /*--- End of included file: packet-sabp-hfarr.c ---*/
  7816. -#line 177 "packet-sabp-template.c"
  7817. +#line 180 "packet-sabp-template.c"
  7818. };
  7819.  
  7820. /* List of subtrees */
  7821. @@ -2032,7 +2035,7 @@
  7822. &ett_sabp_UnsuccessfulOutcome,
  7823.  
  7824. /*--- End of included file: packet-sabp-ettarr.c ---*/
  7825. -#line 186 "packet-sabp-template.c"
  7826. +#line 189 "packet-sabp-template.c"
  7827. };
  7828.  
  7829.  
  7830. @@ -2110,7 +2113,7 @@
  7831.  
  7832.  
  7833. /*--- End of included file: packet-sabp-dis-tab.c ---*/
  7834. -#line 222 "packet-sabp-template.c"
  7835. +#line 225 "packet-sabp-template.c"
  7836.  
  7837. }
  7838.  
  7839. diff -urN wireshark-1.2.8/epan/dissectors/packet-smb.c wireshark-1.2.9/epan/dissectors/packet-smb.c
  7840. --- wireshark-1.2.8/epan/dissectors/packet-smb.c 2010-05-05 10:12:51.000000000 -0700
  7841. +++ wireshark-1.2.9/epan/dissectors/packet-smb.c 2010-06-08 16:27:12.000000000 -0700
  7842. @@ -3,7 +3,7 @@
  7843. * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  7844. * 2001 Rewrite by Ronnie Sahlberg and Guy Harris
  7845. *
  7846. - * $Id: packet-smb.c 31211 2009-12-09 00:15:27Z gerald $
  7847. + * $Id: packet-smb.c 33142 2010-06-07 18:39:55Z gerald $
  7848. *
  7849. * Wireshark - Network traffic analyzer
  7850. * By Gerald Combs <gerald@wireshark.org>
  7851. @@ -8222,7 +8222,9 @@
  7852. case NT_TRANS_IOCTL:
  7853. /* ioctl data */
  7854. ioctl_tvb=tvb_new_subset(tvb, offset, MIN((int)bc, tvb_length_remaining(tvb, offset)), bc);
  7855. - dissect_smb2_ioctl_data(ioctl_tvb, pinfo, tree, top_tree, nti->ioctl_function, TRUE);
  7856. + if (nti){
  7857. + dissect_smb2_ioctl_data(ioctl_tvb, pinfo, tree, top_tree, nti->ioctl_function, TRUE);
  7858. + }
  7859.  
  7860.  
  7861. offset += bc;
  7862. diff -urN wireshark-1.2.8/epan/dissectors/packet-smb-pipe.c wireshark-1.2.9/epan/dissectors/packet-smb-pipe.c
  7863. --- wireshark-1.2.8/epan/dissectors/packet-smb-pipe.c 2010-05-05 10:12:54.000000000 -0700
  7864. +++ wireshark-1.2.9/epan/dissectors/packet-smb-pipe.c 2010-06-08 16:27:16.000000000 -0700
  7865. @@ -8,7 +8,7 @@
  7866. * significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and
  7867. * Guy Harris 2001
  7868. *
  7869. - * $Id: packet-smb-pipe.c 28356 2009-05-13 19:46:11Z etxrab $
  7870. + * $Id: packet-smb-pipe.c 33120 2010-06-07 01:01:30Z gerald $
  7871. *
  7872. * Wireshark - Network traffic analyzer
  7873. * By Gerald Combs <gerald@wireshark.org>
  7874. @@ -2138,7 +2138,7 @@
  7875. (*items->hf_index == -1) ?
  7876. "String Param" :
  7877. proto_registrar_get_name(*items->hf_index),
  7878. - string);
  7879. + string ? string : "(null)");
  7880. items++;
  7881. } else {
  7882. offset = (*items->func)(tvb, offset, 0,
  7883. diff -urN wireshark-1.2.8/epan/dissectors/packet-xml.c wireshark-1.2.9/epan/dissectors/packet-xml.c
  7884. --- wireshark-1.2.8/epan/dissectors/packet-xml.c 2010-05-05 10:12:58.000000000 -0700
  7885. +++ wireshark-1.2.9/epan/dissectors/packet-xml.c 2010-06-08 16:27:26.000000000 -0700
  7886. @@ -3,7 +3,7 @@
  7887. *
  7888. * (C) 2005, Luis E. Garcia Ontanon.
  7889. *
  7890. - * $Id: packet-xml.c 27882 2009-03-29 14:37:57Z etxrab $
  7891. + * $Id: packet-xml.c 33115 2010-06-06 22:13:16Z gerald $
  7892. *
  7893. * Refer to the AUTHORS file or the AUTHORS section in the man page
  7894. * for contacting the author(s) of this file.
  7895. @@ -585,8 +585,8 @@
  7896.  
  7897.  
  7898. static void init_xml_parser(void) {
  7899. - tvbparse_wanted_t* want_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz-_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",NULL,NULL,NULL);
  7900. - tvbparse_wanted_t* want_attr_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz-_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:",NULL,NULL,NULL);
  7901. + tvbparse_wanted_t* want_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz.-_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",NULL,NULL,NULL);
  7902. + tvbparse_wanted_t* want_attr_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz.-_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:",NULL,NULL,NULL);
  7903.  
  7904. tvbparse_wanted_t* want_scoped_name = tvbparse_set_seq(XML_SCOPED_NAME, NULL, NULL, NULL,
  7905. want_name,
  7906. diff -urN wireshark-1.2.8/epan/enterprise-numbers wireshark-1.2.9/epan/enterprise-numbers
  7907. --- wireshark-1.2.8/epan/enterprise-numbers 2010-05-05 10:13:01.000000000 -0700
  7908. +++ wireshark-1.2.9/epan/enterprise-numbers 2010-06-08 16:27:31.000000000 -0700
  7909. @@ -1,6 +1,6 @@
  7910. PRIVATE ENTERPRISE NUMBERS
  7911.  
  7912. -(last updated 2010-05-01)
  7913. +(last updated 2010-06-05)
  7914.  
  7915. SMI Network Management Private Enterprise Codes:
  7916.  
  7917. @@ -6314,9 +6314,9 @@
  7918. Tom Lorber
  7919. ltomy&dialup.netvision.net.il
  7920. 1575
  7921. - Technical University of Braunschweig
  7922. - Detlef J. Schmidt
  7923. - djs&tu-bs.de
  7924. + TU Braunschweig
  7925. + Jan-Marc Pilawa
  7926. + noc&tu-bs.de
  7927. 1576
  7928. Stac Inc.
  7929. Laurence Church
  7930. @@ -47663,8 +47663,8 @@
  7931. flicker&anduin.net
  7932. 12027
  7933. AccelaNET
  7934. - Matthew J Backes
  7935. - lucca&accela.net
  7936. + Emily Backes
  7937. + oid-contact&accela.net
  7938. 12028
  7939. AirWave Wireless, Inc.
  7940. Jason Luther
  7941. @@ -94745,9 +94745,9 @@
  7942. Joel Simpson
  7943. Joel.Simpson&gmail.com
  7944. 23795
  7945. - Yavox Latin America
  7946. - Carlos Eduardo Carlassara
  7947. - ccarlassara&yavox.com
  7948. + Movile (previous was 'Yavox Latin America')
  7949. + Daniel La Laina
  7950. + daniel.lalaina&movile.com
  7951. 23796
  7952. SunWare GmbH & Co KG
  7953. Julian Schüren
  7954. @@ -100586,8 +100586,8 @@
  7955. jaruwat&mfec.co.th
  7956. 25254
  7957. Makena Technologies, Inc.
  7958. - Brian Gontowski
  7959. - bgontowski&thereinc.com
  7960. + Bruce Benda
  7961. + iana&thereinc.com
  7962. 25255
  7963. Broadsoft Systems
  7964. Gerry Pyne
  7965. @@ -101553,7 +101553,7 @@
  7966. 25495
  7967. Optimacom Sàrl
  7968. Christophe Alexandre
  7969. - chris.perso&gmail.com
  7970. + optimacom.sarl&gmail.com
  7971. 25496
  7972. CEMES-CNRS
  7973. Anne Altibelli
  7974. @@ -101667,9 +101667,9 @@
  7975. Dae-Yeon Hwang
  7976. dyhwang&homecast.net
  7977. 25524
  7978. - Open Hardware Project Russia
  7979. + Open Source Hardware Engineering Community (OSHEC)
  7980. Dmitry V. Belimov
  7981. - dimon&openhardware.ru
  7982. + dimon&oshec.org
  7983. 25525
  7984. TC&C Telecommunication and Computer Technology Ltd.
  7985. Szabolcs Daroczy
  7986. @@ -102713,8 +102713,8 @@
  7987. hatto&salesianer.de
  7988. 25785
  7989. Universitat Politècnica de Catalunya (UPC)
  7990. - Manuel Caballero
  7991. - Manuel.Caballero&upc.edu
  7992. + Victor Huerta
  7993. + hostmaster&upcnet.es
  7994. 25786
  7995. AgileSoft BVBA
  7996. Michiel Scharpé
  7997. @@ -130801,8 +130801,8 @@
  7998. oravecz&nytud.hu
  7999. 32804
  8000. Siemens Enterprise Communications GmbH & Co. KG
  8001. - Myriam Rosshuber
  8002. - myriam.rosshuber&siemens.com
  8003. + Andrew Hutton
  8004. + andrew.hutton&siemens-enterprise.com
  8005. 32805
  8006. CR Host
  8007. Jose Romeiro Filho
  8008. @@ -140490,7 +140490,7 @@
  8009. 35226
  8010. Bureau Software Development Corporation
  8011. John Bureau
  8012. - lpcom77&fastmail.fm
  8013. + iana2bsdc&fastmail.fm
  8014. 35227
  8015. OOO Nika Motors Holding
  8016. Petrov Vladimir
  8017. @@ -141457,9 +141457,9 @@
  8018. Nickolay Redin
  8019. ya&spinbrain.com
  8020. 35468
  8021. - KTU RLSC
  8022. - Vygintas Kazanavicius
  8023. - vkaza&ifko.ktu.lt
  8024. + Kaunas University of Technology
  8025. + Marius Urkis
  8026. + marius.urkis&ktu.lt
  8027. 35469
  8028. Seamless Distribution AB
  8029. Radoslaw Kozlowski
  8030. @@ -142247,7 +142247,7 @@
  8031. 35665
  8032. BroadBand Security, Inc.
  8033. Sadaaki Tanaka
  8034. - cd_support&bbsec.co.jp
  8035. + pen&bbsec.co.jp
  8036. 35666
  8037. Joint Stock Commercial Bank INVESTBANK Open-end JSC
  8038. Maksim Kupriyanov
  8039. @@ -142421,9 +142421,9 @@
  8040. Bruce GARNIER
  8041. B.GARNIER&bouygues-construction.com
  8042. 35709
  8043. - BOUYGUES CONSTRUCTION
  8044. - Bruce GARNIER
  8045. - B.GARNIER&bouygues-construction.com
  8046. + Unassigned
  8047. + Removed 2010-05-3
  8048. + ---none---
  8049. 35710
  8050. Alcatel-Lucent, 4ESS
  8051. Eugene Koeppe
  8052. @@ -142503,7 +142503,7 @@
  8053. 35729
  8054. Forssan Seudun Puhelin Oy / SurffiNET
  8055. Asmo Porma
  8056. - asmo.porma&fsp.fi
  8057. + hostmaster&fsp.fi
  8058. 35730
  8059. iAd GmbH
  8060. Juergen Kosel
  8061. @@ -142529,8 +142529,8 @@
  8062. Antoine Brenner
  8063. brenner-iana&gymglish.com
  8064. 35736
  8065. - bzctoons network
  8066. - réda bourebaba
  8067. + BZCToOn'S Network / RedJuice.fr SARL
  8068. + Réda Bourebaba
  8069. support&bzctoons.net
  8070. 35737
  8071. QA Cafe LLC
  8072. @@ -142544,6 +142544,814 @@
  8073. Bowline Network Consulting, Inc
  8074. Kevin Thompson
  8075. kevin.thompson&bowlineconsulting.com
  8076. +35740
  8077. + SACD
  8078. + René LE MENER
  8079. + rene.le.mener&sacd.fr
  8080. +35741
  8081. + Chi-X Europe Ltd
  8082. + Adam Harm
  8083. + adam.harm&chi-x.com
  8084. +35742
  8085. + Neurosearch, Inc.
  8086. + Michael Hall
  8087. + michael.hall&neurosearch-usa.com
  8088. +35743
  8089. + Workonline Communications (Pty) Ltd
  8090. + Ben Maddison
  8091. + benmaddison&workonline.co.za
  8092. +35744
  8093. + D-Media Communication Tech
  8094. + Zinan Ren
  8095. + renzinan&gmail.com
  8096. +35745
  8097. + Marine Harvest ASA
  8098. + Jan Olav Skeie
  8099. + jan.olav.skeie&marineharvest.com
  8100. +35746
  8101. + Passepartout sa
  8102. + gianluigi nigro
  8103. + gianluigi.nigro&passepartout.sm
  8104. +35747
  8105. + FEDERALNOE AGENTSTVO ZhELEZNODOROZhNOGO TRANSPORTA
  8106. + Vladimir Folin
  8107. + admin&roszeldor.ru
  8108. +35748
  8109. + Switch++
  8110. + Amir Fuhrmann
  8111. + amir&switchpp.com
  8112. +35749
  8113. + Alsim
  8114. + Thierry LEBOURQUE
  8115. + t.lebourque&alsim.com
  8116. +35750
  8117. + Spring Wireless
  8118. + Alvaro Anton
  8119. + aanton&springwireless.com
  8120. +35751
  8121. + Linux Lunatix
  8122. + Stefan Marx
  8123. + stefan&linux-lunatix.org
  8124. +35752
  8125. + Supra net d.o.o.
  8126. + Aleksandar Å erbetar
  8127. + aleksandar.serbetar&supranet.hr
  8128. +35753
  8129. + Les Développements Durables
  8130. + Sébastien DUCOULOMBIER
  8131. + iana-pen&ldd.fr
  8132. +35754
  8133. + ON-AIR Systems Ltd.
  8134. + Miroslav Jeras
  8135. + miroslav.jeras&on-air-systems.com
  8136. +35755
  8137. + P-21 GmbH
  8138. + Thilo Heinermann
  8139. + thilo.heinermann&p-21.de
  8140. +35756
  8141. + inett GmbH
  8142. + Christian Baus
  8143. + christian.baus&inett.de
  8144. +35757
  8145. + Sonnection B.V.
  8146. + Rolf E. Sonneveld
  8147. + R.E.Sonneveld&sonnection.nl
  8148. +35758
  8149. + Stichting Diagnose Kanker
  8150. + Rolf E. Sonneveld
  8151. + R.E.Sonneveld&sonnection.nl
  8152. +35759
  8153. + Welkin Sciences, LLC
  8154. + Rex Shaffer
  8155. + rex.shaffer&welkinsciences.com
  8156. +35760
  8157. + Optical Access Networks Lab, Shanghai University
  8158. + Song Yan
  8159. + jylshm&126.com
  8160. +35761
  8161. + Center Parcs Europe
  8162. + Daan de Jongh
  8163. + daan.dejongh&centerparcs.com
  8164. +35762
  8165. + FMLOG, Swedish Armed Forces Logistics
  8166. + David Hedlund
  8167. + david.hedlund&mil.se
  8168. +35763
  8169. + Groupe Laurent
  8170. + GUNGOR Fatih
  8171. + fatih.gungor&groupe-laurent.com
  8172. +35764
  8173. + St. Lawrence College
  8174. + Michael Zeleny
  8175. + mzeleny&sl.on.ca
  8176. +35765
  8177. + zbits Unternehmensberatung GmbH
  8178. + Thomas Baumann
  8179. + tbaumann&zbits.de
  8180. +35766
  8181. + Killermann GdbR
  8182. + Herbert Killermann
  8183. + herbert.killermann&killermann.info
  8184. +35767
  8185. + University of Lodz
  8186. + Krzysztof Miodek
  8187. + oper&uni.lodz.pl
  8188. +35768
  8189. + GetWellNetwork, Inc.
  8190. + Bernd Nigmann
  8191. + bnigmann&getwellnetwork.com
  8192. +35769
  8193. + Wellogic
  8194. + Dan Powell
  8195. + dan&wellogic.com
  8196. +35770
  8197. + USIL Technology
  8198. + Cesar Loyola
  8199. + cloyola&usiltechnology.pe
  8200. +35771
  8201. + Hightech Payment Systems
  8202. + Radouane ELFITOURI
  8203. + radouane.elfitouri&hps.ma
  8204. +35772
  8205. + n@work Internet Informationssysteme GmbH
  8206. + Sascha Retzki
  8207. + retzki&work.de
  8208. +35773
  8209. + Arcturus Networks Inc.
  8210. + Michael Durrant
  8211. + mdurrant&arcturusnetworks.com
  8212. +35774
  8213. + Universal Electric Corporation
  8214. + Kevin Gearhart
  8215. + KGearhart&uecorp.com
  8216. +35775
  8217. + Rachitskiy Research and Development LLC
  8218. + Eugene Rachitskiy
  8219. + eugene&rachitskiy.com
  8220. +35776
  8221. + BlueNote Communications SA
  8222. + Arian Mares
  8223. + arian.mares&bluenote.ro
  8224. +35777
  8225. + Unique Solutions SA
  8226. + Iulian Dogariu
  8227. + iulian&uniques.ro
  8228. +35778
  8229. + RTC-LEASING OJSC
  8230. + Alexander Scherbachev
  8231. + sag&rtc-leasing.ru
  8232. +35779
  8233. + ican solutions private limited
  8234. + vivek vinod
  8235. + vivek&icanconnect.com
  8236. +35780
  8237. + OAO Tatneft
  8238. + Gazizov Almaz
  8239. + a_gazizov&tatneft.ru
  8240. +35781
  8241. + Matej Bel University Banska Bystrica
  8242. + Peter Kottman
  8243. + sekretariat&uakom.sk
  8244. +35782
  8245. + Universidad de Extremadura
  8246. + Ana Gallardo Gómez
  8247. + aigallardo&unex.es
  8248. +35783
  8249. + Nika Ltd
  8250. + Andrej Taran
  8251. + fant&nika.vin.ua
  8252. +35784
  8253. + ECKD GmbH
  8254. + Michael Mößinger
  8255. + technik&eckd.de
  8256. +35785
  8257. + Xcira, Inc.
  8258. + Tom Fleniken
  8259. + tomf&xcira.com
  8260. +35786
  8261. + Continuant Inc
  8262. + Aldo Febro
  8263. + aldof&continuant.com
  8264. +35787
  8265. + Computaris
  8266. + Dariusz Gorczynski
  8267. + dariusz.gorczynski&computaris.com
  8268. +35788
  8269. + Xolido Systems,S.A.
  8270. + Luis Carlos Ganso Mellado
  8271. + administracion&xolido.com
  8272. +35789
  8273. + Despegar.com, Inc.
  8274. + Gustavo Randich
  8275. + grandich&despegar.com
  8276. +35790
  8277. + ClearCorp
  8278. + Joan E. Jorden
  8279. + joan&clearcorp.biz
  8280. +35791
  8281. + IES Systems, Inc.
  8282. + John Stacey
  8283. + john.stacey&ies-us.com
  8284. +35792
  8285. + Rygl
  8286. + Ales Rygl
  8287. + ales&rygl.net
  8288. +35793
  8289. + Hirotech, Inc.
  8290. + Yoshiaki Hayakawa
  8291. + yhayakawa&hirotech.com
  8292. +35794
  8293. + Java Verified
  8294. + Martin Wrigley
  8295. + martin.wrigley&orange-ftgroup.com
  8296. +35795
  8297. + Actifio
  8298. + Ravi Kollipara
  8299. + ravi.kollipara&actifio.com
  8300. +35796
  8301. + Burda:IC GmbH
  8302. + Rene Henzinger
  8303. + henzinger&burda-ic.com
  8304. +35797
  8305. + Polska Telefonia Cyfrowa Sp. z o.o.
  8306. + Tytus Buńka
  8307. + tbunka&era.pl
  8308. +35798
  8309. + shack e.V.
  8310. + Christian Recktenwald
  8311. + iana-contact&shackspace.de
  8312. +35799
  8313. + Phmb Consulting
  8314. + Peter Brooks
  8315. + peter.h.m.brooks&gmail.com
  8316. +35800
  8317. + Uniconsult
  8318. + Bruno Pirajá Moyle
  8319. + bruno&uniconsult.com.br
  8320. +35801
  8321. + EIX Ltd
  8322. + Dr Eddie Insam
  8323. + edinsam&eix.co.uk
  8324. +35802
  8325. + Mobango Ltd
  8326. + Rocco Lucia
  8327. + ops&mobango.com
  8328. +35803
  8329. + Eucalyptus Systems Inc.
  8330. + Steven Fitzgerald
  8331. + administrator&eucalyptus.com
  8332. +35804
  8333. + Allgood Networks
  8334. + Guy Allgood
  8335. + guyallgood&netzero.com
  8336. +35805
  8337. + Athonet s.r.l.
  8338. + Andrea Agosti
  8339. + andrea.agosti&athonet.com
  8340. +35806
  8341. + Paul Milliken
  8342. + Paul Milliken
  8343. + iana&pmm.me.uk
  8344. +35807
  8345. + AJR Development
  8346. + Allan Rogers
  8347. + allan.rogers&mail.org
  8348. +35808
  8349. + SAR Elektronik A.S.
  8350. + Serdar Edgu
  8351. + serdar.edgu&sarelektronik.com
  8352. +35809
  8353. + Hosting Community
  8354. + Dmitriy Kirhlarov
  8355. + ext-coordinators&hostcomm.ru
  8356. +35810
  8357. + CDL PMO
  8358. + Alison Anders
  8359. + 653.ELSG.NA.CDL&hanscom.af.mil
  8360. +35811
  8361. + AMTANGEE Aktiengesellschaft
  8362. + Christian Roesner
  8363. + service&amtangee.com
  8364. +35812
  8365. + CANCOM IT Solutions GmbH
  8366. + Ginther Andreas
  8367. + andreas.ginther&cancom.de
  8368. +35813
  8369. + LinuxRulz
  8370. + Stephan Jauernick
  8371. + stephan48&linuxrulz.de
  8372. +35814
  8373. + Cordier Networks
  8374. + Robin Cordier
  8375. + mrjk.78&gmail.com
  8376. +35815
  8377. + QUADStor Systems
  8378. + Shivaram Upadhyayula
  8379. + shivaram.u&quadstor.com
  8380. +35816
  8381. + Shenzhen HY Amplitec Technology Co.,Ltd
  8382. + Yanwei Wang
  8383. + info&hyamplitec.com
  8384. +35817
  8385. + Giorik spa
  8386. + erminio canal
  8387. + prior.customers&gmail.com
  8388. +35818
  8389. + Azienda Feltrina s.p.
  8390. + erminio canal
  8391. + prior.customers&gmail.com
  8392. +35819
  8393. + Digithurst Bildverarbeitungssysteme
  8394. + Raimund Jakobsmeyer
  8395. + rja&msdesign.de
  8396. +35820
  8397. + RCS Kladno, s.r.o.
  8398. + Petr Paryzek
  8399. + Petr.Paryzek&rcs-kladno.net
  8400. +35821
  8401. + FBComputers s.r.l.
  8402. + Leonardo Centoventotto
  8403. + assistenza&fbcomputers.com
  8404. +35822
  8405. + V-Internet Operations, Inc.
  8406. + Shinji SATO
  8407. + sato&vio.co.jp
  8408. +35823
  8409. + HANGZHOU RICH INFO-TECH CO.,LTD
  8410. + Wenbin Liao
  8411. + archvile&sina.com
  8412. +35824
  8413. + Boll und Partner Software GmbH
  8414. + Tobias Roese
  8415. + tobias.roese&boll-und-partner.com
  8416. +35825
  8417. + INAX Corporation
  8418. + Masami Uchida
  8419. + domain-admin&isc.i2.inax.co.jp
  8420. +35826
  8421. + THALES AIR OPERATION
  8422. + Francois GIERSCH
  8423. + francois.giersch&thalesgroup.com
  8424. +35827
  8425. + Invengo Information Technology Co.,Ltd
  8426. + johnson.guo
  8427. + johnson.guo&invengo.com
  8428. +35828
  8429. + Entropia e.V.
  8430. + Eve Entropia
  8431. + info&entropia.de
  8432. +35829
  8433. + United Natural Foods, Inc.
  8434. + Richard Levy
  8435. + iana-pen&unfi.com
  8436. +35830
  8437. + ROFFET.com
  8438. + Nicolas Roffet
  8439. + nicolas-w&roffet.com
  8440. +35831
  8441. + ATECH MICROELECTRONIC SYSTEMS
  8442. + Robert Went
  8443. + r.went&amesystems.eu
  8444. +35832
  8445. + Open Horizont.Ltd
  8446. + Zoltan Markella
  8447. + zoltan.markella&openhorizont.com
  8448. +35833
  8449. + Deva Broadcast Ltd.
  8450. + Todor Ivanov
  8451. + office&devabroadcast.com
  8452. +35834
  8453. + Gozaimass
  8454. + Pascal VIVIEN
  8455. + darwin&gozaimass.fr
  8456. +35835
  8457. + iB Solution Corporation
  8458. + Satoshi HOSHINO
  8459. + info&ib-sol.co.jp
  8460. +35836
  8461. + China BraveFly Technology Co., Ltd.
  8462. + LiuZhiyong
  8463. + liuzy57&hotmail.com
  8464. +35837
  8465. + Mamat GmbH
  8466. + Rolf Mamat
  8467. + snmp&software-for-future.de
  8468. +35838
  8469. + Matrixx Software Inc.
  8470. + Luther Kitahata
  8471. + Luther.Kitahata&MatrixxSw.com
  8472. +35839
  8473. + Imagine One Technology & Management
  8474. + Jeffrey Farmer
  8475. + jeffrey.farmer&imagine-one.com
  8476. +35840
  8477. + Gyrus ACMI, Inc.
  8478. + Jonathon Oss
  8479. + jonathon.oss&gyrusacmi.com
  8480. +35841
  8481. + Agecodagis SARL
  8482. + Sébastien Judenherc
  8483. + sebastien.judenherc&agecodagis.com
  8484. +35842
  8485. + RamVZ
  8486. + Rouven Raudzus
  8487. + Rouven.Raudzus&gmx.de
  8488. +35843
  8489. + Sebastian Muszytowski
  8490. + Sebastian Muszytowski
  8491. + s.muszytowski&googlemail.com
  8492. +35844
  8493. + Stormont-Vail HealthCare
  8494. + Nathan Girard
  8495. + ngirard&stormontvail.org
  8496. +35845
  8497. + Heraklion Wireless
  8498. + Damianos Mylonakis
  8499. + danmylonakis&gmail.com
  8500. +35846
  8501. + Parsons
  8502. + Michael Pinkston
  8503. + michael.pinkston&parsons.com
  8504. +35847
  8505. + Greenbone Networks GmbH
  8506. + Lukas Grunwald
  8507. + info&greenbone.net
  8508. +35848
  8509. + Multipolaris Ltd.
  8510. + Andras Avar
  8511. + andras.avar&mp-i.hu
  8512. +35849
  8513. + Telefonica International Wholesale Services
  8514. + Fernando Sastre
  8515. + fernando.sastre&telefonica.com
  8516. +35850
  8517. + Horns And Hooves
  8518. + Deyev Vitaliy
  8519. + holms_html&ukr.net
  8520. +35851
  8521. + Abix Tecnologia
  8522. + Tulio Munhoz
  8523. + tulio&abix.com.br
  8524. +35852
  8525. + Spire Sciences LLC
  8526. + Peter Countryman
  8527. + peter.countryman&spiresciences.com
  8528. +35853
  8529. + Remote Enterprise Monitoring, Inc.
  8530. + Jorge Ventura
  8531. + jorge.araujo.ventura&gmail.com
  8532. +35854
  8533. + American Modern
  8534. + Richard Hartmann
  8535. + richard_hartmann&amig.com
  8536. +35855
  8537. + Dialog Semiconductor
  8538. + Heiko Schumann
  8539. + heiko.schumann&diasemi.com
  8540. +35856
  8541. + Berchtold Holding GmbH
  8542. + Joerg Friedrich
  8543. + Joerg.Friedrich&BERCHTOLD.biz
  8544. +35857
  8545. + AMARON BVBA
  8546. + Nico Vannieuwenhuyze
  8547. + nico&amaron.be
  8548. +35858
  8549. + The Goodyear Tire & Rubber Co.
  8550. + Shawn Leyden
  8551. + spleyden&goodyear.com
  8552. +35859
  8553. + Georgia-Pacific LLC.
  8554. + JENNIFER MOORMAN
  8555. + hostmaster&gapac.com
  8556. +35860
  8557. + Kvadroteh Ltd.
  8558. + George Kashperko
  8559. + george&academy.zt.ua
  8560. +35861
  8561. + CRAWFORD COMMUNICATIONS, INC
  8562. + Guangbin Liu
  8563. + gliu&mail.crawford.com
  8564. +35862
  8565. + Mobile Integration Workgroup
  8566. + Stephen Moody
  8567. + iana&mobileintegration-group.com
  8568. +35863
  8569. + WAMAJU LLC
  8570. + Matthew Juszczak
  8571. + group&wamaju.com
  8572. +35864
  8573. + Ales Hakl
  8574. + Ales Hakl
  8575. + ales&hakl.net
  8576. +35865
  8577. + Trivia Solutions B.V.
  8578. + Marcel de Kock
  8579. + marcel.dekock&trivia-solutions.com
  8580. +35866
  8581. + Eno, Inc.
  8582. + Sueo Kawai
  8583. + s-kawai&eno-inc.jp
  8584. +35867
  8585. + Prior srl
  8586. + Erminio Canal
  8587. + prior.customers&gmail.com
  8588. +35868
  8589. + Ater Belluno
  8590. + erminio canal
  8591. + prior.customers&gmail.com
  8592. +35869
  8593. + STB Broadcast
  8594. + Ulisses Barreto
  8595. + nandopina80&yahoo.com.br
  8596. +35870
  8597. + OpsWise Software Inc.
  8598. + Gwyn Clay
  8599. + gwyn.clay&opswise.com
  8600. +35871
  8601. + Cloupia
  8602. + Raju Datla
  8603. + info&cloupia.com
  8604. +35872
  8605. + huggla.com
  8606. + Reiner Schmidt
  8607. + reiner.schmidt&rs-consulting.de
  8608. +35873
  8609. + JDS Uniphase Corporation
  8610. + Judith Walker
  8611. + Judith.Walker&jdsu.com
  8612. +35874
  8613. + Action Packed Networks
  8614. + John K. Smith
  8615. + jsmith&actionpacked.com
  8616. +35875
  8617. + JX2 Technology Pty Ltd
  8618. + Zane Francis
  8619. + support&jx2.com.au
  8620. +35876
  8621. + WHITECODE,.LTD
  8622. + Jungwon Park
  8623. + jwpark&whitecode.co.kr
  8624. +35877
  8625. + LEITNER AG - S.p.A
  8626. + Michele Baldessari
  8627. + baldessari.michele&leitner-lifts.com
  8628. +35878
  8629. + Conseil général de l'Aube
  8630. + Philippe RICARD
  8631. + philippe.ricard&cg10.fr
  8632. +35879
  8633. + WellDoc, Inc.
  8634. + Shariar Ghavami
  8635. + sghavami&welldocinc.com
  8636. +35880
  8637. + JSC "Mediafon"
  8638. + Mindaugas Jasiulis
  8639. + mindaugas.jasiulis&mediafon.lt
  8640. +35881
  8641. + Ionis group
  8642. + Jonathan Gnassia
  8643. + jonathan.gnassia&epitech.eu
  8644. +35882
  8645. + NTT DATA KYUSHU CORPORATION
  8646. + Masayoshi Setoyama
  8647. + setoyamam&nttdata-kyushu.co.jp
  8648. +35883
  8649. + VisualSoft Private Limited
  8650. + Aftab Sarwar
  8651. + aftab&visualsoft-inc.com
  8652. +35884
  8653. + Nethost s.r.o.
  8654. + Lukas Futera
  8655. + lukas.futera&nethost.cz
  8656. +35885
  8657. + VZ Holding AG
  8658. + Conradin Ragettli
  8659. + 666&crnet.ch
  8660. +35886
  8661. + Arise Telecommunications Ltd.
  8662. + Gunay Mazmanoglu
  8663. + gunay&arisetel.com
  8664. +35887
  8665. + Lucierna SLNE
  8666. + Juan Mahillo Alvarez
  8667. + juan.mahillo&lucierna.com
  8668. +35888
  8669. + DeadInkVinyl
  8670. + David L Kinney
  8671. + iana&deadinkvinyl.com
  8672. +35889
  8673. + ColumbiaSoft Corporation
  8674. + Tim Emerson
  8675. + temerson&columbiasoft.com
  8676. +35890
  8677. + Video-Flow ltd
  8678. + Adi Rozenberg
  8679. + adi.rozenberg&video-flow.com
  8680. +35891
  8681. + punctum Gesellschaft fuer Software mbH
  8682. + Dr. Georg Fischer
  8683. + punctum&punctum.com
  8684. +35892
  8685. + ELMEH GIU
  8686. + Dino Å epac
  8687. + dino.sepac&elmeh.hr
  8688. +35893
  8689. + Xelmo
  8690. + David Bauman
  8691. + sysadmin&xelmo.com
  8692. +35894
  8693. + Cognimatics AB
  8694. + Erik Södervall
  8695. + erik.sodervall&cognimatics.com
  8696. +35895
  8697. + Slackarea Internet Services
  8698. + Vincenzo Ingrosso
  8699. + expert&slackarea.net
  8700. +35896
  8701. + Concord Energy
  8702. + Jon Storchevoy
  8703. + jstorchevoy&ConcordEnergy.com
  8704. +35897
  8705. + Violin Memory, Inc.
  8706. + Ed Roskos
  8707. + roskos&vmem.com
  8708. +35898
  8709. + SYSTEREL
  8710. + Francois BUSTANY
  8711. + iana&systerel.fr
  8712. +35899
  8713. + Prism Clinical Imaging, Inc.
  8714. + Chad Neller
  8715. + production&prismclinical.com
  8716. +35900
  8717. + DuMont Net GmbH & Co. KG
  8718. + Ralf Fischer
  8719. + ralf.fischer&dumontnet.de
  8720. +35901
  8721. + Al-Quds University
  8722. + Sufyan Aqtam
  8723. + saqtam&itce.alquds.edu
  8724. +35902
  8725. + OpenHeadend
  8726. + Christophe Massiot
  8727. + cmassiot&openheadend.tv
  8728. +35903
  8729. + Bartonia Domain and Enterprises
  8730. + Ian J. Barton
  8731. + ian&bartonia.net
  8732. +35904
  8733. + MacroSAN
  8734. + Yinglan Shangguan
  8735. + shangguan.ms&gmail.com
  8736. +35905
  8737. + ACME-Cebul inc.
  8738. + Tomaz Cebul
  8739. + tomaz&cebul.eu
  8740. +35906
  8741. + Unister
  8742. + Enrico Popp
  8743. + enrico.popp&unister-gmbh.de
  8744. +35907
  8745. + CRV Natural
  8746. + Ricardo Frei Bruel
  8747. + ti&crvnatural.com.br
  8748. +35908
  8749. + Embrane Software, Inc.
  8750. + David Dai
  8751. + dhdai&embrane.com
  8752. +35909
  8753. + Horace Mann Educators Corporation
  8754. + William Fellner
  8755. + william.fellner&horacemann.com
  8756. +35910
  8757. + overnet.qc.ca
  8758. + Pascal Lalonde
  8759. + pen&overnet.qc.ca
  8760. +35911
  8761. + Mrezne Tehnologije Verso
  8762. + Dario Bosnjak
  8763. + dario.bosnjak&verso.hr
  8764. +35912
  8765. + Makedonijalek
  8766. + Momcilovic Dragan
  8767. + draganm&makedonijalek.com.mk
  8768. +35913
  8769. + Diputacion Provincial de Cáceres
  8770. + Juan Carlos Manzano Pérez
  8771. + juancman&dip-caceres.es
  8772. +35914
  8773. + Borea, Ltd.
  8774. + Klemen Porenta
  8775. + klemen.porenta&borea.si
  8776. +35915
  8777. + SERLI
  8778. + Laurent RUAUD
  8779. + laurent.ruaud&serli.com
  8780. +35916
  8781. + Orangehead Software
  8782. + Tommy Braas
  8783. + tommy&orangeheadsoftware.com
  8784. +35917
  8785. + kobisun.org Surdurulebilir Sunucu Sistemleri
  8786. + Kerem Erciyes
  8787. + root&kobisun.org
  8788. +35918
  8789. + ETON International co. ltd
  8790. + Seonggyu Lim
  8791. + saint&etonint.co.kr
  8792. +35919
  8793. + Funkwerk plettac electronics GmbH
  8794. + Ruediger Zapf
  8795. + r.zapf&plettac-electronics.de
  8796. +35920
  8797. + Sebastian Himberger Software
  8798. + Sebastian Himberger
  8799. + s.himberger&sebastian.himberger.de
  8800. +35921
  8801. + Alpha-Bit GmbH
  8802. + Alexander Muhl
  8803. + alexander.muhl&alpha-bit.de
  8804. +35922
  8805. + Backbase B.V.
  8806. + Remie Bolte
  8807. + ict&backbase.com
  8808. +35923
  8809. + Enthusia Consulting Ltd
  8810. + Olusegun S. Odujebe
  8811. + oodujebe&enthusiaconsulting.com
  8812. +35924
  8813. + IET-International Empire Traders
  8814. + Abdullah Salauddin
  8815. + projects&iet-group.com
  8816. +35925
  8817. + Warsaw Stock Exchange
  8818. + Paweł Czechowicz
  8819. + pawel.czechowicz&wse.com.pl
  8820. +35926
  8821. + Aguas de la Cuenca del Norte, S.A.
  8822. + Miguel Ángel Rodríguez Fernández
  8823. + mrodriguez&acuanorte.es
  8824. +35927
  8825. + Softfinança S.A.
  8826. + Pedro Anselmo
  8827. + pedro.anselmo&softfinanca.pt
  8828. +35928
  8829. + Wheaton College
  8830. + Steve Hopeman
  8831. + steve.hopeman&wheaton.edu
  8832. +35929
  8833. + Prodata Mobility Systems NV
  8834. + Peter Haijen
  8835. + peter.haijen&prodatamobility.com
  8836. +35930
  8837. + Radeks Medical Information Technologies Ltd
  8838. + Serdar Soydemir
  8839. + serdar&radeks.com
  8840. +35931
  8841. + Woasis Telecommunications Ltd.
  8842. + xiangdongwang
  8843. + xiangdong.wang&w-oasis.com
  8844. +35932
  8845. + JM Technology Inc.
  8846. + Toshiaki Shiwaku
  8847. + t.shiwaku&jmtech.co.jp
  8848. +35933
  8849. + Semiocast
  8850. + Paul Guyot
  8851. + ianaoid&semiocast.com
  8852. +35934
  8853. + OOO CPCR-Express
  8854. + George Zavyalov
  8855. + zavyalov_gg&cpcr.ru
  8856. +35935
  8857. + RAU-Stromversorgungen GmbH
  8858. + Werner Rau
  8859. + info&rau-strom.de
  8860. +35936
  8861. + Iconmobile GmbH
  8862. + Anton Popov
  8863. + it.adm&iconmobile.com
  8864. +35937
  8865. + Víctor Román Archidona
  8866. + Víctor Román Archidona
  8867. + contacto&victor-roman.com
  8868. +35938
  8869. + Omnibond Systems LLC.
  8870. + Boyd Wilson
  8871. + boydw&omnibond.com
  8872. +35939
  8873. + Original1 GmbH
  8874. + Sven Schiwek
  8875. + info&original1.net
  8876. +35940
  8877. + Neuhalfen
  8878. + Jens Neuhalfen
  8879. + iana&neuhalfen.name
  8880. +35941
  8881. + Mitsubishi UFJ Securities (USA), Inc.
  8882. + Kazutaka Abe
  8883. + kabe&us.sc.mufg.jp
  8884.  
  8885.  
  8886. End of Document
  8887. diff -urN wireshark-1.2.8/epan/ftypes/ftype-bytes.c wireshark-1.2.9/epan/ftypes/ftype-bytes.c
  8888. --- wireshark-1.2.8/epan/ftypes/ftype-bytes.c 2010-05-05 10:11:58.000000000 -0700
  8889. +++ wireshark-1.2.9/epan/ftypes/ftype-bytes.c 2010-06-08 16:26:10.000000000 -0700
  8890. @@ -1,5 +1,5 @@
  8891. /*
  8892. - * $Id: ftype-bytes.c 31605 2010-01-21 17:30:45Z gerald $
  8893. + * $Id: ftype-bytes.c 33115 2010-06-06 22:13:16Z gerald $
  8894. *
  8895. * Wireshark - Network traffic analyzer
  8896. * By Gerald Combs <gerald@wireshark.org>
  8897. @@ -696,7 +696,7 @@
  8898.  
  8899. static ftype_t oid_type = {
  8900. FT_OID, /* ftype */
  8901. - "OID", /* name */
  8902. + "FT_OID", /* name */
  8903. "OBJECT IDENTIFIER", /* pretty_name */
  8904. 0, /* wire_size */
  8905. bytes_fvalue_new, /* new_value */
  8906. diff -urN wireshark-1.2.8/epan/ftypes/ftype-guid.c wireshark-1.2.9/epan/ftypes/ftype-guid.c
  8907. --- wireshark-1.2.8/epan/ftypes/ftype-guid.c 2010-05-05 10:11:58.000000000 -0700
  8908. +++ wireshark-1.2.9/epan/ftypes/ftype-guid.c 2010-06-08 16:26:10.000000000 -0700
  8909. @@ -1,5 +1,5 @@
  8910. /*
  8911. - * $Id: ftype-guid.c 28117 2009-04-22 03:07:37Z guy $
  8912. + * $Id: ftype-guid.c 33115 2010-06-06 22:13:16Z gerald $
  8913. *
  8914. * Wireshark - Network traffic analyzer
  8915. * By Gerald Combs <gerald@wireshark.org>
  8916. @@ -130,7 +130,7 @@
  8917.  
  8918. static ftype_t guid_type = {
  8919. FT_GUID, /* ftype */
  8920. - "GUID", /* name */
  8921. + "FT_GUID", /* name */
  8922. "Globally Unique Identifier", /* pretty_name */
  8923. GUID_LEN, /* wire_size */
  8924. NULL, /* new_value */
  8925. diff -urN wireshark-1.2.8/epan/libwireshark.def wireshark-1.2.9/epan/libwireshark.def
  8926. --- wireshark-1.2.8/epan/libwireshark.def 2010-05-05 10:13:00.000000000 -0700
  8927. +++ wireshark-1.2.9/epan/libwireshark.def 2010-06-08 16:27:30.000000000 -0700
  8928. @@ -1,5 +1,5 @@
  8929. ; libwireshark.def
  8930. -; $Id: libwireshark.def 31271 2009-12-15 01:27:47Z gerald $
  8931. +; $Id: libwireshark.def 33115 2010-06-06 22:13:16Z gerald $
  8932.  
  8933. ; Add symbols that should be exported out of libwireshark.dll,
  8934. ; e.g. when used inside the GUI.
  8935. @@ -192,8 +192,10 @@
  8936. dissect_ber_restricted_string
  8937. dissect_ber_sequence_of
  8938. dissect_ber_sequence
  8939. +dissect_ber_set
  8940. dissect_ber_set_of
  8941. dissect_ber_tagged_type
  8942. +dissect_ber_UTCTime
  8943. dissect_dcerpc_uint16
  8944. dissect_dcerpc_uint32
  8945. dissect_dcerpc_uint64
  8946. diff -urN wireshark-1.2.8/epan/packet.c wireshark-1.2.9/epan/packet.c
  8947. --- wireshark-1.2.8/epan/packet.c 2010-05-05 10:13:01.000000000 -0700
  8948. +++ wireshark-1.2.9/epan/packet.c 2010-06-08 16:27:31.000000000 -0700
  8949. @@ -1,7 +1,7 @@
  8950. /* packet.c
  8951. * Routines for packet disassembly
  8952. *
  8953. - * $Id: packet.c 28662 2009-06-08 15:37:46Z gerald $
  8954. + * $Id: packet.c 33115 2010-06-06 22:13:16Z gerald $
  8955. *
  8956. * Wireshark - Network traffic analyzer
  8957. * By Gerald Combs <gerald@wireshark.org>
  8958. @@ -322,7 +322,10 @@
  8959. edt->pi.clnp_dstref = 0;
  8960. edt->pi.link_dir = LINK_DIR_UNKNOWN;
  8961.  
  8962. - EP_CHECK_CANARY(("before dissecting frame %d",fd->num));
  8963. + /* to enable decode as for ethertype=0x0000 (fix for bug 4721) */
  8964. + edt->pi.ethertype = G_MAXINT;
  8965. +
  8966. + EP_CHECK_CANARY(("before dissecting frame %d",fd->num));
  8967.  
  8968. TRY {
  8969. edt->tvb = tvb_new_real_data(pd, fd->cap_len, fd->pkt_len);
  8970. diff -urN wireshark-1.2.8/epan/proto.c wireshark-1.2.9/epan/proto.c
  8971. --- wireshark-1.2.8/epan/proto.c 2010-05-05 10:13:00.000000000 -0700
  8972. +++ wireshark-1.2.9/epan/proto.c 2010-06-08 16:27:30.000000000 -0700
  8973. @@ -1,7 +1,7 @@
  8974. /* proto.c
  8975. * Routines for protocol tree
  8976. *
  8977. - * $Id: proto.c 32223 2010-03-17 19:14:44Z gerald $
  8978. + * $Id: proto.c 33123 2010-06-07 01:58:57Z gerald $
  8979. *
  8980. * Wireshark - Network traffic analyzer
  8981. * By Gerald Combs <gerald@wireshark.org>
  8982. @@ -409,7 +409,7 @@
  8983. g_hash_table_destroy(proto_names);
  8984. proto_names = NULL;
  8985. }
  8986. -
  8987. +
  8988. if (proto_short_names) {
  8989. g_hash_table_destroy(proto_short_names);
  8990. proto_short_names = NULL;
  8991. @@ -677,7 +677,7 @@
  8992. break;
  8993. }
  8994. }
  8995. -
  8996. +
  8997. return g_str_hash(copy);
  8998. }
  8999.  
  9000. @@ -686,19 +686,19 @@
  9001. prefix_equal (gconstpointer ap,gconstpointer bp) {
  9002. const gchar* a = ap;
  9003. const gchar* b = bp;
  9004. -
  9005. +
  9006. do {
  9007. gchar ac = *a++;
  9008. gchar bc = *b++;
  9009. -
  9010. +
  9011. if ((ac == '.' || ac == '\0') && (bc == '.' || bc == '\0')) return TRUE;
  9012. -
  9013. +
  9014. if ( (ac == '.' || ac == '\0') && ! (bc == '.' || bc == '\0') ) return FALSE;
  9015. if ( (bc == '.' || bc == '\0') && ! (ac == '.' || ac == '\0') ) return FALSE;
  9016. -
  9017. +
  9018. if (ac != bc) return FALSE;
  9019. } while(1);
  9020. -
  9021. +
  9022. return FALSE;
  9023. }
  9024.  
  9025. @@ -713,7 +713,7 @@
  9026. if (! prefixes ) {
  9027. prefixes = g_hash_table_new(prefix_hash,prefix_equal);
  9028. }
  9029. -
  9030. +
  9031. g_hash_table_insert(prefixes,(gpointer)prefix,pi);
  9032. }
  9033.  
  9034. @@ -740,22 +740,22 @@
  9035. {
  9036. header_field_info* hfinfo;
  9037. prefix_initializer_t pi;
  9038. -
  9039. +
  9040. DISSECTOR_ASSERT(field_name != NULL);
  9041.  
  9042. hfinfo = g_tree_lookup(gpa_name_tree, field_name);
  9043. -
  9044. +
  9045. if (hfinfo) return hfinfo;
  9046. -
  9047. +
  9048. if (!prefixes) return NULL;
  9049. -
  9050. +
  9051. if(( pi = g_hash_table_lookup(prefixes,field_name) )) {
  9052. pi(field_name);
  9053. g_hash_table_remove(prefixes,field_name);
  9054. } else {
  9055. return NULL;
  9056. }
  9057. -
  9058. +
  9059. return g_tree_lookup(gpa_name_tree, field_name);
  9060. }
  9061.  
  9062. @@ -1003,9 +1003,12 @@
  9063.  
  9064. pi = proto_tree_add_text_node(tree, NULL, 0, 0);
  9065.  
  9066. + if (pi) {
  9067. va_start(ap, format);
  9068. - if (pi)
  9069. proto_tree_set_representation(pi, format, ap);
  9070. + va_end(ap);
  9071. + }
  9072. + va_start(ap, format);
  9073. vprintf(format, ap);
  9074. va_end(ap);
  9075. printf("\n");
  9076. @@ -3196,8 +3199,6 @@
  9077. }
  9078.  
  9079. if (!PROTO_ITEM_IS_HIDDEN(pi)) {
  9080. - va_start(ap, format);
  9081. -
  9082. /*
  9083. * If we don't already have a representation,
  9084. * generate the default representation.
  9085. @@ -3209,10 +3210,11 @@
  9086.  
  9087. curlen = strlen(fi->rep->representation);
  9088. if (ITEM_LABEL_LENGTH > curlen) {
  9089. + va_start(ap, format);
  9090. g_vsnprintf(fi->rep->representation + curlen,
  9091. ITEM_LABEL_LENGTH - (gulong) curlen, format, ap);
  9092. + va_end(ap);
  9093. }
  9094. - va_end(ap);
  9095. }
  9096. }
  9097.  
  9098. @@ -5169,7 +5171,7 @@
  9099. }
  9100. }
  9101.  
  9102. -/* Dumps the value_strings, range_strings or true/false strings for fields
  9103. +/* Dumps the value_strings, range_strings or true/false strings for fields
  9104. * that have them. There is one record per line. Fields are tab-delimited.
  9105. * There are three types of records: Value String, Range String
  9106. * and True/False String. The first field, 'V', 'R' or 'T', indicates
  9107. @@ -5940,7 +5942,7 @@
  9108. * This array is terminated by a NULL entry.
  9109. *
  9110. * FT_BOOLEAN bits that are set to 1 will have the name added to the expansion.
  9111. - * FT_integer fields that have a value_string attached will have the
  9112. + * FT_integer fields that have a value_string attached will have the
  9113. * matched string displayed on the expansion line.
  9114. */
  9115. proto_item *
  9116. diff -urN wireshark-1.2.8/epan/sigcomp-udvm.c wireshark-1.2.9/epan/sigcomp-udvm.c
  9117. --- wireshark-1.2.8/epan/sigcomp-udvm.c 2010-05-05 10:13:00.000000000 -0700
  9118. +++ wireshark-1.2.9/epan/sigcomp-udvm.c 2010-06-08 16:27:30.000000000 -0700
  9119. @@ -3,7 +3,7 @@
  9120. * Signaling Compression (SigComp) dissection.
  9121. * Copyright 2004, Anders Broman <anders.broman@ericsson.com>
  9122. *
  9123. - * $Id: sigcomp-udvm.c 28365 2009-05-14 20:12:43Z etxrab $
  9124. + * $Id: sigcomp-udvm.c 33134 2010-06-07 16:07:46Z gerald $
  9125. *
  9126. * Wireshark - Network traffic analyzer
  9127. * By Gerald Combs <gerald@wireshark.org>
  9128. @@ -133,7 +133,7 @@
  9129. tvbuff_t *decomp_tvb;
  9130. guint8 buff[UDVM_MEMORY_SIZE];
  9131. char string[2];
  9132. - guint8 *out_buff; /* Largest allowed size for a message is 65535 */
  9133. + guint8 *out_buff; /* Largest allowed size for a message is UDVM_MEMORY_SIZE = 65536 */
  9134. guint32 i = 0;
  9135. guint16 n = 0;
  9136. guint16 m = 0;
  9137. @@ -322,8 +322,8 @@
  9138. offset++;
  9139.  
  9140. }
  9141. - /* Largest allowed size for a message is 65535 */
  9142. - out_buff = g_malloc(65535);
  9143. + /* Largest allowed size for a message is UDVM_MEMORY_SIZE = 65536 */
  9144. + out_buff = g_malloc(UDVM_MEMORY_SIZE);
  9145. /* Start executing code */
  9146. current_address = udvm_start_ip;
  9147. input_address = 0;
  9148. @@ -338,11 +338,11 @@
  9149. result_code = 15;
  9150. goto decompression_failure;
  9151. }
  9152. + used_udvm_cycles++;
  9153. current_instruction = buff[current_address];
  9154.  
  9155. switch ( current_instruction ) {
  9156. case SIGCOMP_INSTR_DECOMPRESSION_FAILURE:
  9157. - used_udvm_cycles++;
  9158. if ( result_code == 0 )
  9159. result_code = 9;
  9160. proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1,
  9161. @@ -370,7 +370,6 @@
  9162. break;
  9163.  
  9164. case SIGCOMP_INSTR_AND: /* 1 AND ($operand_1, %operand_2) */
  9165. - used_udvm_cycles++;
  9166. if (show_instr_detail_level == 2 ){
  9167. proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1,
  9168. "Addr: %u ## AND(1) (operand_1, operand_2)",
  9169. @@ -412,7 +411,6 @@
  9170. break;
  9171.  
  9172. case SIGCOMP_INSTR_OR: /* 2 OR ($operand_1, %operand_2) */
  9173. - used_udvm_cycles++;
  9174. if (show_instr_detail_level == 2 ){
  9175. proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1,
  9176. "Addr: %u ## OR(2) (operand_1, operand_2)",
  9177. @@ -454,7 +452,6 @@
  9178. break;
  9179.  
  9180. case SIGCOMP_INSTR_NOT: /* 3 NOT ($operand_1) */
  9181. - used_udvm_cycles++;
  9182. if (show_instr_detail_level == 2 ){
  9183. proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1,
  9184. "Addr: %u ## NOT(3) ($operand_1)",
  9185. @@ -488,7 +485,6 @@
  9186. break;
  9187.  
  9188. case SIGCOMP_INSTR_LSHIFT: /* 4 LSHIFT ($operand_1, %operand_2) */
  9189. - used_udvm_cycles++;
  9190. if (show_instr_detail_level == 2 ){
  9191. proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1,
  9192. "Addr: %u ## LSHIFT(4) ($operand_1, operand_2)",
  9193. @@ -529,7 +525,6 @@
  9194.  
  9195. break;
  9196. case SIGCOMP_INSTR_RSHIFT: /* 5 RSHIFT ($operand_1, %operand_2) */
  9197. - used_udvm_cycles++;
  9198. if (show_instr_detail_level == 2 ){
  9199. proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1,
  9200. "Addr: %u ## RSHIFT(5) (operand_1, operand_2)",
  9201. @@ -569,7 +564,6 @@
  9202. goto execute_next_instruction;
  9203. break;
  9204. case SIGCOMP_INSTR_ADD: /* 6 ADD ($operand_1, %operand_2) */
  9205. - used_udvm_cycles++;
  9206. if (show_instr_detail_level == 2 ){
  9207. proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1,
  9208. "Addr: %u ## ADD(6) (operand_1, operand_2)",
  9209. @@ -609,7 +603,6 @@
  9210. goto execute_next_instruction;
  9211.  
  9212. case SIGCOMP_INSTR_SUBTRACT: /* 7 SUBTRACT ($operand_1, %operand_2) */
  9213. - used_udvm_cycles++;
  9214. if (show_instr_detail_level == 2 ){
  9215. proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1,
  9216. "Addr: %u ## SUBTRACT(7) (operand_1, operand_2)",
  9217. @@ -650,7 +643,6 @@
  9218. break;
  9219.  
  9220. case SIGCOMP_INSTR_MULTIPLY: /* 8 MULTIPLY ($operand_1, %operand_2) */
  9221. - used_udvm_cycles++;
  9222. if (show_instr_detail_level == 2 ){
  9223. proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1,
  9224. "Addr: %u ##MULTIPLY(8) (operand_1, operand_2)",
  9225. @@ -698,7 +690,6 @@
  9226. break;
  9227.  
  9228. case SIGCOMP_INSTR_DIVIDE: /* 9 DIVIDE ($operand_1, %operand_2) */
  9229. - used_udvm_cycles++;
  9230. if (show_instr_detail_level == 2 ){
  9231. proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1,
  9232. "Addr: %u ## DIVIDE(9) (operand_1, operand_2)",
  9233. @@ -748,7 +739,6 @@
  9234. break;
  9235.  
  9236. case SIGCOMP_INSTR_REMAINDER: /* 10 REMAINDER ($operand_1, %operand_2) */
  9237. - used_udvm_cycles++;
  9238. if (show_instr_detail_level == 2 ){
  9239. proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1,
  9240. "Addr: %u ## REMAINDER(10) (operand_1, operand_2)",
  9241. @@ -854,7 +844,7 @@
  9242. operand_address, ref_destination);
  9243. }
  9244. current_address = next_operand_address;
  9245. - used_udvm_cycles = used_udvm_cycles + 1 + length;
  9246. + used_udvm_cycles = used_udvm_cycles + length;
  9247.  
  9248. n = 0;
  9249. k = position;
  9250. @@ -949,7 +939,6 @@
  9251. proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1," Loading bytes at %u Value %u 0x%x",
  9252. address, value, value);
  9253. }
  9254. - used_udvm_cycles++;
  9255. current_address = next_operand_address;
  9256. goto execute_next_instruction;
  9257. break;
  9258. @@ -987,7 +976,7 @@
  9259. current_address, address, n, n-1);
  9260. }
  9261. operand_address = next_operand_address;
  9262. - used_udvm_cycles = used_udvm_cycles + 1 + n;
  9263. + used_udvm_cycles = used_udvm_cycles + n;
  9264. while ( n > 0) {
  9265. n = n - 1;
  9266. /* %value */
  9267. @@ -1056,7 +1045,6 @@
  9268. buff[stack_location] = (stack_fill >> 8) & 0x00FF;
  9269. buff[(stack_location+1) & 0xFFFF] = stack_fill & 0x00FF;
  9270.  
  9271. - used_udvm_cycles++;
  9272. goto execute_next_instruction;
  9273.  
  9274. break;
  9275. @@ -1113,7 +1101,6 @@
  9276. buff[destination] = (value >> 8) & 0x00FF;
  9277. buff[(destination+1) & 0xFFFF] = value & 0x00FF;
  9278.  
  9279. - used_udvm_cycles++;
  9280. goto execute_next_instruction;
  9281.  
  9282. break;
  9283. @@ -1201,7 +1188,7 @@
  9284. position = byte_copy_left;
  9285. }
  9286. }
  9287. - used_udvm_cycles = used_udvm_cycles + 1 + length;
  9288. + used_udvm_cycles = used_udvm_cycles + length;
  9289. goto execute_next_instruction;
  9290. break;
  9291.  
  9292. @@ -1295,7 +1282,7 @@
  9293. buff[result_dest] = k >> 8;
  9294. buff[result_dest + 1] = k & 0x00ff;
  9295.  
  9296. - used_udvm_cycles = used_udvm_cycles + 1 + length;
  9297. + used_udvm_cycles = used_udvm_cycles + length;
  9298. goto execute_next_instruction;
  9299. break;
  9300.  
  9301. @@ -1425,7 +1412,7 @@
  9302. }
  9303. buff[result_dest] = k >> 8;
  9304. buff[result_dest + 1] = k & 0x00ff;
  9305. - used_udvm_cycles = used_udvm_cycles + 1 + length;
  9306. + used_udvm_cycles = used_udvm_cycles + length;
  9307. goto execute_next_instruction;
  9308.  
  9309. break;
  9310. @@ -1502,7 +1489,7 @@
  9311. k = ( k + 1 ) & 0xffff;
  9312. n++;
  9313. }/* end while */
  9314. - used_udvm_cycles = used_udvm_cycles + 1 + length;
  9315. + used_udvm_cycles = used_udvm_cycles + length;
  9316. goto execute_next_instruction;
  9317. break;
  9318.  
  9319. @@ -1528,7 +1515,6 @@
  9320. current_address, at_address);
  9321. }
  9322. current_address = at_address;
  9323. - used_udvm_cycles++;
  9324. goto execute_next_instruction;
  9325. break;
  9326.  
  9327. @@ -1605,7 +1591,6 @@
  9328. current_address = at_address_2;
  9329. if ( value_1 > value_2 )
  9330. current_address = at_address_3;
  9331. - used_udvm_cycles++;
  9332. goto execute_next_instruction;
  9333. break;
  9334.  
  9335. @@ -1649,7 +1634,6 @@
  9336. /* ... and jump to the destination address */
  9337. current_address = at_address;
  9338.  
  9339. - used_udvm_cycles++;
  9340. goto execute_next_instruction;
  9341.  
  9342. break;
  9343. @@ -1684,7 +1668,6 @@
  9344. /* ... and set the PC to the popped value */
  9345. current_address = at_address;
  9346.  
  9347. - used_udvm_cycles++;
  9348. goto execute_next_instruction;
  9349.  
  9350. break;
  9351. @@ -1746,7 +1729,7 @@
  9352. result_code = 6;
  9353. goto decompression_failure;
  9354. }
  9355. - used_udvm_cycles = used_udvm_cycles + 1 + n;
  9356. + used_udvm_cycles = used_udvm_cycles + n;
  9357.  
  9358. goto execute_next_instruction;
  9359.  
  9360. @@ -1792,7 +1775,7 @@
  9361. operand_address, at_address);
  9362. }
  9363. /* operand_value = (memory_address_of_instruction + D) modulo 2^16 */
  9364. - used_udvm_cycles = used_udvm_cycles + 1 + length;
  9365. + used_udvm_cycles = used_udvm_cycles + length;
  9366.  
  9367. n = 0;
  9368. k = position;
  9369. @@ -1948,7 +1931,7 @@
  9370. k = ( k + 1 ) & 0xffff;
  9371. n++;
  9372. }
  9373. - used_udvm_cycles = used_udvm_cycles + 1 + length;
  9374. + used_udvm_cycles = used_udvm_cycles + length;
  9375. current_address = next_operand_address;
  9376. goto execute_next_instruction;
  9377. break;
  9378. @@ -2039,7 +2022,6 @@
  9379. buff, &old_input_bit_order, &remaining_bits,
  9380. &input_bits, &input_address, length, &result_code, msg_end);
  9381. if ( result_code == 11 ){
  9382. - used_udvm_cycles = used_udvm_cycles + 1;
  9383. current_address = at_address;
  9384. goto execute_next_instruction;
  9385. }
  9386. @@ -2054,7 +2036,6 @@
  9387. " Loading value: %u (0x%x) at Addr: %u, remaining_bits: %u", value, value, destination, remaining_bits);
  9388. }
  9389.  
  9390. - used_udvm_cycles = used_udvm_cycles + 1;
  9391. goto execute_next_instruction;
  9392. break;
  9393. case SIGCOMP_INSTR_INPUT_HUFFMAN: /* 30 */
  9394. @@ -2101,7 +2082,7 @@
  9395. current_address, destination, at_address, n, n, n, n, n);
  9396. }
  9397.  
  9398. - used_udvm_cycles = used_udvm_cycles + 1 + n;
  9399. + used_udvm_cycles = used_udvm_cycles + n;
  9400.  
  9401. /*
  9402. * Note that if n = 0 then the INPUT-HUFFMAN instruction is ignored and
  9403. @@ -2343,7 +2324,7 @@
  9404. if ( result_code != 0 ){
  9405. goto decompression_failure;
  9406. }
  9407. - used_udvm_cycles = used_udvm_cycles + 1 + state_length;
  9408. + used_udvm_cycles = used_udvm_cycles + state_length;
  9409. goto execute_next_instruction;
  9410. break;
  9411. case SIGCOMP_INSTR_STATE_CREATE: /* 32 */
  9412. @@ -2445,7 +2426,7 @@
  9413. state_instruction_buff[no_of_state_create] = state_instruction;
  9414. state_minimum_access_length_buff[no_of_state_create] = minimum_access_length;
  9415. state_state_retention_priority_buff[no_of_state_create] = state_retention_priority;
  9416. - used_udvm_cycles = used_udvm_cycles + 1 + state_length;
  9417. + used_udvm_cycles = used_udvm_cycles + state_length;
  9418. /* Debug */
  9419. byte_copy_right = buff[66] << 8;
  9420. byte_copy_right = byte_copy_right | buff[67];
  9421. @@ -2512,7 +2493,6 @@
  9422. * TODO implement it
  9423. */
  9424. udvm_state_free(buff,p_id_start,p_id_length);
  9425. - used_udvm_cycles++;
  9426.  
  9427. goto execute_next_instruction;
  9428. break;
  9429. @@ -2589,7 +2569,7 @@
  9430. output_address ++;
  9431. n++;
  9432. }
  9433. - used_udvm_cycles = used_udvm_cycles + 1 + output_length;
  9434. + used_udvm_cycles = used_udvm_cycles + output_length;
  9435. goto execute_next_instruction;
  9436. break;
  9437. case SIGCOMP_INSTR_END_MESSAGE: /* 35 */
  9438. @@ -2757,7 +2737,7 @@
  9439. /*
  9440. proto_tree_add_text(udvm_tree, decomp_tvb, 0, -1,"SigComp message Decompressed");
  9441. */
  9442. - used_udvm_cycles = used_udvm_cycles + 1 + state_length;
  9443. + used_udvm_cycles = used_udvm_cycles + state_length;
  9444. proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1,"maximum_UDVM_cycles %u used_udvm_cycles %u",
  9445. maximum_UDVM_cycles, used_udvm_cycles);
  9446. return decomp_tvb;
  9447. diff -urN wireshark-1.2.8/epan/sminmpec.c wireshark-1.2.9/epan/sminmpec.c
  9448. --- wireshark-1.2.8/epan/sminmpec.c 2010-05-05 10:25:16.000000000 -0700
  9449. +++ wireshark-1.2.9/epan/sminmpec.c 2010-06-08 16:42:37.000000000 -0700
  9450. @@ -1590,7 +1590,7 @@
  9451. { 1572, "Forte Software, Inc." },
  9452. { 1573, "McAfee (previous was 'Secure Computing Corporation')" },
  9453. { 1574, "BEZEQ" },
  9454. - { 1575, "Technical University of Braunschweig" },
  9455. + { 1575, "TU Braunschweig" },
  9456. { 1576, "Stac Inc." },
  9457. { 1577, "StarNet Communications" },
  9458. { 1578, "Universidade do Minho" },
  9459. @@ -23676,7 +23676,7 @@
  9460. { 23792, "Dekolink Wireless Ltd" },
  9461. { 23793, "Cluster Resources" },
  9462. { 23794, "Significant Bits" },
  9463. - { 23795, "Yavox Latin America" },
  9464. + { 23795, "Movile (previous was 'Yavox Latin America')" },
  9465. { 23796, "SunWare GmbH & Co KG" },
  9466. { 23797, "KSIGN Co., Ltd." },
  9467. { 23798, "Australia Post" },
  9468. @@ -25405,7 +25405,7 @@
  9469. { 25521, "NextConnect Ltd" },
  9470. { 25522, "Renko Technologies" },
  9471. { 25523, "Homecast Co., Ltd." },
  9472. - { 25524, "Open Hardware Project Russia" },
  9473. + { 25524, "Open Source Hardware Engineering Community (OSHEC)" },
  9474. { 25525, "TC&C Telecommunication and Computer Technology Ltd." },
  9475. { 25526, "IPRocess" },
  9476. { 25527, "Nebraska Public Power District" },
  9477. @@ -35340,7 +35340,7 @@
  9478. { 35465, "Bank Julius Baer & Co. Ltd." },
  9479. { 35466, "Forsway Scandinavia AB" },
  9480. { 35467, "OOO\"SpinBrain\"" },
  9481. - { 35468, "KTU RLSC" },
  9482. + { 35468, "Kaunas University of Technology" },
  9483. { 35469, "Seamless Distribution AB" },
  9484. { 35470, "First-Matrix" },
  9485. { 35471, "Johns Byrne Company" },
  9486. @@ -35581,7 +35581,7 @@
  9487. { 35706, "Guangzhou KingTeller Technology Co.,Ltd" },
  9488. { 35707, "S&P" },
  9489. { 35708, "BOUYGUES CONSTRUCTION " },
  9490. - { 35709, "BOUYGUES CONSTRUCTION " },
  9491. + { 35709, "Unassigned" },
  9492. { 35710, "Alcatel-Lucent, 4ESS" },
  9493. { 35711, "Sopinspace" },
  9494. { 35712, "Master Translation and Technology Services Co.,Ltd." },
  9495. @@ -35608,10 +35608,212 @@
  9496. { 35733, "VIDA Diagnostics Inc" },
  9497. { 35734, "Lennart J\0303\0274tte" },
  9498. { 35735, "A9 SAS" },
  9499. - { 35736, "bzctoons network" },
  9500. + { 35736, "BZCToOn'S Network / RedJuice.fr SARL" },
  9501. { 35737, "QA Cafe LLC" },
  9502. { 35738, "abcwxy.com" },
  9503. { 35739, "Bowline Network Consulting, Inc" },
  9504. + { 35740, "SACD" },
  9505. + { 35741, "Chi-X Europe Ltd" },
  9506. + { 35742, "Neurosearch, Inc." },
  9507. + { 35743, "Workonline Communications (Pty) Ltd" },
  9508. + { 35744, "D-Media Communication Tech" },
  9509. + { 35745, "Marine Harvest ASA" },
  9510. + { 35746, "Passepartout sa" },
  9511. + { 35747, "FEDERALNOE AGENTSTVO ZhELEZNODOROZhNOGO TRANSPORTA" },
  9512. + { 35748, "Switch++" },
  9513. + { 35749, "Alsim" },
  9514. + { 35750, "Spring Wireless" },
  9515. + { 35751, "Linux Lunatix" },
  9516. + { 35752, "Supra net d.o.o." },
  9517. + { 35753, "Les D\0303\0251veloppements Durables" },
  9518. + { 35754, "ON-AIR Systems Ltd." },
  9519. + { 35755, "P-21 GmbH" },
  9520. + { 35756, "inett GmbH" },
  9521. + { 35757, "Sonnection B.V." },
  9522. + { 35758, "Stichting Diagnose Kanker" },
  9523. + { 35759, "Welkin Sciences, LLC" },
  9524. + { 35760, "Optical Access Networks Lab, Shanghai University" },
  9525. + { 35761, "Center Parcs Europe" },
  9526. + { 35762, "FMLOG, Swedish Armed Forces Logistics" },
  9527. + { 35763, "Groupe Laurent" },
  9528. + { 35764, "St. Lawrence College" },
  9529. + { 35765, "zbits Unternehmensberatung GmbH" },
  9530. + { 35766, "Killermann GdbR" },
  9531. + { 35767, "University of Lodz" },
  9532. + { 35768, "GetWellNetwork, Inc." },
  9533. + { 35769, "Wellogic" },
  9534. + { 35770, "USIL Technology" },
  9535. + { 35771, "Hightech Payment Systems" },
  9536. + { 35772, "n@work Internet Informationssysteme GmbH" },
  9537. + { 35773, "Arcturus Networks Inc." },
  9538. + { 35774, "Universal Electric Corporation" },
  9539. + { 35775, "Rachitskiy Research and Development LLC" },
  9540. + { 35776, "BlueNote Communications SA" },
  9541. + { 35777, "Unique Solutions SA" },
  9542. + { 35778, "RTC-LEASING OJSC" },
  9543. + { 35779, "ican solutions private limited" },
  9544. + { 35780, "OAO Tatneft" },
  9545. + { 35781, "Matej Bel University Banska Bystrica" },
  9546. + { 35782, "Universidad de Extremadura" },
  9547. + { 35783, "Nika Ltd" },
  9548. + { 35784, "ECKD GmbH" },
  9549. + { 35785, "Xcira, Inc." },
  9550. + { 35786, "Continuant Inc" },
  9551. + { 35787, "Computaris" },
  9552. + { 35788, "Xolido Systems,S.A." },
  9553. + { 35789, "Despegar.com, Inc." },
  9554. + { 35790, "ClearCorp " },
  9555. + { 35791, "IES Systems, Inc." },
  9556. + { 35792, "Rygl" },
  9557. + { 35793, "Hirotech, Inc." },
  9558. + { 35794, "Java Verified" },
  9559. + { 35795, "Actifio" },
  9560. + { 35796, "Burda:IC GmbH" },
  9561. + { 35797, "Polska Telefonia Cyfrowa Sp. z o.o." },
  9562. + { 35798, "shack e.V." },
  9563. + { 35799, "Phmb Consulting" },
  9564. + { 35800, "Uniconsult" },
  9565. + { 35801, "EIX Ltd" },
  9566. + { 35802, "Mobango Ltd" },
  9567. + { 35803, "Eucalyptus Systems Inc." },
  9568. + { 35804, "Allgood Networks" },
  9569. + { 35805, "Athonet s.r.l." },
  9570. + { 35806, "Paul Milliken" },
  9571. + { 35807, "AJR Development" },
  9572. + { 35808, "SAR Elektronik A.S." },
  9573. + { 35809, "Hosting Community" },
  9574. + { 35810, "CDL PMO" },
  9575. + { 35811, "AMTANGEE Aktiengesellschaft" },
  9576. + { 35812, "CANCOM IT Solutions GmbH" },
  9577. + { 35813, "LinuxRulz" },
  9578. + { 35814, "Cordier Networks" },
  9579. + { 35815, "QUADStor Systems" },
  9580. + { 35816, "Shenzhen HY Amplitec Technology Co.,Ltd" },
  9581. + { 35817, "Giorik spa" },
  9582. + { 35818, "Azienda Feltrina s.p." },
  9583. + { 35819, "Digithurst Bildverarbeitungssysteme" },
  9584. + { 35820, "RCS Kladno, s.r.o." },
  9585. + { 35821, "FBComputers s.r.l." },
  9586. + { 35822, "V-Internet Operations, Inc." },
  9587. + { 35823, "HANGZHOU RICH INFO-TECH CO.,LTD" },
  9588. + { 35824, "Boll und Partner Software GmbH" },
  9589. + { 35825, "INAX Corporation" },
  9590. + { 35826, "THALES AIR OPERATION" },
  9591. + { 35827, "Invengo Information Technology Co.,Ltd" },
  9592. + { 35828, "Entropia e.V." },
  9593. + { 35829, "United Natural Foods, Inc." },
  9594. + { 35830, "ROFFET.com" },
  9595. + { 35831, "ATECH MICROELECTRONIC SYSTEMS" },
  9596. + { 35832, "Open Horizont.Ltd" },
  9597. + { 35833, "Deva Broadcast Ltd." },
  9598. + { 35834, "Gozaimass" },
  9599. + { 35835, "iB Solution Corporation" },
  9600. + { 35836, "China BraveFly Technology Co., Ltd." },
  9601. + { 35837, "Mamat GmbH" },
  9602. + { 35838, "Matrixx Software Inc." },
  9603. + { 35839, "Imagine One Technology & Management" },
  9604. + { 35840, "Gyrus ACMI, Inc." },
  9605. + { 35841, "Agecodagis SARL" },
  9606. + { 35842, "RamVZ" },
  9607. + { 35843, "Sebastian Muszytowski" },
  9608. + { 35844, "Stormont-Vail HealthCare" },
  9609. + { 35845, "Heraklion Wireless" },
  9610. + { 35846, "Parsons" },
  9611. + { 35847, "Greenbone Networks GmbH" },
  9612. + { 35848, "Multipolaris Ltd." },
  9613. + { 35849, "Telefonica International Wholesale Services" },
  9614. + { 35850, "Horns And Hooves" },
  9615. + { 35851, "Abix Tecnologia" },
  9616. + { 35852, "Spire Sciences LLC" },
  9617. + { 35853, "Remote Enterprise Monitoring, Inc." },
  9618. + { 35854, "American Modern" },
  9619. + { 35855, "Dialog Semiconductor" },
  9620. + { 35856, "Berchtold Holding GmbH" },
  9621. + { 35857, "AMARON BVBA" },
  9622. + { 35858, "The Goodyear Tire & Rubber Co." },
  9623. + { 35859, "Georgia-Pacific LLC." },
  9624. + { 35860, "Kvadroteh Ltd." },
  9625. + { 35861, "CRAWFORD COMMUNICATIONS, INC" },
  9626. + { 35862, "Mobile Integration Workgroup" },
  9627. + { 35863, "WAMAJU LLC" },
  9628. + { 35864, "Ales Hakl" },
  9629. + { 35865, "Trivia Solutions B.V." },
  9630. + { 35866, "Eno, Inc." },
  9631. + { 35867, "Prior srl" },
  9632. + { 35868, "Ater Belluno" },
  9633. + { 35869, "STB Broadcast" },
  9634. + { 35870, "OpsWise Software Inc." },
  9635. + { 35871, "Cloupia" },
  9636. + { 35872, "huggla.com" },
  9637. + { 35873, "JDS Uniphase Corporation" },
  9638. + { 35874, "Action Packed Networks" },
  9639. + { 35875, "JX2 Technology Pty Ltd" },
  9640. + { 35876, "WHITECODE,.LTD" },
  9641. + { 35877, "LEITNER AG - S.p.A" },
  9642. + { 35878, "Conseil g\0303\0251n\0303\0251ral de l'Aube" },
  9643. + { 35879, "WellDoc, Inc." },
  9644. + { 35880, "JSC \"Mediafon\"" },
  9645. + { 35881, "Ionis group" },
  9646. + { 35882, "NTT DATA KYUSHU CORPORATION" },
  9647. + { 35883, "VisualSoft Private Limited" },
  9648. + { 35884, "Nethost s.r.o." },
  9649. + { 35885, "VZ Holding AG" },
  9650. + { 35886, "Arise Telecommunications Ltd." },
  9651. + { 35887, "Lucierna SLNE" },
  9652. + { 35888, "DeadInkVinyl" },
  9653. + { 35889, "ColumbiaSoft Corporation" },
  9654. + { 35890, "Video-Flow ltd" },
  9655. + { 35891, "punctum Gesellschaft fuer Software mbH" },
  9656. + { 35892, "ELMEH GIU" },
  9657. + { 35893, "Xelmo" },
  9658. + { 35894, "Cognimatics AB" },
  9659. + { 35895, "Slackarea Internet Services" },
  9660. + { 35896, "Concord Energy" },
  9661. + { 35897, "Violin Memory, Inc." },
  9662. + { 35898, "SYSTEREL" },
  9663. + { 35899, "Prism Clinical Imaging, Inc." },
  9664. + { 35900, "DuMont Net GmbH & Co. KG" },
  9665. + { 35901, "Al-Quds University" },
  9666. + { 35902, "OpenHeadend" },
  9667. + { 35903, "Bartonia Domain and Enterprises" },
  9668. + { 35904, "MacroSAN" },
  9669. + { 35905, "ACME-Cebul inc." },
  9670. + { 35906, "Unister" },
  9671. + { 35907, "CRV Natural" },
  9672. + { 35908, "Embrane Software, Inc." },
  9673. + { 35909, "Horace Mann Educators Corporation" },
  9674. + { 35910, "overnet.qc.ca" },
  9675. + { 35911, "Mrezne Tehnologije Verso" },
  9676. + { 35912, "Makedonijalek" },
  9677. + { 35913, "Diputacion Provincial de C\0303\0241ceres" },
  9678. + { 35914, "Borea, Ltd." },
  9679. + { 35915, "SERLI" },
  9680. + { 35916, "Orangehead Software" },
  9681. + { 35917, "kobisun.org Surdurulebilir Sunucu Sistemleri" },
  9682. + { 35918, "ETON International co. ltd" },
  9683. + { 35919, "Funkwerk plettac electronics GmbH" },
  9684. + { 35920, "Sebastian Himberger Software" },
  9685. + { 35921, "Alpha-Bit GmbH" },
  9686. + { 35922, "Backbase B.V." },
  9687. + { 35923, "Enthusia Consulting Ltd" },
  9688. + { 35924, "IET-International Empire Traders" },
  9689. + { 35925, "Warsaw Stock Exchange" },
  9690. + { 35926, "Aguas de la Cuenca del Norte, S.A." },
  9691. + { 35927, "Softfinan\0303\0247a S.A." },
  9692. + { 35928, "Wheaton College" },
  9693. + { 35929, "Prodata Mobility Systems NV" },
  9694. + { 35930, "Radeks Medical Information Technologies Ltd" },
  9695. + { 35931, "Woasis Telecommunications Ltd." },
  9696. + { 35932, "JM Technology Inc." },
  9697. + { 35933, "Semiocast" },
  9698. + { 35934, "OOO CPCR-Express" },
  9699. + { 35935, "RAU-Stromversorgungen GmbH" },
  9700. + { 35936, "Iconmobile GmbH" },
  9701. + { 35937, "V\0303\0255ctor Rom\0303\0241n Archidona" },
  9702. + { 35938, "Omnibond Systems LLC." },
  9703. + { 35939, "Original1 GmbH" },
  9704. + { 35940, "Neuhalfen" },
  9705. + { 35941, "Mitsubishi UFJ Securities (USA), Inc." },
  9706.  
  9707. {0, NULL}
  9708. };
  9709. diff -urN wireshark-1.2.8/epan/tcap-persistentdata.h wireshark-1.2.9/epan/tcap-persistentdata.h
  9710. --- wireshark-1.2.8/epan/tcap-persistentdata.h 2010-05-05 10:13:00.000000000 -0700
  9711. +++ wireshark-1.2.9/epan/tcap-persistentdata.h 2010-06-08 16:27:31.000000000 -0700
  9712. @@ -8,7 +8,7 @@
  9713. * By Gerald Combs <gerald@wireshark.org>
  9714. * Copyright 1998 Gerald Combs
  9715. *
  9716. - * $Id: tcap-persistentdata.h 22415 2007-07-27 19:24:40Z morriss $
  9717. + * $Id: tcap-persistentdata.h 33153 2010-06-07 20:39:11Z gerald $
  9718. *
  9719. * This program is free software; you can redistribute it and/or
  9720. * modify it under the terms of the GNU General Public License
  9721. @@ -32,7 +32,7 @@
  9722. #include "epan/conversation.h"
  9723. #include "epan/dissectors/packet-tcap.h"
  9724.  
  9725. -#define LENGTH_OID 16
  9726. +#define LENGTH_OID 23
  9727. struct tcaphash_context_t {
  9728. struct tcaphash_context_key_t * key;
  9729. guint32 session_id;
  9730. diff -urN wireshark-1.2.8/file.c wireshark-1.2.9/file.c
  9731. --- wireshark-1.2.8/file.c 2010-05-05 10:13:11.000000000 -0700
  9732. +++ wireshark-1.2.9/file.c 2010-06-08 16:27:43.000000000 -0700
  9733. @@ -1,7 +1,7 @@
  9734. /* file.c
  9735. * File I/O routines
  9736. *
  9737. - * $Id: file.c 32655 2010-05-04 00:20:39Z gerald $
  9738. + * $Id: file.c 33123 2010-06-07 01:58:57Z gerald $
  9739. *
  9740. * Wireshark - Network traffic analyzer
  9741. * By Gerald Combs <gerald@wireshark.org>
  9742. @@ -688,6 +688,7 @@
  9743.  
  9744. /*g_log(NULL, G_LOG_LEVEL_MESSAGE, "cf_continue_tail: %u new: %u", cf->count, to_read);*/
  9745.  
  9746. + wtap_cleareof(cf->wth);
  9747. while (to_read != 0 && (wtap_read(cf->wth, err, &err_info, &data_offset))) {
  9748. if (cf->state == FILE_READ_ABORTED) {
  9749. /* Well, the user decided to exit Wireshark. Break out of the
  9750. @@ -766,6 +767,11 @@
  9751. return CF_READ_OK;
  9752. }
  9753.  
  9754. +void
  9755. +cf_fake_continue_tail(capture_file *cf) {
  9756. + cf->state = FILE_READ_DONE;
  9757. +}
  9758. +
  9759. cf_read_status_t
  9760. cf_finish_tail(capture_file *cf, int *err)
  9761. {
  9762. diff -urN wireshark-1.2.8/file.h wireshark-1.2.9/file.h
  9763. --- wireshark-1.2.8/file.h 2010-05-05 10:13:11.000000000 -0700
  9764. +++ wireshark-1.2.9/file.h 2010-06-08 16:27:43.000000000 -0700
  9765. @@ -1,7 +1,7 @@
  9766. /* file.h
  9767. * Definitions for file structures and routines
  9768. *
  9769. - * $Id: file.h 32655 2010-05-04 00:20:39Z gerald $
  9770. + * $Id: file.h 33123 2010-06-07 01:58:57Z gerald $
  9771. *
  9772. * Wireshark - Network traffic analyzer
  9773. * By Gerald Combs <gerald@wireshark.org>
  9774. @@ -132,6 +132,13 @@
  9775. cf_read_status_t cf_continue_tail(capture_file *cf, volatile int to_read, int *err);
  9776.  
  9777. /**
  9778. + * Fake reading packets from the "end" of a capture file.
  9779. + *
  9780. + * @param cf the capture file to be read from
  9781. + */
  9782. +void cf_fake_continue_tail(capture_file *cf);
  9783. +
  9784. +/**
  9785. * Finish reading from "end" of a capture file.
  9786. *
  9787. * @param cf the capture file to be read from
  9788. diff -urN wireshark-1.2.8/gtk/capture_file_dlg.c wireshark-1.2.9/gtk/capture_file_dlg.c
  9789. --- wireshark-1.2.8/gtk/capture_file_dlg.c 2010-05-05 10:11:51.000000000 -0700
  9790. +++ wireshark-1.2.9/gtk/capture_file_dlg.c 2010-06-08 16:26:02.000000000 -0700
  9791. @@ -1,7 +1,7 @@
  9792. /* capture_file_dlg.c
  9793. * Dialog boxes for handling capture files
  9794. *
  9795. - * $Id: capture_file_dlg.c 28108 2009-04-21 16:57:52Z guy $
  9796. + * $Id: capture_file_dlg.c 33115 2010-06-06 22:13:16Z gerald $
  9797. *
  9798. * Wireshark - Network traffic analyzer
  9799. * By Gerald Combs <gerald@wireshark.org>
  9800. @@ -337,9 +337,32 @@
  9801. /* make the preview widget sensitive */
  9802. gtk_widget_set_sensitive(prev, have_preview);
  9803.  
  9804. + /*
  9805. + * XXX - if the Open button isn't sensitive, you can't type into
  9806. + * the location bar and select the file or directory you've typed.
  9807. + * See
  9808. + *
  9809. + * https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1791
  9810. + *
  9811. + * It's not as if allowing users to click Open when they've
  9812. + * selected a file that's not a valid capture file will cause
  9813. + * anything worse than an error dialog, so we'll leave the Open
  9814. + * button sensitive for now. Perhaps making it sensitive if
  9815. + * cf_name is NULL would also work, although I don't know whether
  9816. + * there are any cases where it would be non-null when you've
  9817. + * typed in the location bar.
  9818. + *
  9819. + * XXX - Bug 1791 also notes that, with the line removed, Bill
  9820. + * Meier "somehow managed to get the file chooser window somewhat
  9821. + * wedged in that neither the cancel or open buttons were responsive".
  9822. + * That seems a bit odd, given that, without this line, we're not
  9823. + * monkeying with the Open button's sensitivity, but...
  9824. + */
  9825. +#if 0
  9826. /* make the open/save/... dialog button sensitive */
  9827.  
  9828. gtk_dialog_set_response_sensitive(file_sel, GTK_RESPONSE_ACCEPT, have_preview);
  9829. +#endif
  9830.  
  9831. /* do the actual preview */
  9832. if(have_preview)
  9833. diff -urN wireshark-1.2.8/gtk/decode_as_dlg.c wireshark-1.2.9/gtk/decode_as_dlg.c
  9834. --- wireshark-1.2.8/gtk/decode_as_dlg.c 2010-05-05 10:11:51.000000000 -0700
  9835. +++ wireshark-1.2.9/gtk/decode_as_dlg.c 2010-06-08 16:26:02.000000000 -0700
  9836. @@ -1,6 +1,6 @@
  9837. /* decode_as_dlg.c
  9838. *
  9839. - * $Id: decode_as_dlg.c 29106 2009-07-15 21:37:33Z gerald $
  9840. + * $Id: decode_as_dlg.c 33115 2010-06-06 22:13:16Z gerald $
  9841. *
  9842. * Routines to modify dissector tables on the fly.
  9843. *
  9844. @@ -1632,7 +1632,7 @@
  9845. gboolean
  9846. decode_as_ok(void)
  9847. {
  9848. - return cfile.edt->pi.ethertype || cfile.edt->pi.ipproto ||
  9849. + return (cfile.edt->pi.ethertype != G_MAXINT) || cfile.edt->pi.ipproto ||
  9850. cfile.edt->pi.ptype == PT_TCP || cfile.edt->pi.ptype == PT_UDP ||
  9851. cfile.edt->pi.mpls_label ||
  9852. cfile.cd_t == WTAP_FILE_BER;
  9853. @@ -1659,7 +1659,7 @@
  9854. g_object_set_data(G_OBJECT(decode_w), E_NOTEBOOK, notebook);
  9855.  
  9856. /* Add link level selection page */
  9857. - if (cfile.edt->pi.ethertype) {
  9858. + if (cfile.edt->pi.ethertype != G_MAXINT) {
  9859. g_snprintf(buffer, sizeof(buffer), "Ethertype 0x%04x", cfile.edt->pi.ethertype);
  9860. page = decode_add_simple_page(buffer, "Link", "ethertype", cfile.edt->pi.ethertype);
  9861. label = gtk_label_new("Link");
  9862. diff -urN wireshark-1.2.8/gtk/filter_autocomplete.c wireshark-1.2.9/gtk/filter_autocomplete.c
  9863. --- wireshark-1.2.8/gtk/filter_autocomplete.c 2010-05-05 10:11:50.000000000 -0700
  9864. +++ wireshark-1.2.9/gtk/filter_autocomplete.c 2010-06-08 16:26:02.000000000 -0700
  9865. @@ -777,16 +777,20 @@
  9866. size_t prefix_len;
  9867. gboolean protocols_only = FALSE;
  9868.  
  9869. - /* Delete the last character in the prefix string */
  9870. - prefix_len = strlen(prefix)-1;
  9871. - prefix[prefix_len] = '\0';
  9872. + prefix_len = strlen(prefix);
  9873.  
  9874. - if (prefix_len == 0) {
  9875. + if (prefix_len <= 1) {
  9876. /* Remove the popup window for protocols */
  9877. gtk_widget_destroy(popup_win);
  9878. g_object_set_data(G_OBJECT(main_win), E_FILT_AUTOCOMP_PTR_KEY, NULL);
  9879. return;
  9880. - } else if(strchr(prefix, '.') == NULL) {
  9881. + }
  9882. +
  9883. + /* Delete the last character in the prefix string */
  9884. + prefix_len--;
  9885. + prefix[prefix_len] = '\0';
  9886. +
  9887. + if(strchr(prefix, '.') == NULL) {
  9888. protocols_only = TRUE;
  9889. }
  9890.  
  9891. diff -urN wireshark-1.2.8/gtk/gui_utils.c wireshark-1.2.9/gtk/gui_utils.c
  9892. --- wireshark-1.2.8/gtk/gui_utils.c 2010-05-05 10:11:51.000000000 -0700
  9893. +++ wireshark-1.2.9/gtk/gui_utils.c 2010-06-08 16:26:02.000000000 -0700
  9894. @@ -3,7 +3,7 @@
  9895. * and some with GUI-independent APIs, with this file containing the GTK+
  9896. * implementations of them (declared in ui_util.h)
  9897. *
  9898. - * $Id: gui_utils.c 28444 2009-05-22 12:36:20Z wmeier $
  9899. + * $Id: gui_utils.c 33121 2010-06-07 01:13:14Z gerald $
  9900. *
  9901. * Wireshark - Network traffic analyzer
  9902. * By Gerald Combs <gerald@wireshark.org>
  9903. @@ -482,6 +482,9 @@
  9904. window_geometry_t geom;
  9905. const gchar *name;
  9906.  
  9907. + if (!win)
  9908. + return;
  9909. +
  9910. /* get_geometry must be done *before* destroy is running, as the window geometry
  9911. * cannot be retrieved at destroy time (so don't use event "destroy" for this) */
  9912. /* ...and don't do this at all, if we currently have no GdkWindow (e.g. if the
  9913. diff -urN wireshark-1.2.8/gtk/io_stat.c wireshark-1.2.9/gtk/io_stat.c
  9914. --- wireshark-1.2.8/gtk/io_stat.c 2010-05-05 10:11:51.000000000 -0700
  9915. +++ wireshark-1.2.9/gtk/io_stat.c 2010-06-08 16:26:03.000000000 -0700
  9916. @@ -1,7 +1,7 @@
  9917. /* io_stat.c
  9918. * io_stat 2002 Ronnie Sahlberg
  9919. *
  9920. - * $Id: io_stat.c 32215 2010-03-16 23:22:42Z gerald $
  9921. + * $Id: io_stat.c 33115 2010-06-06 22:13:16Z gerald $
  9922. *
  9923. * Wireshark - Network traffic analyzer
  9924. * By Gerald Combs <gerald@wireshark.org>
  9925. @@ -1573,7 +1573,9 @@
  9926. combo_box = gtk_combo_box_new_text ();
  9927.  
  9928. for(i=0;i<MAX_TICK_VALUES;i++){
  9929. - if(tick_interval_values[i]>=1000){
  9930. + if(tick_interval_values[i]>=60000){
  9931. + g_snprintf(str, sizeof(str), "%u min", tick_interval_values[i]/60000);
  9932. + } else if(tick_interval_values[i]>=1000){
  9933. g_snprintf(str, sizeof(str), "%u sec", tick_interval_values[i]/1000);
  9934. } else if(tick_interval_values[i]>=100){
  9935. g_snprintf(str, sizeof(str), "0.%1u sec", (tick_interval_values[i]/100)%10);
  9936. diff -urN wireshark-1.2.8/Makefile.am wireshark-1.2.9/Makefile.am
  9937. --- wireshark-1.2.8/Makefile.am 2010-05-05 10:13:11.000000000 -0700
  9938. +++ wireshark-1.2.9/Makefile.am 2010-06-08 16:27:42.000000000 -0700
  9939. @@ -1,7 +1,7 @@
  9940. # Makefile.am
  9941. # Automake file for Wireshark
  9942. #
  9943. -# $Id: Makefile.am 32242 2010-03-19 07:22:29Z etxrab $
  9944. +# $Id: Makefile.am 33123 2010-06-07 01:58:57Z gerald $
  9945. #
  9946. # Wireshark - Network traffic analyzer
  9947. # By Gerald Combs <gerald@wireshark.org>
  9948. @@ -312,7 +312,7 @@
  9949. $(plugin_ldadd) \
  9950. @PCRE_LIBS@ \
  9951. @PCAP_LIBS@ \
  9952. - @GTK_LIBS@ \
  9953. + @GTK_LIBS@ -lm \
  9954. @C_ARES_LIBS@ \
  9955. @ADNS_LIBS@ \
  9956. @KRB5_LIBS@ \
  9957. diff -urN wireshark-1.2.8/Makefile.in wireshark-1.2.9/Makefile.in
  9958. --- wireshark-1.2.8/Makefile.in 2010-05-05 10:14:30.000000000 -0700
  9959. +++ wireshark-1.2.9/Makefile.in 2010-06-08 16:30:29.000000000 -0700
  9960. @@ -17,7 +17,7 @@
  9961. # Makefile.am
  9962. # Automake file for Wireshark
  9963. #
  9964. -# $Id: Makefile.am 32242 2010-03-19 07:22:29Z etxrab $
  9965. +# $Id: Makefile.am 33123 2010-06-07 01:58:57Z gerald $
  9966. #
  9967. # Wireshark - Network traffic analyzer
  9968. # By Gerald Combs <gerald@wireshark.org>
  9969. @@ -1036,7 +1036,7 @@
  9970. $(plugin_ldadd) \
  9971. @PCRE_LIBS@ \
  9972. @PCAP_LIBS@ \
  9973. - @GTK_LIBS@ \
  9974. + @GTK_LIBS@ -lm \
  9975. @C_ARES_LIBS@ \
  9976. @ADNS_LIBS@ \
  9977. @KRB5_LIBS@ \
  9978. diff -urN wireshark-1.2.8/manuf wireshark-1.2.9/manuf
  9979. --- wireshark-1.2.8/manuf 2010-05-05 10:13:10.000000000 -0700
  9980. +++ wireshark-1.2.9/manuf 2010-06-08 16:27:42.000000000 -0700
  9981. @@ -4,7 +4,7 @@
  9982. #
  9983. # /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
  9984. #
  9985. -# $Id: manuf 32632 2010-05-02 15:04:42Z gerald $
  9986. +# $Id: manuf 33111 2010-06-06 15:04:49Z gerald $
  9987. #
  9988. # Laurent Deniel <laurent.deniel [AT] free.fr>
  9989. #
  9990. @@ -1599,7 +1599,7 @@
  9991. 00:06:08 At-SkySas # At-Sky SAS
  9992. 00:06:09 Crossport # Crossport Systems
  9993. 00:06:0A Blue2space
  9994. -00:06:0B Paceline # Paceline Systems Corporation
  9995. +00:06:0B EmersonNet # Emerson Network Power
  9996. 00:06:0C MelcoIndus # Melco Industries, Inc.
  9997. 00:06:0D Wave7Optic # Wave7 Optics
  9998. 00:06:0E Igys # IGYS Systems, Inc.
  9999. @@ -2311,7 +2311,7 @@
  10000. 00:08:F6 SumitomoEl # Sumitomo Electric System Solutions Co.,Ltd.
  10001. 00:08:F7 HitachiSem # Hitachi Ltd, Semiconductor &amp; Integrated Circuits Gr
  10002. 00:08:F8 Guardall # Guardall Ltd
  10003. -00:08:F9 Padcom # Padcom, Inc.
  10004. +00:08:F9 EmersonNet # Emerson Network Power
  10005. 00:08:FA KarlEBrink # Karl E.Brinkmann GmbH
  10006. 00:08:FB Sonosite # SonoSite, Inc.
  10007. 00:08:FC Gigaphoton # Gigaphoton Inc.
  10008. @@ -5524,7 +5524,7 @@
  10009. 00:15:85 AonvisionT # Aonvision Technolopy Corp.
  10010. 00:15:86 XiamenOver # Xiamen Overseas Chinese Electronic Co., Ltd.
  10011. 00:15:87 TakenakaSe # Takenaka Seisakusho Co.,Ltd
  10012. -00:15:88 Balda-Thon # Balda-Thong Fook Solutions Sdn. Bhd.
  10013. +00:15:88 BaldaSolut # Balda Solution Malaysia Sdn Bhd
  10014. 00:15:89 D-MaxTechn # D-MAX Technology Co.,Ltd
  10015. 00:15:8A SurecomTec # SURECOM Technology Corp.
  10016. 00:15:8B ParkAir # Park Air Systems Ltd
  10017. @@ -6195,7 +6195,7 @@
  10018. 00:18:24 KimaldiEle # Kimaldi Electronics, S.L.
  10019. 00:18:25 Wavion # Wavion LTD
  10020. 00:18:26 CaleAccess # Cale Access AB
  10021. -00:18:27 NecPhilips # NEC PHILIPS UNIFIED SOLUTIONS NEDERLAND BV
  10022. +00:18:27 NecUnified # NEC UNIFIED SOLUTIONS NEDERLAND B.V.
  10023. 00:18:28 E2vTechnol # e2v technologies (UK) ltd.
  10024. 00:18:29 Gatsometer
  10025. 00:18:2A TaiwanVide # Taiwan Video & Monitor
  10026. @@ -10113,7 +10113,7 @@
  10027. 00:30:56 BeckIpc # Beck IPC GmbH
  10028. 00:30:57 Qtelnet # QTelNet, Inc.
  10029. 00:30:58 ApiMotion # API MOTION
  10030. -00:30:59 Digital-Lo # DIGITAL-LOGIC AG
  10031. +00:30:59 KontronCom # KONTRON COMPACT COMPUTERS AG
  10032. 00:30:5A Telgen # TELGEN CORPORATION
  10033. 00:30:5B Toko # Toko Inc.
  10034. 00:30:5C SmarLabora # SMAR Laboratories Corp.
  10035. @@ -12213,7 +12213,7 @@
  10036. 00:50:C2:5C:F0:00/36 InnomedMed # Innomed Medical Inc
  10037. 00:50:C2:5D:00:00/36 AutomataSp # Automata Spa
  10038. 00:50:C2:5D:10:00/36 MeucciSolu # Meucci Solutions
  10039. -00:50:C2:5D:20:00/36 LaskeOy # Laske Oy
  10040. +00:50:C2:5D:20:00/36 Da-DesignO # DA-Design Oy
  10041. 00:50:C2:5D:30:00/36 Wexiodisk # Wexiodisk AB
  10042. 00:50:C2:5D:40:00/36 BuyangElec # Buyang Electronics Industrial Co., Ltd.
  10043. 00:50:C2:5D:50:00/36 CannonTech # Cannon Technologies
  10044. @@ -13923,6 +13923,40 @@
  10045. 00:50:C2:C8:80:00/36 CsiControl # CSI Controles e Sistemas Industriais Ltda.
  10046. 00:50:C2:C8:90:00/36 CreativeMi # Creative Micro Design
  10047. 00:50:C2:C8:A0:00/36 AutomatedM # Automated Media Services, Inc.
  10048. +00:50:C2:C8:B0:00/36 OcasAs # OCAS AS
  10049. +00:50:C2:C8:C0:00/36 LanmarkCon # Lanmark Controls Inc.
  10050. +00:50:C2:C8:D0:00/36 EmergencyM # Emergency Message Controls LLC
  10051. +00:50:C2:C8:E0:00/36 SddItg # SDD ITG
  10052. +00:50:C2:C8:F0:00/36 KeithKoep # Keith & Koep GmbH
  10053. +00:50:C2:C9:00:00/36 Reald
  10054. +00:50:C2:C9:10:00/36 MediaTechn # Media Technologies Ltd.
  10055. +00:50:C2:C9:20:00/36 Emac # EMAC, Inc.
  10056. +00:50:C2:C9:30:00/36 SensairPty # SENSAIR Pty Ltd
  10057. +00:50:C2:C9:40:00/36 IsisEngine # ISIS ENGINEERING, S.A.
  10058. +00:50:C2:C9:50:00/36 IpsesSRL # IPSES S.r.l.
  10059. +00:50:C2:C9:60:00/36 Cybercraft
  10060. +00:50:C2:C9:70:00/36 Mstronic # MSTRONIC CO., LTD.
  10061. +00:50:C2:C9:80:00/36 Criticare # Criticare Systems, Inc
  10062. +00:50:C2:C9:90:00/36 HjpcDbaPac # HJPC Corporation dba Pactron
  10063. +00:50:C2:C9:A0:00/36 PacompSpZO # PACOMP Sp. z o.o.
  10064. +00:50:C2:C9:B0:00/36 SmElectron # Sm electronic co.
  10065. +00:50:C2:C9:C0:00/36 Saia-Burge # Saia-Burgess Controls AG
  10066. +00:50:C2:C9:D0:00/36 RadiusSwed # Radius Sweden AB
  10067. +00:50:C2:C9:E0:00/36 TopexSa # TOPEX SA
  10068. +00:50:C2:C9:F0:00/36 Etherhome
  10069. +00:50:C2:CA:00:00/36 KieferTech # Kiefer technic GmbH
  10070. +00:50:C2:CA:10:00/36 WayneKerrE # Wayne Kerr Electronics
  10071. +00:50:C2:CA:20:00/36 Logical # The Logical Company
  10072. +00:50:C2:CA:30:00/36 Ct # CT Company
  10073. +00:50:C2:CA:40:00/36 VoxTechnol # Vox Technologies
  10074. +00:50:C2:CA:50:00/36 Yokowo # YOKOWO CO.,LTD
  10075. +00:50:C2:CA:60:00/36 Vidisys # Vidisys GmbH
  10076. +00:50:C2:CA:70:00/36 ThermoFish # Thermo Fisher Scientific
  10077. +00:50:C2:CA:80:00/36 WithIntell # Systems With Intelligence Inc.
  10078. +00:50:C2:CA:90:00/36 Intelligen # Intelligent Devices
  10079. +00:50:C2:CA:A0:00/36 DspDesign # DSP DESIGN LTD
  10080. +00:50:C2:CA:B0:00/36 SaeIt-Syst # SAE IT-systems GmbH & Co. KG
  10081. +00:50:C2:CA:C0:00/36 Purvis # PURVIS Systems Incorporated
  10082. 00:50:C4 Imd
  10083. 00:50:C5 AdsTechnol # ADS Technologies, Inc
  10084. 00:50:C6 LoopTeleco # LOOP TELECOMMUNICATION INTERNATIONAL, INC.
  10085. @@ -14082,7 +14116,7 @@
  10086. 00:60:63 PsionDacom # PSION DACOM PLC.
  10087. 00:60:64 Netcomm # NETCOMM LIMITED
  10088. 00:60:65 BerneckerR # BERNECKER & RAINER INDUSTRIE-ELEKTRONIC GmbH
  10089. -00:60:66 LacroixTec # LACROIX TECHNOLGIE
  10090. +00:60:66 LacroixTra # LACROIX Trafic
  10091. 00:60:67 AcerNetxus # ACER NETXUS INC.
  10092. 00:60:68 Dialogic # Dialogic Corporation
  10093. 00:60:69 BrocadeCom # Brocade Communications Systems, Inc.
  10094. @@ -15306,7 +15340,7 @@
  10095. 00:C0:F6 CelanTechn # CELAN TECHNOLOGY INC.
  10096. 00:C0:F7 EngageComm # ENGAGE COMMUNICATION, INC.
  10097. 00:C0:F8 AboutCompu # ABOUT COMPUTING INC.
  10098. -00:C0:F9 MotorolaEm # Motorola Embedded Computing Group
  10099. +00:C0:F9 EmersonNet # Emerson Network Power
  10100. 00:C0:FA CanaryComm # CANARY COMMUNICATIONS, INC.
  10101. 00:C0:FB AdvancedTe # ADVANCED TECHNOLOGY LABS
  10102. 00:C0:FC ElasticRea # ELASTIC REALITY, INC.
  10103. @@ -15872,6 +15906,7 @@
  10104. 04:22:34 WirelessSt # Wireless Standard Extensions
  10105. 04:2B:BB Picocela # PicoCELA, Inc.
  10106. 04:2F:56 AtocsShenz # ATOCS (Shenzhen) LTD
  10107. +04:36:04 GyeyoungI& # Gyeyoung I&T
  10108. 04:4F:AA RuckusWire # Ruckus Wireless
  10109. 04:76:6E Alps # ALPS Co,. Ltd.
  10110. 04:88:45 BayNetwork # Bay Networks token ring line card
  10111. @@ -15882,6 +15917,7 @@
  10112. 04:B4:66 Bsp # BSP Co., Ltd.
  10113. 04:C0:5B TigoEnergy # Tigo Energy
  10114. 04:C8:80 Samtec # Samtec Inc
  10115. +04:DD:4C Ipblaze
  10116. 04:E0:C4 Triumph-Ad # TRIUMPH-ADLER AG
  10117. 04:E5:48 CohdaWirel # Cohda Wireless Pty Ltd
  10118. 04:FE:7F Cisco # Cisco Systems
  10119. @@ -16052,10 +16088,12 @@
  10120. 0C:82:30 ShenzhenMa # SHENZHEN MAGNUS TECHNOLOGIES CO.,LTD
  10121. 0C:82:6A WuhanHuago # Wuhan Huagong Genuine Optics Technology Co., Ltd
  10122. 0C:84:11 AOSmithWat # A.O. Smith Water Products
  10123. +0C:8D:98 TopEightIn # TOP EIGHT IND CORP
  10124. 0C:A4:2A ObTelecomE # OB Telecom Electronic Technology Co., Ltd
  10125. 0C:C3:A7 Meritec
  10126. 0C:C9:C6 SamwinHong # Samwin Hong Kong Limited
  10127. 0C:D5:02 Westell
  10128. +0C:D6:96 Amimon # Amimon Ltd
  10129. 0C:D7:C2 AxiumTechn # Axium Technologies, Inc.
  10130. 0C:DD:EF Nokia # Nokia Corporation
  10131. 0C:E7:09 FoxCryptoB # Fox Crypto B.V.
  10132. @@ -16069,9 +16107,11 @@
  10133. 10:00:E0 AppleA/UxM # Apple A/UX (modified addresses for licensing)
  10134. 10:00:E8 NationalSe # NATIONAL SEMICONDUCTOR
  10135. 10:09:0C JanomeSewi # Janome Sewing Machine Co., Ltd.
  10136. +10:0D:32 Embedian # Embedian, Inc.
  10137. 10:10:B6 Mccain # McCain Inc
  10138. 10:18:9E ElmoMotion # Elmo Motion Control
  10139. 10:2D:96 Looxcie # Looxcie Inc.
  10140. +10:2E:AF TexasInstr # Texas Instruments
  10141. 10:43:69 SoundmaxEl # Soundmax Electronic Limited
  10142. 10:44:5A ShaanxiHit # Shaanxi Hitech Electronic Co., LTD
  10143. 10:45:F8 Lnt-Automa # LNT-Automation GmbH
  10144. @@ -16102,6 +16142,7 @@
  10145. 18:A9:05 HewlettPac # Hewlett Packard
  10146. 18:B2:09 TorreyPine # Torrey Pines Logic, Inc
  10147. 18:C0:86 Broadcom # Broadcom Corporation
  10148. +18:EF:63 Cisco # Cisco Systems
  10149. 18:FC:9F ChangheEle # Changhe Electronics Co., Ltd.
  10150. 1C:0F:CF SyproOptic # Sypro Optics GmbH
  10151. 1C:12:9D IeeePesPsr # IEEE PES PSRC/SUB
  10152. @@ -16122,9 +16163,16 @@
  10153. 20:4E:6B AxxanaIsra # Axxana(israel) ltd
  10154. 20:59:A0 ParagonTec # Paragon Technologies Inc.
  10155. 20:6A:8A WistronInf # Wistron InfoComm Manufacturing(Kunshan)Co.,Ltd.
  10156. +20:6A:FF AtlasElekt # Atlas Elektronik UK Limited
  10157. +20:6F:EC BraemacCaL # Braemac CA LLC
  10158. 20:7C:8F QuantaMicr # Quanta Microsystems,Inc.
  10159. +20:B0:F7 Enclustra # Enclustra GmbH
  10160. 20:BF:DB Dvl
  10161. +20:CF:30 AsustekCom # ASUSTek COMPUTER INC.
  10162. +20:D6:07 Nokia # Nokia Corporation
  10163. 20:D9:06 Iota # Iota, Inc.
  10164. +20:FD:F1 3comEurope # 3COM EUROPE LTD
  10165. +20:FE:DB M2mSolutio # M2M Solution S.A.S.
  10166. 24:0B:2A ViettelGro # Viettel Group
  10167. 24:1F:2C Calsys # Calsys, Inc.
  10168. 24:21:AB SonyEricss # Sony Ericsson Mobile Communications
  10169. @@ -16169,6 +16217,7 @@
  10170. 30:37:A6 Cisco # Cisco Systems
  10171. 30:41:74 AltecLansi # ALTEC LANSING LLC
  10172. 30:46:9A Netgear
  10173. +30:49:3B NanjingZ-C # Nanjing Z-Com Wireless Co.,Ltd
  10174. 30:52:5A Nst # NST Co., LTD
  10175. 30:69:4B Rim
  10176. 30:7C:30 Rim
  10177. @@ -16188,11 +16237,16 @@
  10178. 34:EF:44 2wire
  10179. 34:EF:8B NttCommuni # NTT Communications Corporation
  10180. 34:F3:9B Wizlan # WizLAN Ltd.
  10181. +34:F9:68 AtekProduc # ATEK Products, LLC
  10182. +38:0A:0A Sky-CityCo # Sky-City Communication and Electronics Limited Company
  10183. 38:22:9D PirelliBro # PIRELLI BROADBAND SOLUTIONS
  10184. +38:52:1A Alcatel-Lu # Alcatel-Lucent 7705
  10185. 38:58:0C Panaccess # Panaccess Systems GmbH
  10186. 38:5F:C3 YuJeongSys # Yu Jeong System, Co.Ltd
  10187. 38:63:F6 3nodMultim # 3NOD MULTIMEDIA(SHENZHEN)CO.,LTD
  10188. +38:95:92 BeijingTen # Beijing Tendyron Corporation
  10189. 38:9F:83 OtnNV # OTN Systems N.V.
  10190. +38:A9:5F Actifio # Actifio Inc
  10191. 38:BB:23 OzvisionAm # OzVision America LLC
  10192. 38:C7:BA CsServices # CS Services Co.,Ltd.
  10193. 38:E7:D8 Htc # HTC Corporation
  10194. @@ -16225,6 +16279,7 @@
  10195. 40:40:6B Icomera
  10196. 40:4A:03 ZyxelCommu # ZyXEL Communications Corporation
  10197. 40:52:0D PicoTechno # Pico Technology
  10198. +40:5F:BE Rim
  10199. 40:61:86 Micro-Star # MICRO-STAR INT'L CO.,LTD
  10200. 40:61:8E Hort-Plan
  10201. 40:83:DE Motorola
  10202. @@ -16233,12 +16288,15 @@
  10203. 40:95:58 Aisino # Aisino Corporation
  10204. 40:97:D1 BkElectron # BK Electronics cc
  10205. 40:A6:A4 Passivsyst # PassivSystems Ltd
  10206. +40:C7:C9 Naviit # Naviit Inc.
  10207. 40:D3:2D Apple # Apple, Inc
  10208. 40:D4:0E Biodata # Biodata Ltd
  10209. 40:EC:F8 Siemens # Siemens AG
  10210. 40:EF:4C FihonestCo # Fihonest communication co.,Ltd
  10211. 40:F5:2E LeicaMicro # Leica Microsystems (Schweiz) AG
  10212. 44:37:6F YoungElect # Young Electric Sign Co
  10213. +44:37:E6 HonHaiPrec # Hon Hai Precision Ind.Co.Ltd
  10214. +44:3D:21 Nuvolt
  10215. 44:45:53 Microsoft
  10216. 44:46:49 DfiDiamond # DFI (Diamond Flower Industries)
  10217. 44:4E:1A SamsungEle # Samsung Electronics Co.,Ltd
  10218. @@ -16246,7 +16304,9 @@
  10219. 44:56:8D PncTechnol # PNC Technologies Co., Ltd.
  10220. 44:56:B7 SpawnLabs # Spawn Labs, Inc
  10221. 44:58:29 CiscoSpvtg # Cisco SPVTG
  10222. +44:61:32 Ecobee # ecobee inc
  10223. 44:6C:24 ReallinEle # Reallin Electronic Co.,Ltd
  10224. +44:7C:7F InnolightT # Innolight Technology Corporation
  10225. 44:83:12 Star-Net
  10226. 44:87:FC Elitegroup # ELITEGROUP COMPUTER SYSTEM CO., LTD.
  10227. 44:8E:81 Vig
  10228. @@ -16257,6 +16317,7 @@
  10229. 44:C9:A2 GreenwaldI # Greenwald Industries
  10230. 44:D6:3D TalariNetw # Talari Networks
  10231. 44:E4:9A Omnitronic # OMNITRONICS PTY LTD
  10232. +44:ED:57 Longicorn # Longicorn, inc.
  10233. 44:F4:59 SamsungEle # Samsung Electronics
  10234. 47:54:43 GtcNotRegi # GTC (Not registered!) (This number is a multicast!)
  10235. 48:12:49 LuxcomTech # Luxcom Technologies Inc.
  10236. @@ -16299,6 +16360,7 @@
  10237. 50:93:4F GradualTec # Gradual Tecnologia Ltda.
  10238. 50:A6:E3 DavidClark # David Clark Company
  10239. 50:C5:8D JuniperNet # Juniper Networks
  10240. +50:CE:75 MeasyElect # Measy Electronics Ltd
  10241. 50:EB:1A BrocadeCom # Brocade Communications Systems, Inc
  10242. 50:F0:03 OpenStack # Open Stack, Inc.
  10243. 52:54:00 RealtekUpt # Realtek (UpTech? also reported)
  10244. @@ -16324,18 +16386,23 @@
  10245. 58:50:76 LinearEqui # Linear Equipamentos Eletronicos SA
  10246. 58:50:E6 BestBuy # Best Buy Corporation
  10247. 58:57:0D DanfossSol # Danfoss Solar Inverters
  10248. +58:67:1A Barnes&Nob # BARNES&NOBLE.COM
  10249. 58:6E:D6 Private
  10250. 58:94:6B IntelCorpo # Intel Corporate
  10251. 58:B0:35 Apple # Apple, Inc
  10252. 58:B9:E1 Crystalfon # Crystalfontz America, Inc.
  10253. +58:DB:8D Fast # Fast Co., Ltd.
  10254. 58:E7:47 Deltanet # Deltanet AG
  10255. 58:F6:7B XiaMenUnio # Xia Men UnionCore Technology LTD.
  10256. 58:FD:20 BravidaSak # Bravida Sakerhet AB
  10257. 5C:0E:8B Motorola
  10258. 5C:14:37 Thyssenkru # Thyssenkrupp Aufzugswerke GmbH
  10259. 5C:33:8E AlphaNetwo # Alpha Networkc Inc.
  10260. +5C:35:3B CompalBroa # Compal Broadband Networks Inc.
  10261. 5C:35:DA ThereOy # There Corporation Oy
  10262. 5C:57:C8 Nokia # Nokia Corporation
  10263. +5C:59:48 Apple
  10264. +5C:86:4A SecretLabs # Secret Labs LLC
  10265. 5C:87:78 Cybertelbr # Cybertelbridge co.,ltd
  10266. 5C:AC:4C HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd.
  10267. 5C:D1:35 XtremePowe # Xtreme Power Systems
  10268. @@ -16344,6 +16411,7 @@
  10269. 5C:FF:35 Wistron # Wistron Corporation
  10270. 60:12:83 Soluciones # Soluciones Tecnologicas para la Salud y el Bienestar SA
  10271. 60:1D:0F MidniteSol # Midnite Solar
  10272. +60:33:4B Apple
  10273. 60:38:0E AlpsElectr # Alps Electric Co.,
  10274. 60:39:1F Abb # ABB Ltd
  10275. 60:89:B7 KaelM�he # KAEL M�HENDISLIK ELEKTRONIK TICARET SANAYI Limited �irketi
  10276. @@ -16358,6 +16426,7 @@
  10277. 64:10:84 HexiumTech # HEXIUM Technical Development Co., Ltd.
  10278. 64:16:8D Cisco # Cisco Systems
  10279. 64:16:F0 ShehzhenHu # Shehzhen Huawei Communication Technologies Co., Ltd.
  10280. +64:1E:81 DowslakeMi # Dowslake Microsystems
  10281. 64:4B:C3 ShanghaiWo # Shanghai WOASiS Telecommunications Ltd., Co.
  10282. 64:4F:74 Lenus # LENUS Co., Ltd.
  10283. 64:65:C0 Nuvon # Nuvon, Inc
  10284. @@ -16369,6 +16438,7 @@
  10285. 64:87:D7 PirelliBro # PIRELLI BROADBAND SOLUTIONS
  10286. 64:99:5D Lge # LGE
  10287. 64:9C:8E TexasInstr # Texas Instruments
  10288. +64:A2:32 OooSamligh # OOO Samlight
  10289. 64:A8:37 JuniKorea # Juni Korea Co., Ltd
  10290. 64:B9:E8 Apple # Apple, Inc
  10291. 64:BC:11 Combiq # CombiQ AB
  10292. @@ -16378,6 +16448,7 @@
  10293. 64:DB:18 Openpatter # OpenPattern
  10294. 64:ED:57 MotorolaMd # Motorola MDb/Broadband
  10295. 64:F9:70 KenadeElec # Kenade Electronics Technology Co.,LTD.
  10296. +64:FC:8C Zonar # Zonar Systems
  10297. 68:1F:D8 AdvancedTe # Advanced Telemetry
  10298. 68:4B:88 Galtronics # Galtronics Telemetry Inc.
  10299. 68:78:4C NortelNetw # Nortel Networks
  10300. @@ -16392,10 +16463,12 @@
  10301. 68:E4:1F UnglaubeId # Unglaube Identech GmbH
  10302. 68:EB:AE SamsungEle # Samsung Electronics Co.,Ltd
  10303. 68:EF:BD Cisco # Cisco Systems
  10304. +6C:04:60 RbhAccessT # RBH Access Technologies Inc.
  10305. 6C:0E:0D SonyEricss # Sony Ericsson Mobile Communications AB
  10306. 6C:0F:6A JdcTech # JDC Tech Co., Ltd.
  10307. 6C:18:11 DecaturEle # Decatur Electronics
  10308. -6C:22:AB AinswothGa # Ainswoth Game Technology
  10309. +6C:22:AB AinsworthG # Ainsworth Game Technology
  10310. +6C:23:B9 SonyEricss # Sony Ericsson Mobile Communications AB
  10311. 6C:32:DE IndieonTec # Indieon Technologies Pvt. Ltd.
  10312. 6C:3E:9C KeKnestelE # KE Knestel Elektronik GmbH
  10313. 6C:5C:DE Sunreports # SunReports, Inc.
  10314. @@ -16406,6 +16479,7 @@
  10315. 6C:8C:DB OtusTechno # Otus Technologies Ltd
  10316. 6C:8D:65 WirelessGl # Wireless Glue Networks, Inc.
  10317. 6C:92:BF InspurElec # Inspur Electronic Information Industry Co.,Ltd.
  10318. +6C:9B:02 Nokia # Nokia Corporation
  10319. 6C:AC:60 Venetex # Venetex Corp
  10320. 6C:BE:E9 Alcatel-Lu # Alcatel-Lucent-IPD
  10321. 6C:D6:8A LgElectron # LG Electronics Inc
  10322. @@ -16413,6 +16487,7 @@
  10323. 6C:F0:49 Giga-ByteT # GIGA-BYTE TECHNOLOGY CO.,LTD.
  10324. 6C:FD:B9 ProwareTec # Proware Technologies Co Ltd.
  10325. 6C:FF:BE MpbCommuni # MPB Communications Inc.
  10326. +70:02:58 01db-Metra # 01DB-METRAVIB
  10327. 70:1A:04 LiteonTech # Liteon Tech Corp.
  10328. 70:1A:ED Advas # ADVAS CO., LTD.
  10329. 70:2B:1D E-DomusInt # E-Domus International Limited
  10330. @@ -16420,21 +16495,27 @@
  10331. 70:3C:39 SeawingKft # SEAWING Kft
  10332. 70:58:12 PanasonicA # Panasonic AVC Networks Company
  10333. 70:5A:B6 CompalInfo # COMPAL INFORMATION (KUNSHAN) CO., LTD.
  10334. +70:5E:AA ActionTarg # Action Target, Inc.
  10335. +70:64:17 OrbisTecno # ORBIS TECNOLOGIA ELECTRICA S.A.
  10336. 70:71:BC Pegatron # PEGATRON CORPORATION
  10337. 70:72:CF EdgecoreNe # EdgeCore Networks
  10338. 70:82:8E Oleumtech # OleumTech Corporation
  10339. +70:B0:8C ShenouComm # Shenou Communication Equipment Co.,Ltd
  10340. 70:D5:7E Scalar # Scalar Corporation
  10341. 70:D5:E7 Wellcore # Wellcore Corporation
  10342. 70:D8:80 UposSystem # Upos System sp. z o.o.
  10343. 70:F1:A1 LiteonTech # Liteon Technology Corporation
  10344. 70:F3:95 Usi
  10345. +74:15:E2 Tri-Sen # Tri-Sen Systems Corporation
  10346. 74:32:56 Nt-WareSys # NT-ware Systemprg GmbH
  10347. 74:6B:82 Movek # MOVEK
  10348. 74:7E:1A RedEmbedde # Red Embedded Design Limited
  10349. 74:8E:F8 BrocadeCom # Brocade Communications Systems, Inc.
  10350. +74:90:50 RenesasEle # Renesas Electronics Corporation
  10351. 74:B9:EB FujianGold # Fujian Goldcat Electronic Technology Co.,Ltd.
  10352. 74:D8:50 Evrisko # Evrisko Systems
  10353. 74:E5:37 Radspin
  10354. +74:EA:3A Tp-LinkTec # TP-LINK Technologies Co.,Ltd.
  10355. 74:F0:6D AzurewaveT # AzureWave Technologies, Inc.
  10356. 74:F0:7D Bncom # BnCOM Co.,Ltd
  10357. 74:F7:26 NeuronRobo # Neuron Robotics
  10358. @@ -16445,6 +16526,7 @@
  10359. 78:25:AD SamsungEle # SAMSUNG ELECTRONICS CO., LTD.
  10360. 78:30:E1 Ultraclenz # UltraClenz, LLC
  10361. 78:44:76 ZioncomTec # Zioncom technology co.,ltd
  10362. +78:57:12 MobileInte # Mobile Integration Workgroup
  10363. 78:5C:72 HiosoTechn # Hioso Technology Co., Ltd.
  10364. 78:66:AE ZtecInstru # ZTEC Instruments, Inc.
  10365. 78:7F:62 GikMbh # GiK mbH
  10366. @@ -16478,9 +16560,12 @@
  10367. 7C:76:73 Enmas # ENMAS GmbH
  10368. 7C:7B:E4 Z&#39;Seda # Z&#39;SEDAI KENKYUSHO CORPORATION
  10369. 7C:A2:9B DSignt&Amp # D.SignT GmbH &amp; Co. KG
  10370. +7C:BB:6F CoscoElect # Cosco Electronics Co., Ltd.
  10371. 7C:CB:0D AaxeonTech # Aaxeon Technologies Inc.
  10372. 7C:CF:CF ShanghaiSe # Shanghai SEARI Intelligent System Co., Ltd
  10373. 7C:E0:44 Neon # NEON Inc
  10374. +7C:ED:8D Microsoft
  10375. +7C:EF:18 CreativePr # Creative Product Design Pty. Ltd.
  10376. 7C:F0:98 BeeBeansTe # Bee Beans Technologies, Inc.
  10377. 80:00:10 AttBellLab # ATT BELL LABORATORIES
  10378. 80:17:7D NortelNetw # Nortel Networks
  10379. @@ -16505,10 +16590,12 @@
  10380. 84:2B:2B Dell # Dell Inc.
  10381. 84:48:23 WoxterTech # WOXTER TECHNOLOGY Co. Ltd
  10382. 84:90:00 Arnold&Amp # Arnold &amp; Richter Cine Technik
  10383. +84:97:B8 Memjet # Memjet Inc.
  10384. 84:A9:91 CyberTrans # Cyber Trans Japan Co.,Ltd.
  10385. 84:C7:27 Gnodal # Gnodal Ltd
  10386. 84:C7:A9 C3poSA # C3PO S.A.
  10387. 84:F6:4C CrossPoint # Cross Point BV
  10388. +88:18:AE Tamron # Tamron Co., Ltd
  10389. 88:25:2C ArcadyanTe # Arcadyan Technology Corporation
  10390. 88:41:C1 OrbisatDaA # ORBISAT DA AMAZONIA IND E AEROL SA
  10391. 88:43:E1 Cisco # Cisco Systems
  10392. @@ -16521,6 +16608,7 @@
  10393. 88:97:DF EntrypassS # Entrypass Corporation Sdn. Bhd.
  10394. 88:98:21 Teraon
  10395. 88:A5:BD Qpcom # QPCOM INC.
  10396. +88:AC:C1 Generiton # Generiton Co., Ltd.
  10397. 88:AE:1D CompalInfo # COMPAL INFORMATION(KUNSHAN)CO.,LTD
  10398. 88:B6:27 GembirdEur # Gembird Europe BV
  10399. 88:BA:7F Qfiednet # Qfiednet Co., Ltd.
  10400. @@ -16534,6 +16622,7 @@
  10401. 8C:73:6E Fujitsu # Fujitsu Limited
  10402. 8C:7C:B5 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd.
  10403. 8C:84:01 Private
  10404. +8C:90:D3 AlcatelLuc # Alcatel Lucent
  10405. 8C:92:36 AusLinxTec # Aus.Linx Technology Co., Ltd.
  10406. 8C:A9:82 IntelCorpo # Intel Corporate
  10407. 8C:D6:28 IkorMeteri # Ikor Metering
  10408. @@ -16560,8 +16649,9 @@
  10409. 94:44:52 BelkinInte # Belkin International, Inc.
  10410. 94:59:2D EkeBuildin # EKE Building Technology Systems Ltd
  10411. 94:5B:7E TrilobitLt # TRILOBIT LTDA.
  10412. -94:85:7A EvantageIn # Evantage Industries Inc.
  10413. +94:85:7A EvantageIn # Evantage Industries Corp
  10414. 94:9C:55 AltaDataTe # Alta Data Technologies
  10415. +94:A7:BC Bodymedia # BodyMedia, Inc.
  10416. 94:BA:31 VisiontecD # Visiontec da Amazônia Ltda.
  10417. 94:C4:E9 Powerlayer # PowerLayer Microsystems HongKong Limited
  10418. 94:F6:92 Geminico # Geminico co.,Ltd.
  10419. @@ -16575,6 +16665,7 @@
  10420. 98:BC:99 Edeltech # Edeltech Co.,Ltd.
  10421. 98:D8:8C NortelNetw # Nortel Networks
  10422. 98:DC:D9 Unitec # UNITEC Co., Ltd.
  10423. +98:E1:65 Accutome
  10424. 98:FC:11 Cisco-Link # Cisco-Linksys, LLC
  10425. 9C:18:74 NokiaDanma # Nokia Danmark A/S
  10426. 9C:28:BF Continenta # Continental Automotive Czech Republic s.r.o.
  10427. @@ -16605,27 +16696,34 @@
  10428. A0:69:86 WellavTech # Wellav Technologies Ltd
  10429. A0:6A:00 Verilink # Verilink Corporation
  10430. A0:73:32 Cashmaster # Cashmaster International Limited
  10431. +A0:82:C7 PTI # P.T.I Co.,LTD
  10432. A0:88:B4 IntelCorpo # Intel Corporate
  10433. A0:98:05 OpenvoxCom # OpenVox Communication Co Ltd
  10434. A0:98:ED ShandongIn # Shandong Intelligent Optical Communication Development Co., Ltd.
  10435. A0:9A:5A TimeDomain # Time Domain
  10436. +A0:A7:63 PolytronVe # Polytron Vertrieb GmbH
  10437. A0:B9:ED Skytap
  10438. A0:BF:A5 Coresys
  10439. +A0:DD:E5 Sharp # SHARP CORPORATION
  10440. A4:0C:C3 Cisco # Cisco Systems
  10441. +A4:21:8A NortelNetw # Nortel Networks
  10442. A4:38:FC PlasticLog # Plastic Logic
  10443. A4:56:1B Mcot # MCOT Corporation
  10444. +A4:5C:27 Nintendo # Nintendo Co., Ltd.
  10445. A4:79:E4 Klinfo # KLINFO Corp
  10446. A4:AD:00 RagsdaleTe # Ragsdale Technology
  10447. A4:AD:B8 VitecGroup # Vitec Group, Camera Dynamics Ltd
  10448. A4:AE:9A MaestroWir # Maestro Wireless Solutions ltd.
  10449. A4:B1:21 Arantia201 # Arantia 2010 S.L.
  10450. A4:B1:EE HZander # H. ZANDER GmbH & Co. KG
  10451. +A4:B2:A7 AdaxysSolu # Adaxys Solutions AG
  10452. A4:BA:DB Dell # Dell Inc.
  10453. A4:C2:AB HangzhouLe # Hangzhou LEAD-IT Information & Technology Co.,Ltd
  10454. A4:DA:3F Bionics # Bionics Corp.
  10455. A4:DE:50 TotalWalth # Total Walther GmbH
  10456. A4:E7:E4 Connex # Connex GmbH
  10457. A4:ED:4E MotorolaMo # Motorola Mobile Devices
  10458. +A8:55:6A PocketnetT # Pocketnet Technology Inc.
  10459. A8:5B:B0 ShenzhenDe # Shenzhen Dehoo Technology Co.,Ltd
  10460. A8:63:DF Displ�ai # DISPL�AIRE CORPORATION
  10461. A8:70:A5 Unicomm # UniComm Inc.
  10462. @@ -16665,6 +16763,7 @@
  10463. AC:E9:AA Hay # Hay Systems Ltd
  10464. AC:EA:6A GenixInfoc # GENIX INFOCOMM CO., LTD.
  10465. B0:5B:1F ThermoFish # THERMO FISHER SCIENTIFIC S.P.A.
  10466. +B0:81:D8 I-Sys # I-sys Corp
  10467. B0:90:74 FulanElect # Fulan Electronics Limited
  10468. B0:91:34 Taleo
  10469. B0:97:3A E-Fuel # E-Fuel Corporation
  10470. @@ -16680,9 +16779,11 @@
  10471. B4:39:D6 ProcurveNe # ProCurve Networking by HP
  10472. B4:3D:B2 DegreaneHo # Degreane Horizon
  10473. B4:41:7A ShenzhenGo # ShenZhen Gongjin Electronics Co.,Ltd
  10474. +B4:52:53 SeagateTec # Seagate Technology
  10475. B4:58:61 CremoteLlc # CRemote, LLC
  10476. B4:82:FE AskeyCompu # Askey Computer Corp
  10477. B4:B5:AF MinsungEle # Minsung Electronics
  10478. +B4:C8:10 UmpiElettr # UMPI Elettronica
  10479. B4:ED:19 PieDigital # Pie Digital, Inc.
  10480. B4:ED:54 WohlerTech # Wohler Technologies
  10481. B8:61:6F AcctonWire # Accton Wireless Broadband(AWB), Corp.
  10482. @@ -16692,6 +16793,7 @@
  10483. B8:A3:E0 BenruiTech # BenRui Technology Co.,Ltd
  10484. B8:AC:6F Dell # Dell Inc
  10485. B8:B1:C7 Bt&Com # BT&COM CO.,LTD
  10486. +B8:BA:72 Cynove
  10487. B8:F7:32 AryakaNetw # Aryaka Networks Inc
  10488. BC:05:43 Avm # AVM GmbH
  10489. BC:4E:3C CoreStaff # CORE STAFF CO., LTD.
  10490. @@ -16708,6 +16810,7 @@
  10491. C0:1E:9B PixaviAs # Pixavi AS
  10492. C0:22:50 Private
  10493. C0:38:F9 NokiaDanma # Nokia Danmark A/S
  10494. +C0:3B:8F MinicomDig # Minicom Digital Signage
  10495. C0:3F:0E Netgear
  10496. C0:6C:0F DobbsStanf # Dobbs Stanford
  10497. C0:8B:6F SISistemas # S I Sistemas Inteligentes Eletronicos Ltda
  10498. @@ -16724,6 +16827,7 @@
  10499. C4:2C:03 Apple
  10500. C4:46:19 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd.
  10501. C4:59:76 Fugoo
  10502. +C4:63:54 U-Raku # U-Raku, Inc.
  10503. C4:7D:4F Cisco # Cisco Systems
  10504. C4:82:3F FujianNewl # Fujian Newland Auto-ID Tech. Co,.Ltd.
  10505. C4:AA:A1 SummitDeve # SUMMIT DEVELOPMENT, spol.s r.o.
  10506. @@ -16742,6 +16846,7 @@
  10507. C8:7E:75 SamsungEle # Samsung Electronics Co.,Ltd
  10508. C8:87:3B NetOptics # Net Optics
  10509. C8:97:9F Nokia # Nokia Corporation
  10510. +C8:A1:B6 ShenzhenLo # Shenzhen Longway Technologies Co., Ltd
  10511. C8:AA:CC Private
  10512. C8:C1:3C RuggedtekH # RuggedTek Hangzhou Co., Ltd
  10513. C8:D1:D1 AgaitTechn # AGAiT Technology Corporation
  10514. @@ -16758,9 +16863,13 @@
  10515. CC:CC:4E SunFountai # Sun Fountainhead USA. Corp
  10516. CC:EA:1C Dconworks # DCONWORKS Co., Ltd
  10517. CC:FC:B1 WirelessTe # Wireless Technology, Inc.
  10518. +D0:27:88 HonHaiPrec # Hon Hai Precision Ind.Co.Ltd
  10519. D0:37:61 TexasInstr # Texas Instruments
  10520. +D0:57:4C Cisco # Cisco Systems
  10521. D0:58:75 ActiveCont # Active Control Technology Inc.
  10522. +D0:7D:E5 ForwardPay # Forward Pay Systems, Inc.
  10523. D0:B3:3F ShenzhenTi # SHENZHEN TINNO MOBILE TECHNOLOGY CO.,LTD.
  10524. +D0:D0:FD Cisco # Cisco Systems
  10525. D0:D2:86 BeckmanCou # Beckman Coulter Biomedical K.K.
  10526. D0:E3:47 Yoga
  10527. D0:E4:0B Wearable # Wearable Inc.
  10528. @@ -16770,16 +16879,22 @@
  10529. D4:1F:0C TviVisionO # TVI Vision Oy
  10530. D4:4C:A7 Informtekh # Informtekhnika & Communication, LLC
  10531. D4:52:97 NstreamsTe # nSTREAMS Technologies, Inc.
  10532. +D4:66:A8 RiedoNetwo # Riedo Networks GmbH
  10533. D4:6C:BF GoodrichIs # Goodrich ISR
  10534. D4:79:C3 Cameronet& # Cameronet GmbH &amp; Co. KG
  10535. D4:82:3E ArgosyTech # Argosy Technologies, Ltd.
  10536. +D4:88:90 SamsungEle # Samsung Electronics Co.,Ltd
  10537. +D4:8F:AA SogecamInd # Sogecam Industrial, S.A.
  10538. +D4:96:DF SungjinC&T # SUNGJIN C&T CO.,LTD
  10539. D4:9A:20 Apple # Apple, Inc
  10540. D4:9C:28 JaybirdGea # JayBird Gear LLC
  10541. D4:AA:FF MicroWorld # MICRO WORLD
  10542. D4:C7:66 Acentic # Acentic GmbH
  10543. +D4:E8:B2 SamsungEle # Samsung Electronics
  10544. D4:F1:43 Iproad # IPROAD.,Inc
  10545. D8:1B:FE Twinlinx # TWINLINX CORPORATION
  10546. D8:28:C9 GeneralEle # General Electric Consumer and Industrial
  10547. +D8:29:86 BestWishTe # Best Wish Technology LTD
  10548. D8:30:62 Apple # Apple, Inc
  10549. D8:42:AC FreecommDa # FreeComm Data Communication Co.,Ltd.
  10550. D8:46:06 SiliconVal # Silicon Valley Global Marketing
  10551. @@ -16802,6 +16917,7 @@
  10552. DC:49:C9 CascoSigna # CASCO SIGNAL LTD
  10553. DC:4E:DE ShinyeiTec # SHINYEI TECHNOLOGY CO., LTD.
  10554. DC:A9:71 IntelCorpo # Intel Corporate
  10555. +DC:D0:F7 Bentek # Bentek Systems Ltd.
  10556. DC:E2:AC LumensDigi # Lumens Digital Optics Inc.
  10557. DC:E7:1C AugElektro # AUG Elektronik GmbH
  10558. DC:FA:D5 StrongGesM # STRONG Ges.m.b.H.
  10559. @@ -16810,6 +16926,7 @@
  10560. E0:26:36 NortelNetw # Nortel Networks
  10561. E0:27:1A TtcNext-Ge # TTC Next-generation Home Network System WG
  10562. E0:58:9E LaerdalMed # Laerdal Medical
  10563. +E0:5B:70 Innovid # Innovid, Co., Ltd.
  10564. E0:64:BB DigiviewSR # DigiView S.r.l.
  10565. E0:87:B1 Nata-Info # Nata-Info Ltd.
  10566. E0:8F:EC Repotec # REPOTEC CO., LTD.
  10567. @@ -16826,36 +16943,45 @@
  10568. E4:35:93 HangzhouGo # Hangzhou GoTo technology Co.Ltd
  10569. E4:75:1E GetingeSte # Getinge Sterilization AB
  10570. E4:7C:F9 SamsungEle # Samsung Electronics Co., LTD
  10571. +E4:83:99 MotorolaCh # Motorola CHS
  10572. E4:97:F0 ShanghaiVl # Shanghai VLC Technologies Ltd. Co.
  10573. E4:AB:46 UabSelteka # UAB Selteka
  10574. E4:AD:7D SclElement # SCL Elements
  10575. E4:FF:DD ElectronIn # ELECTRON INDIA
  10576. +E8:04:62 Cisco # Cisco Systems
  10577. E8:05:6D NortelNetw # Nortel Networks
  10578. E8:06:88 Apple # Apple Inc.
  10579. E8:0B:13 AkibTaiwan # Akib Systems Taiwan, INC
  10580. +E8:39:DF AskeyCompu # Askey Computer
  10581. E8:3A:97 OczTechnol # OCZ Technology Group
  10582. E8:4E:CE Nintendo # Nintendo Co., Ltd.
  10583. E8:5B:5B LgElectron # LG ELECTRONICS INC
  10584. E8:5E:53 InfratecDa # Infratec Datentechnik GmbH
  10585. E8:6C:DA Supercompu # Supercomputers and Neurocomputers Research Center
  10586. +E8:7A:F3 S5TechSRL # S5 Tech S.r.l.
  10587. E8:9D:87 Toshiba
  10588. E8:A4:C1 DeepSeaEle # Deep Sea Electronics PLC
  10589. +E8:BE:81 Sagemcom
  10590. E8:DA:AA VideohomeT # VideoHome Technology Corp.
  10591. E8:DF:F2 Prf # PRF Co., Ltd.
  10592. E8:E1:E2 Energotest
  10593. E8:E5:D6 SamsungEle # Samsung Electronics Co.,Ltd
  10594. E8:E7:76 ShenzhenKo # Shenzhen Kootion Technology Co., Ltd
  10595. EC:10:00 EnanceSour # Enance Source Co., Ltd. PC clones(?)
  10596. +EC:23:68 Intellivoi # IntelliVoice Co.,Ltd.
  10597. EC:30:91 Cisco # Cisco Systems
  10598. EC:43:E6 Awcer # AWCER Ltd.
  10599. EC:44:76 Cisco # Cisco Systems
  10600. +EC:54:2E ShanghaiXi # Shanghai XiMei Electronic Technology Co. Ltd
  10601. EC:5C:69 Mitsubishi # MITSUBISHI HEAVY INDUSTRIES MECHATRONICS SYSTEMS,LTD.
  10602. EC:66:D1 B&Amp;WGro # B&amp;W Group LTD
  10603. EC:6C:9F ChengduVol # Chengdu Volans Technology CO.,LTD
  10604. EC:7C:74 JustoneTec # Justone Technologies Co., Ltd.
  10605. EC:8E:AD Dlx
  10606. +EC:98:C1 BeijingRis # Beijing Risbo Network Technology Co.,Ltd
  10607. EC:9B:5B Nokia # Nokia Corporation
  10608. EC:B1:06 AcuroNetwo # Acuro Networks, Inc
  10609. +EC:C3:8A Accuenergy # Accuenergy (CANADA) Inc
  10610. EC:C8:82 Cisco # Cisco Systems
  10611. EC:CD:6D AlliedTele # Allied Telesis, Inc.
  10612. EC:D0:0E Miraerecog # MiraeRecognition Co., Ltd.
  10613. @@ -16868,10 +16994,12 @@
  10614. F0:2F:D8 Bi2-Vision
  10615. F0:43:35 DvnShangha # DVN(Shanghai)Ltd.
  10616. F0:4B:F2 JtechCommu # JTECH Communications, Inc.
  10617. +F0:4D:A2 Dell # Dell Inc.
  10618. F0:62:81 ProcurveNe # ProCurve Networking by HP
  10619. F0:68:53 Integrated # Integrated Corporation
  10620. F0:77:D0 Xcellen
  10621. F0:7B:CB HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd.
  10622. +F0:7D:68 D-Link # D-Link Corporation
  10623. F0:9C:BB Raonthink # RaonThink Inc.
  10624. F0:AD:4E Globalscal # Globalscale Technologies, Inc.
  10625. F0:B6:EB PoslabTech # Poslab Technology Co., Ltd.
  10626. @@ -16881,14 +17009,17 @@
  10627. F0:D7:67 AxemaPassa # Axema Passagekontroll AB
  10628. F0:DE:71 ShanghaiEd # Shanghai EDO Technologies Co.,Ltd.
  10629. F0:DE:F1 WistronInf # Wistron InfoComm (Kunshan)Co
  10630. +F0:E5:C3 Draegerwer # Draegerwerk AG &amp;amp; Co. KG aA
  10631. F0:EC:39 Essec
  10632. F0:ED:1E BilkonBilg # Bilkon Bilgisayar Kontrollu Cih. Im.Ltd.
  10633. F0:F8:42 Keebox # KEEBOX, Inc.
  10634. F0:F9:F7 Ies&Amp; # IES GmbH &amp; Co. KG
  10635. F4:0B:93 ResearchIn # Research In Motion
  10636. +F4:1F:0B Yamabishi # YAMABISHI Corporation
  10637. F4:45:ED PortableIn # Portable Innovation Technology Ltd.
  10638. F4:50:EB Telechips # Telechips Inc
  10639. F4:55:95 Hengbao # HENGBAO Corporation LTD.
  10640. +F4:55:E0 NicewayCnc # Niceway CNC Technology Co.,Ltd.Hunan Province
  10641. F4:5F:F7 DqTechnolo # DQ Technology Inc.
  10642. F4:63:49 Diffon # Diffon Corporation
  10643. F4:76:26 Viltechmed # Viltechmeda UAB
  10644. @@ -16896,6 +17027,7 @@
  10645. F4:C7:95 WeyElektro # WEY Elektronik AG
  10646. F4:CE:46 HewlettPac # Hewlett Packard
  10647. F4:DC:4D BeijingCcd # Beijing CCD Digital Technology Co., Ltd
  10648. +F4:DC:DA ZhuhaiJiah # Zhuhai Jiahe Communication Technology Co., limited
  10649. F4:FC:32 TexasInstr # Texas Instruments
  10650. F8:0F:41 WistronInf # Wistron InfoComm(ZhongShan) Corporation
  10651. F8:1E:DF Apple # Apple, Inc
  10652. @@ -16903,6 +17035,7 @@
  10653. F8:52:DF VnlEurope # VNL Europe AB
  10654. F8:6E:CF Arcx # Arcx Inc
  10655. F8:71:FE GoldmanSac # The Goldman Sachs Group, Inc.
  10656. +F8:7B:7A MotorolaMo # Motorola Mobile Devices
  10657. F8:81:1A Overkiz
  10658. F8:8D:EF Tenebraex
  10659. F8:91:2A GlpGermanL # GLP German Light Products GmbH
  10660. @@ -16911,6 +17044,7 @@
  10661. F8:AC:6D Deltenna # Deltenna Ltd
  10662. F8:C0:91 HighgatesT # Highgates Technology
  10663. F8:D7:56 SimmTronic # Simm Tronic Limited
  10664. +F8:DA:E2 BetaLaserm # Beta LaserMike
  10665. F8:DC:7A Variscite # Variscite LTD
  10666. F8:E9:68 EgkerKft # Egker Kft.
  10667. F8:FB:2F Santur # Santur Corporation
  10668. @@ -16918,18 +17052,21 @@
  10669. FC:44:63 UniversalA # Universal Audio
  10670. FC:61:98 NecPersona # NEC Personal Products, Ltd
  10671. FC:68:3E DirectedPe # Directed Perception, Inc
  10672. +FC:75:E6 Handreamne # Handreamnet
  10673. FC:7C:E7 FciUsaLlc # FCI USA LLC
  10674. FC:CC:E4 Ascon # Ascon Ltd.
  10675. FC:CF:62 BladeNetwo # BLADE Network Technology
  10676. +FC:D4:F6 MessanaAir # Messana Air.Ray Conditioning s.r.l.
  10677. FC:E1:92 SichuanJin # Sichuan Jinwangtong Electronic Science&Technology Co,.Ltd
  10678. FC:E2:3F ClayPakySp # CLAY PAKY SPA
  10679. +FC:ED:B9 Arrayent
  10680. FC:FA:F7 ShanghaiBa # Shanghai Baud Data Communication Co.,Ltd.
  10681. FC:FB:FB Cisco # Cisco Systems
  10682.  
  10683. #
  10684. # Well-known addresses.
  10685. #
  10686. -# $Id: manuf 32632 2010-05-02 15:04:42Z gerald $
  10687. +# $Id: manuf 33111 2010-06-06 15:04:49Z gerald $
  10688. #
  10689. # Wireshark - Network traffic analyzer
  10690. # By Gerald Combs <gerald [AT] wireshark.org>
  10691. diff -urN wireshark-1.2.8/NEWS wireshark-1.2.9/NEWS
  10692. --- wireshark-1.2.8/NEWS 2010-05-05 10:13:11.000000000 -0700
  10693. +++ wireshark-1.2.9/NEWS 2010-06-08 16:27:42.000000000 -0700
  10694. @@ -1,4 +1,4 @@
  10695. -Wireshark 1.2.8 Release Notes
  10696. +Wireshark 1.2.9 Release Notes
  10697.  
  10698. ------------------------------------------------------------------
  10699.  
  10700. @@ -15,40 +15,74 @@
  10701. The following vulnerabilities have been fixed. See the security
  10702. advisory for details and a workaround.
  10703.  
  10704. - o The DOCSIS dissector could crash. (Bug 4644), (bug 4646) -->
  10705. + o The SMB dissector could dereference a NULL pointer. (Bug 4734)
  10706.  
  10707. - Versions affected: 0.9.6 to 1.0.12, 1.2.0 to 1.2.7
  10708. + Versions affected: 0.99.6 to 1.0.13, 1.2.0 to 1.2.8
  10709. +
  10710. + o J. Oquendo discovered that the ASN.1 BER dissector could
  10711. + overrun the stack.
  10712. +
  10713. + Versions affected: 0.10.13 to 1.0.13, 1.2.0 to 1.2.8
  10714. +
  10715. + o The SMB PIPE dissector could dereference a NULL pointer on
  10716. + some platforms.
  10717. +
  10718. + Versions affected: 0.8.20 to 1.0.13, 1.2.0 to 1.2.8
  10719. +
  10720. + o The SigComp Universal Decompressor Virtual Machine could go
  10721. + into an infinite loop. (Bug 4826)
  10722. +
  10723. + Versions affected: 0.10.7 to 1.0.13, 1.2.0 to 1.2.8
  10724. +
  10725. + o The SigComp Universal Decompressor Virtual Machine could
  10726. + overrun a buffer. (Bug 4837)
  10727. +
  10728. + Versions affected: 0.10.8 to 1.0.13, 1.2.0 to 1.2.8
  10729.  
  10730. The following bugs have been fixed:
  10731.  
  10732. - o HTTP parser limits with Content-Length. (Bug 1958)
  10733. + o Cannot open file with File -> Open. (Bug 1791)
  10734. +
  10735. + o Application crash when changing real-time option. (Bug 4035)
  10736. +
  10737. + o Crash in filter autocompletion. (Bug 4306)
  10738. +
  10739. + o The XML dissector doesn't allow dots (".") in tags. (Bug 4405)
  10740. +
  10741. + o Live capture stops when using zlib 1.2.5. (Bug 4708)
  10742. +
  10743. + o Want to be able to apply decode as to Data Portion of Lan
  10744. + Trace. (Bug 4721)
  10745. +
  10746. + o SABP short pdu (packet_per.c). (Bug 4743)
  10747. +
  10748. + o Kerberos pre-auth type constants - MS extensions are wrong.
  10749. + (Bug 4752)
  10750.  
  10751. - o MATE dissector bug with GOGs. (Bug 3010)
  10752. + o Check HTTP Content-Length parsing for overflow. (Bug 4758)
  10753.  
  10754. - o Changing fonts and deleting system time from preferences,
  10755. - results in wireshark crash. (Bug 3387)
  10756. + o Wrong variable used for proto_tree_add_text() in ptp
  10757. + dissector. (Bug 4773)
  10758.  
  10759. - o ERF file starting with record with timestamp=0,1 or 2 not
  10760. - recognized as ERF file. (Bug 4503)
  10761. + o Crash when close window frame of gtk file chooser. (Bug 4778)
  10762.  
  10763. - o The SSL dissector can not correctly resemple SSL records when
  10764. - the record header is spit between packets. (Bug 4535)
  10765. + o text2pcap expects \n delimited text (instead of \r\n) on
  10766. + win32. (Bug 4780)
  10767.  
  10768. - o TCP reassembly can call subdissector with incorrect TCP
  10769. - sequence number. (Bug 4624)
  10770. + o Wrong decoding for BGP ORF. (Bug 4782)
  10771.  
  10772. - o PTP dissector displays big correction field values wrong. (Bug
  10773. - 4635)
  10774. + o Crash when Ctrl-Backspacing the display filter. (Bug 4797)
  10775.  
  10776. - o MSF is at Anthorn, not Rugby. (Bug 4678)
  10777. + o Acker AFI field incorrect size in PGM dissector. (Bug 4798)
  10778.  
  10779. - o ProtoField __tostring() description is missing in Wireshark's
  10780. - Lua API Reference Manual. (Bug 4695)
  10781. + o Fedora 13: wireshark fails to build (linking problem). (Bug
  10782. + 4815)
  10783.  
  10784. - o EVRC packet bundling not handled correctly. (Bug 4718)
  10785. + o The NFS FH hash (nfs.fh.hash) incorrectly matches multiple
  10786. + filehandles. (Bug 4839)
  10787.  
  10788. - o Completely unresponsive when run very first time by root user.
  10789. - (Bug 4308)
  10790. + o AES-CTR decoding not working, (dissectors/packet_ipsec.c using
  10791. + gcrypt). (Bug 4838)
  10792.  
  10793. New and Updated Features
  10794.  
  10795. @@ -60,7 +94,8 @@
  10796.  
  10797. Updated Protocol Support
  10798.  
  10799. - DOCSIS, HTTP, SSL
  10800. + ASN.1 BER, BGP, HTTP, IGMP, IPsec, Kerberos, NFS, PGM, PTP, SABP,
  10801. + SigComp, SMB, TCAP, XML,
  10802.  
  10803. Updated Capture File Support
  10804.  
  10805. diff -urN wireshark-1.2.8/packaging/macosx/Info.plist wireshark-1.2.9/packaging/macosx/Info.plist
  10806. --- wireshark-1.2.8/packaging/macosx/Info.plist 2010-05-05 10:15:51.000000000 -0700
  10807. +++ wireshark-1.2.9/packaging/macosx/Info.plist 2010-06-08 16:32:06.000000000 -0700
  10808. @@ -8,7 +8,7 @@
  10809. <key>CFBundleExecutable</key>
  10810. <string>Wireshark</string>
  10811. <key>CFBundleGetInfoString</key>
  10812. - <string>1.2.8, Copyright 1998-2010 Wireshark Development Team</string>
  10813. + <string>1.2.9, Copyright 1998-2010 Wireshark Development Team</string>
  10814. <key>CFBundleIconFile</key>
  10815. <string>Wireshark.icns</string>
  10816. <key>CFBundleIdentifier</key>
  10817. @@ -42,11 +42,11 @@
  10818. <key>CFBundlePackageType</key>
  10819. <string>APPL</string>
  10820. <key>CFBundleShortVersionString</key>
  10821. - <string>1.2.8</string>
  10822. + <string>1.2.9</string>
  10823. <key>CFBundleSignature</key>
  10824. <string>Wshk</string>
  10825. <key>CFBundleVersion</key>
  10826. - <string>1.2.8</string>
  10827. + <string>1.2.9</string>
  10828. <key>NSHumanReadableCopyright</key>
  10829. <string>Copyright 1998-2010 Wireshark Developers, GNU General Public License.</string>
  10830. <key>LSMinimumSystemVersion</key>
  10831. diff -urN wireshark-1.2.8/svnversion.h wireshark-1.2.9/svnversion.h
  10832. --- wireshark-1.2.8/svnversion.h 2010-05-05 10:16:29.000000000 -0700
  10833. +++ wireshark-1.2.9/svnversion.h 2010-06-08 16:32:48.000000000 -0700
  10834. @@ -1 +1 @@
  10835. -#define SVNVERSION "SVN Rev 32676"
  10836. +#define SVNVERSION "SVN Rev 33171"
  10837. diff -urN wireshark-1.2.8/text2pcap-scanner.c wireshark-1.2.9/text2pcap-scanner.c
  10838. --- wireshark-1.2.8/text2pcap-scanner.c 2010-05-05 10:30:55.000000000 -0700
  10839. +++ wireshark-1.2.9/text2pcap-scanner.c 2010-06-08 16:49:19.000000000 -0700
  10840. @@ -377,12 +377,13 @@
  10841. flex_int32_t yy_verify;
  10842. flex_int32_t yy_nxt;
  10843. };
  10844. -static yyconst flex_int16_t yy_accept[40] =
  10845. +static yyconst flex_int16_t yy_accept[42] =
  10846. { 0,
  10847. 0, 0, 12, 10, 7, 6, 10, 10, 10, 10,
  10848. - 10, 6, 6, 9, 9, 9, 3, 4, 10, 3,
  10849. - 10, 9, 9, 9, 1, 2, 10, 5, 5, 9,
  10850. - 9, 9, 9, 9, 9, 8, 8, 8, 0
  10851. + 10, 6, 6, 9, 9, 9, 3, 4, 10, 10,
  10852. + 3, 10, 9, 9, 9, 1, 2, 10, 10, 5,
  10853. + 5, 9, 9, 9, 9, 9, 9, 8, 8, 8,
  10854. + 0
  10855. } ;
  10856.  
  10857. static yyconst flex_int32_t yy_ec[256] =
  10858. @@ -423,54 +424,56 @@
  10859. 1, 1, 1, 1, 1, 1
  10860. } ;
  10861.  
  10862. -static yyconst flex_int16_t yy_base[46] =
  10863. +static yyconst flex_int16_t yy_base[48] =
  10864. { 0,
  10865. - 0, 0, 67, 0, 85, 62, 62, 15, 29, 36,
  10866. - 0, 85, 60, 61, 0, 21, 85, 85, 47, 0,
  10867. - 17, 43, 0, 18, 85, 85, 19, 85, 0, 24,
  10868. - 49, 42, 50, 58, 60, 26, 25, 0, 85, 23,
  10869. - 73, 76, 78, 80, 82
  10870. + 0, 0, 79, 0, 99, 74, 74, 15, 30, 41,
  10871. + 0, 99, 59, 56, 0, 47, 99, 99, 52, 58,
  10872. + 0, 17, 48, 0, 55, 99, 99, 24, 70, 99,
  10873. + 0, 52, 19, 54, 73, 18, 74, 22, 21, 0,
  10874. + 99, 21, 87, 90, 92, 94, 96
  10875. } ;
  10876.  
  10877. -static yyconst flex_int16_t yy_def[46] =
  10878. +static yyconst flex_int16_t yy_def[48] =
  10879. { 0,
  10880. - 39, 1, 39, 40, 39, 39, 40, 41, 40, 40,
  10881. - 40, 39, 39, 42, 43, 42, 39, 39, 9, 40,
  10882. - 10, 42, 43, 42, 39, 39, 19, 39, 40, 42,
  10883. - 42, 42, 42, 42, 42, 44, 44, 45, 0, 39,
  10884. - 39, 39, 39, 39, 39
  10885. + 41, 1, 41, 42, 41, 41, 42, 43, 41, 42,
  10886. + 42, 41, 41, 44, 45, 44, 41, 41, 42, 9,
  10887. + 42, 10, 44, 45, 44, 41, 41, 42, 20, 41,
  10888. + 42, 44, 44, 44, 44, 44, 44, 46, 46, 47,
  10889. + 0, 41, 41, 41, 41, 41, 41
  10890. } ;
  10891.  
  10892. -static yyconst flex_int16_t yy_nxt[102] =
  10893. +static yyconst flex_int16_t yy_nxt[116] =
  10894. { 0,
  10895. 4, 5, 6, 7, 8, 9, 9, 4, 10, 9,
  10896. - 9, 9, 4, 4, 4, 4, 15, 15, 28, 23,
  10897. - 17, 18, 23, 11, 29, 23, 38, 38, 16, 11,
  10898. - 17, 18, 24, 30, 19, 19, 20, 31, 19, 19,
  10899. - 19, 21, 21, 23, 23, 21, 21, 21, 25, 26,
  10900. - 23, 23, 27, 27, 33, 32, 27, 27, 27, 23,
  10901. - 34, 23, 23, 12, 13, 12, 39, 35, 39, 39,
  10902. - 39, 39, 36, 14, 14, 14, 22, 22, 23, 23,
  10903. - 37, 37, 38, 38, 3, 39, 39, 39, 39, 39,
  10904. - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
  10905. + 9, 9, 4, 4, 4, 4, 15, 15, 30, 24,
  10906. + 24, 11, 40, 40, 31, 34, 27, 37, 16, 11,
  10907. + 11, 17, 18, 19, 11, 20, 20, 21, 11, 20,
  10908. + 20, 20, 11, 11, 11, 11, 22, 22, 24, 24,
  10909. + 22, 22, 22, 24, 18, 24, 24, 24, 25, 26,
  10910. + 27, 28, 12, 29, 29, 33, 35, 29, 29, 29,
  10911. + 32, 17, 18, 19, 24, 24, 13, 12, 41, 41,
  10912. + 41, 41, 41, 36, 41, 41, 38, 14, 14, 14,
  10913. + 23, 23, 24, 24, 39, 39, 40, 40, 3, 41,
  10914.  
  10915. - 39
  10916. + 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
  10917. + 41, 41, 41, 41, 41
  10918. } ;
  10919.  
  10920. -static yyconst flex_int16_t yy_chk[102] =
  10921. +static yyconst flex_int16_t yy_chk[116] =
  10922. { 0,
  10923. 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
  10924. - 1, 1, 1, 1, 1, 1, 8, 8, 21, 24,
  10925. - 27, 27, 16, 40, 21, 30, 37, 36, 8, 8,
  10926. - 9, 9, 16, 24, 9, 9, 9, 30, 9, 9,
  10927. - 9, 10, 10, 32, 22, 10, 10, 10, 19, 19,
  10928. - 31, 33, 19, 19, 32, 31, 19, 19, 19, 34,
  10929. - 33, 35, 14, 13, 7, 6, 3, 34, 0, 0,
  10930. - 0, 0, 35, 41, 41, 41, 42, 42, 43, 43,
  10931. - 44, 44, 45, 45, 39, 39, 39, 39, 39, 39,
  10932. - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
  10933. + 1, 1, 1, 1, 1, 1, 8, 8, 22, 36,
  10934. + 33, 42, 39, 38, 22, 33, 28, 36, 8, 8,
  10935. + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
  10936. + 9, 9, 9, 9, 9, 9, 10, 10, 16, 23,
  10937. + 10, 10, 10, 32, 19, 34, 25, 14, 16, 20,
  10938. + 20, 20, 13, 20, 20, 32, 34, 20, 20, 20,
  10939. + 25, 29, 29, 29, 35, 37, 7, 6, 3, 0,
  10940. + 0, 0, 0, 35, 0, 0, 37, 43, 43, 43,
  10941. + 44, 44, 45, 45, 46, 46, 47, 47, 41, 41,
  10942.  
  10943. - 39
  10944. + 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
  10945. + 41, 41, 41, 41, 41
  10946. } ;
  10947.  
  10948. static yy_state_type yy_last_accepting_state;
  10949. @@ -502,7 +505,7 @@
  10950. *
  10951. * (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com>
  10952. *
  10953. - * $Id: text2pcap-scanner.l 25174 2008-04-25 18:26:54Z wmeier $
  10954. + * $Id: text2pcap-scanner.l 33123 2010-06-07 01:58:57Z gerald $
  10955. *
  10956. * Wireshark - Network traffic analyzer
  10957. * By Gerald Combs <gerald@wireshark.org>
  10958. @@ -542,7 +545,7 @@
  10959. #pragma warning (disable:4018)
  10960. #endif
  10961.  
  10962. -#line 546 "text2pcap-scanner.c"
  10963. +#line 549 "text2pcap-scanner.c"
  10964.  
  10965. #define INITIAL 0
  10966.  
  10967. @@ -730,7 +733,7 @@
  10968. #line 71 "text2pcap-scanner.l"
  10969.  
  10970.  
  10971. -#line 734 "text2pcap-scanner.c"
  10972. +#line 737 "text2pcap-scanner.c"
  10973.  
  10974. if ( !(yy_init) )
  10975. {
  10976. @@ -783,13 +786,13 @@
  10977. while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
  10978. {
  10979. yy_current_state = (int) yy_def[yy_current_state];
  10980. - if ( yy_current_state >= 40 )
  10981. + if ( yy_current_state >= 42 )
  10982. yy_c = yy_meta[(unsigned int) yy_c];
  10983. }
  10984. yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
  10985. ++yy_cp;
  10986. }
  10987. - while ( yy_base[yy_current_state] != 85 );
  10988. + while ( yy_base[yy_current_state] != 99 );
  10989.  
  10990. yy_find_action:
  10991. yy_act = yy_accept[yy_current_state];
  10992. @@ -872,7 +875,7 @@
  10993. #line 84 "text2pcap-scanner.l"
  10994. ECHO;
  10995. YY_BREAK
  10996. -#line 876 "text2pcap-scanner.c"
  10997. +#line 879 "text2pcap-scanner.c"
  10998. case YY_STATE_EOF(INITIAL):
  10999. yyterminate();
  11000.  
  11001. @@ -1164,7 +1167,7 @@
  11002. while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
  11003. {
  11004. yy_current_state = (int) yy_def[yy_current_state];
  11005. - if ( yy_current_state >= 40 )
  11006. + if ( yy_current_state >= 42 )
  11007. yy_c = yy_meta[(unsigned int) yy_c];
  11008. }
  11009. yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
  11010. @@ -1192,11 +1195,11 @@
  11011. while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
  11012. {
  11013. yy_current_state = (int) yy_def[yy_current_state];
  11014. - if ( yy_current_state >= 40 )
  11015. + if ( yy_current_state >= 42 )
  11016. yy_c = yy_meta[(unsigned int) yy_c];
  11017. }
  11018. yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
  11019. - yy_is_jam = (yy_current_state == 39);
  11020. + yy_is_jam = (yy_current_state == 41);
  11021.  
  11022. return yy_is_jam ? 0 : yy_current_state;
  11023. }
  11024. diff -urN wireshark-1.2.8/text2pcap-scanner.l wireshark-1.2.9/text2pcap-scanner.l
  11025. --- wireshark-1.2.8/text2pcap-scanner.l 2010-05-05 10:13:11.000000000 -0700
  11026. +++ wireshark-1.2.9/text2pcap-scanner.l 2010-06-08 16:27:43.000000000 -0700
  11027. @@ -15,7 +15,7 @@
  11028. *
  11029. * (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com>
  11030. *
  11031. - * $Id: text2pcap-scanner.l 25174 2008-04-25 18:26:54Z wmeier $
  11032. + * $Id: text2pcap-scanner.l 33123 2010-06-07 01:58:57Z gerald $
  11033. *
  11034. * Wireshark - Network traffic analyzer
  11035. * By Gerald Combs <gerald@wireshark.org>
  11036. @@ -61,9 +61,9 @@
  11037. directive #TEXT2PCAP.*
  11038. comment #[^W].*
  11039. byte [0-9A-Fa-f][0-9A-Fa-f][ \t]
  11040. -byte_eol [0-9A-Fa-f][0-9A-Fa-f]\n
  11041. +byte_eol [0-9A-Fa-f][0-9A-Fa-f]\r?\n
  11042. offset [0-9A-Fa-f]+[: \t]
  11043. -offset_eol [0-9A-Fa-f]+\n
  11044. +offset_eol [0-9A-Fa-f]+\r?\n
  11045. text [^ \n\t]+
  11046. mailfwd >
  11047. eol \r?\n\r?
  11048. diff -urN wireshark-1.2.8/tools/lemon/lemon.c wireshark-1.2.9/tools/lemon/lemon.c
  11049. --- wireshark-1.2.8/tools/lemon/lemon.c 2010-05-05 10:11:26.000000000 -0700
  11050. +++ wireshark-1.2.9/tools/lemon/lemon.c 2010-06-08 16:25:39.000000000 -0700
  11051. @@ -26,7 +26,7 @@
  11052. ** http://www.hwaci.com/drh/
  11053. **
  11054. ** Updated to sqlite lemon version 1.59
  11055. -** $Id: lemon.c 28662 2009-06-08 15:37:46Z gerald $
  11056. +** $Id: lemon.c 33123 2010-06-07 01:58:57Z gerald $
  11057. */
  11058. #include <stdio.h>
  11059. #include <stdarg.h>
  11060. @@ -1337,7 +1337,6 @@
  11061. va_list ap;
  11062. int end, restart, base;
  11063.  
  11064. - va_start(ap, format);
  11065. /* Prepare a prefix to be prepended to every output line */
  11066. if( lineno>0 ){
  11067. sprintf(prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno);
  11068. @@ -1348,6 +1347,7 @@
  11069. availablewidth = LINEWIDTH - prefixsize;
  11070.  
  11071. /* Generate the error message */
  11072. + va_start(ap, format);
  11073. vsprintf(errmsg,format,ap);
  11074. va_end(ap);
  11075. errmsgsize = (int) strlen(errmsg);
  11076. diff -urN wireshark-1.2.8/wiretap/wtap.c wireshark-1.2.9/wiretap/wtap.c
  11077. --- wireshark-1.2.8/wiretap/wtap.c 2010-05-05 10:13:09.000000000 -0700
  11078. +++ wireshark-1.2.9/wiretap/wtap.c 2010-06-08 16:27:39.000000000 -0700
  11079. @@ -1,6 +1,6 @@
  11080. /* wtap.c
  11081. *
  11082. - * $Id: wtap.c 32332 2010-03-30 23:47:50Z gerald $
  11083. + * $Id: wtap.c 33115 2010-06-06 22:13:16Z gerald $
  11084. *
  11085. * Wiretap Library
  11086. * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
  11087. @@ -35,6 +35,10 @@
  11088. #include <unistd.h>
  11089. #endif
  11090.  
  11091. +#ifdef HAVE_LIBZ
  11092. +#include <zlib.h>
  11093. +#endif
  11094. +
  11095. #include "wtap-int.h"
  11096. #include "wtap.h"
  11097.  
  11098. @@ -612,6 +616,15 @@
  11099. g_free(wth);
  11100. }
  11101.  
  11102. +void
  11103. +wtap_cleareof(wtap *wth) {
  11104. +#ifdef HAVE_LIBZ
  11105. + /* Reset EOF */
  11106. + if (gzeof(wth->fh))
  11107. + gzclearerr(wth->fh);
  11108. +#endif
  11109. +}
  11110. +
  11111. gboolean
  11112. wtap_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
  11113. {
  11114. diff -urN wireshark-1.2.8/wiretap/wtap.def wireshark-1.2.9/wiretap/wtap.def
  11115. --- wireshark-1.2.8/wiretap/wtap.def 2010-05-05 10:13:09.000000000 -0700
  11116. +++ wireshark-1.2.9/wiretap/wtap.def 2010-06-08 16:27:39.000000000 -0700
  11117. @@ -1,5 +1,5 @@
  11118. ; wtap.def
  11119. -; $Id: wtap.def 25354 2008-05-22 15:46:27Z morriss $
  11120. +; $Id: wtap.def 33119 2010-06-07 00:02:21Z gerald $
  11121.  
  11122. ; Add symbols that should be exported out of libwiretap.dll
  11123. ;
  11124. @@ -20,6 +20,7 @@
  11125. file_error
  11126.  
  11127. wtap_buf_ptr
  11128. +wtap_cleareof
  11129. wtap_close
  11130. wtap_dump
  11131. wtap_dump_can_open
  11132. diff -urN wireshark-1.2.8/wiretap/wtap.h wireshark-1.2.9/wiretap/wtap.h
  11133. --- wireshark-1.2.8/wiretap/wtap.h 2010-05-05 10:13:09.000000000 -0700
  11134. +++ wireshark-1.2.9/wiretap/wtap.h 2010-06-08 16:27:39.000000000 -0700
  11135. @@ -1,6 +1,6 @@
  11136. /* wtap.h
  11137. *
  11138. - * $Id: wtap.h 28463 2009-05-24 22:49:36Z stig $
  11139. + * $Id: wtap.h 33115 2010-06-06 22:13:16Z gerald $
  11140. *
  11141. * Wiretap Library
  11142. * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
  11143. @@ -874,6 +874,13 @@
  11144. struct wtap* wtap_open_offline(const char *filename, int *err,
  11145. gchar **err_info, gboolean do_random);
  11146.  
  11147. +/*
  11148. + * If we were compiled with zlib and we're at EOF, unset EOF so that
  11149. + * wtap_read/gzread has a chance to succeed. This is necessary if
  11150. + * we're tailing a file.
  11151. + */
  11152. +void wtap_cleareof(wtap *wth);
  11153. +
  11154. /* Returns TRUE if read was successful. FALSE if failure. data_offset is
  11155. * set to the offset in the file where the data for the read packet is
  11156. * located. */
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!