diff options
Diffstat (limited to 'resources')
306 files changed, 6461 insertions, 3476 deletions
diff --git a/resources/file_dlg_win32.rc b/resources/file_dlg_win32.rc deleted file mode 100644 index 34dbf60d..00000000 --- a/resources/file_dlg_win32.rc +++ /dev/null @@ -1,153 +0,0 @@ -#include <windows.h> -#include "richedit.h" -#include "../ui/win32/file_dlg_win32.h" - -// We should probably ensure that we're meeting the MS layout guidelines: -// https://docs.microsoft.com/en-us/windows/win32/uxguide/vis-layout -// Outer margin: 11px - -WIRESHARK_OPENFILENAME_TEMPLATE DIALOGEX 0, 0, 425, 47 -STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL -FONT 8, "MS Shell Dlg" -{ - // Filter button/entry - // PUSHBUTTON "Filter:", EWFD_FILTER_BTN, 7, 4, 35, 14 - LTEXT "Read filter:", EWFD_FILTER_LBL, 67, 2, 49, 14 - CONTROL "", EWFD_FILTER_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 112, 0, 88, 12, WS_EX_CLIENTEDGE - - COMBOBOX EWFD_FORMAT_TYPE, 67, 17, 135, 8, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - // CHECKBOX "MAC name resolution", EWFD_MAC_NR_CB, 67, 30, 100, 8, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - // CHECKBOX "Transport name resolution", EWFD_TRANS_NR_CB, 67, 45, 100, 8, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - // CHECKBOX "Network name resolution", EWFD_NET_NR_CB, 67, 60, 100, 8, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - // CHECKBOX "Use external network name resolver", EWFD_EXTERNAL_NR_CB, 67, 75, 135, 8, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - - LTEXT "Format:", EWFD_PT_FORMAT, 224, 2, 60, 8 - LTEXT "-", EWFD_PTX_FORMAT, 275, 2, 150, 8 - LTEXT "Size:", EWFD_PT_SIZE, 224, 17, 60, 8 - LTEXT "-", EWFD_PTX_SIZE, 275, 17, 150, 8 - // LTEXT "Packets:", EWFD_PT_PACKETS, 224, 32, 60, 8 - // LTEXT "-", EWFD_PTX_PACKETS, 275, 32, 150, 8 - LTEXT "Start / elapsed:", EWFD_PT_START_ELAPSED, 224, 32, 60, 8 - LTEXT "-", EWFD_PTX_START_ELAPSED, 275, 32, 150, 8 - // 164/211, 79, 40/150, 8 - -} - -WIRESHARK_SAVEASFILENAME_TEMPLATE DIALOGEX 0, 0, 167, 15 -STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL -FONT 8, "MS Shell Dlg" -{ - CHECKBOX "Compress with gzip", EWFD_GZIP_CB, 67, 0, 100, 8, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - -WIRESHARK_SAVEASSTATSTREENAME_TEMPLATE DIALOGEX 0, 0, 167, 0 -STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL -FONT 8, "MS Shell Dlg" -{ -} - -WIRESHARK_EXPORT_SPECIFIED_PACKETS_FILENAME_TEMPLATE DIALOGEX 0, 0, 453, 136 -STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL -FONT 8, "MS Shell Dlg" -{ - CHECKBOX "Compress with gzip", EWFD_GZIP_CB, 67, 0, 100, 8, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - - GROUPBOX "Packet Range", -1, 67, 15, 270, 114 - - CONTROL "Captured", EWFD_CAPTURED_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 232, 26, 45, 10 - CONTROL "Displayed", EWFD_DISPLAYED_BTN, "Button", BS_AUTORADIOBUTTON, 282, 26, 47, 10 - - CONTROL "All packets", EWFD_ALL_PKTS_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 73, 38, 51, 10 - CONTROL "Selected packets only", EWFD_SEL_PKT_BTN, "Button", BS_AUTORADIOBUTTON, 73, 50, 80, 10 - CONTROL "Marked packets only", EWFD_MARKED_BTN, "Button", BS_AUTORADIOBUTTON, 73, 62, 78, 10 - CONTROL "First to last marked", EWFD_FIRST_LAST_BTN, "Button", BS_AUTORADIOBUTTON, 73, 74, 75, 10 - CONTROL "Range:", EWFD_RANGE_BTN, "Button", BS_AUTORADIOBUTTON, 73, 86, 35, 10 - CONTROL "", EWFD_RANGE_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 112, 85, 110, 12, WS_EX_CLIENTEDGE - CONTROL "Remove Ignored packets", EWFD_REMOVE_IGN_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 73, 98, 100, 10 - CONTROL "Include depended upon packets", EWFD_INCLUDE_DPD_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 73, 110, 125, 10 - - LTEXT "0", EWFD_ALL_PKTS_CAP, 232, 39, 39, 8, SS_RIGHT - LTEXT "0", EWFD_SEL_PKT_CAP, 232, 51, 39, 8, SS_RIGHT - LTEXT "0", EWFD_MARKED_CAP, 232, 63, 39, 8, SS_RIGHT - LTEXT "0", EWFD_FIRST_LAST_CAP, 232, 75, 39, 8, SS_RIGHT - LTEXT "0", EWFD_RANGE_CAP, 232, 87, 39, 8, SS_RIGHT - LTEXT "0", EWFD_IGNORED_CAP, 232, 99, 39, 8, SS_RIGHT - LTEXT "0", EWFD_DEPENDED_CAP, 232, 111, 39, 8, SS_RIGHT - - LTEXT "0", EWFD_ALL_PKTS_DISP, 282, 39, 41, 8, SS_RIGHT - LTEXT "0", EWFD_SEL_PKT_DISP, 282, 51, 41, 8, SS_RIGHT - LTEXT "0", EWFD_MARKED_DISP, 282, 63, 41, 8, SS_RIGHT - LTEXT "0", EWFD_FIRST_LAST_DISP, 282, 75, 41, 8, SS_RIGHT - LTEXT "0", EWFD_RANGE_DISP, 282, 87, 41, 8, SS_RIGHT - LTEXT "0", EWFD_IGNORED_DISP, 282, 99, 41, 8, SS_RIGHT - LTEXT "0", EWFD_DEPENDED_DISP, 282, 111, 41, 8, SS_RIGHT -} - -WIRESHARK_MERGEFILENAME_TEMPLATE DIALOGEX 0, 0, 450, 80 -STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL -FONT 8, "MS Shell Dlg" -{ - // Filter button/entry - // PUSHBUTTON "Filter:", EWFD_FILTER_BTN, 7, 4, 35, 14 - LTEXT "Read filter:", EWFD_FILTER_LBL, 67, 2, 49, 14 - CONTROL "", EWFD_FILTER_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 112, 0, 88, 12, WS_EX_CLIENTEDGE - - CONTROL "Prepend packets to existing file", EWFD_MERGE_PREPEND_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 67, 30, 120, 8 - CONTROL "Merge packets chronologically", EWFD_MERGE_CHRONO_BTN, "Button", BS_AUTORADIOBUTTON, 67, 45, 120, 8 - CONTROL "Append packets to existing file", EWFD_MERGE_APPEND_BTN, "Button", BS_AUTORADIOBUTTON, 67, 60, 120, 8 - - LTEXT "Format:", EWFD_PT_FORMAT, 224, 2, 60, 8 - LTEXT "-", EWFD_PTX_FORMAT, 275, 2, 150, 8 - LTEXT "Size:", EWFD_PT_SIZE, 224, 17, 60, 8 - LTEXT "-", EWFD_PTX_SIZE, 275, 17, 150, 8 - // LTEXT "Packets:", EWFD_PT_PACKETS, 224, 32, 60, 8 - // LTEXT "-", EWFD_PTX_PACKETS, 275, 32, 150, 8 - LTEXT "Start / elapsed:", EWFD_PT_START_ELAPSED, 224, 32, 60, 8 - LTEXT "-", EWFD_PTX_START_ELAPSED, 275, 32, 150, 8 - // 164/211, 79, 40/150, 8 -} - -WIRESHARK_EXPORTFILENAME_TEMPLATE DIALOGEX 0, 0, 469, 121 -STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Packet Range", -1, 67, 0, 270, 118 - - CONTROL "Captured", EWFD_CAPTURED_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 232, 11, 45, 10 - CONTROL "Displayed", EWFD_DISPLAYED_BTN, "Button", BS_AUTORADIOBUTTON, 282, 11, 47, 10 - - CONTROL "All packets", EWFD_ALL_PKTS_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 73, 23, 51, 10 - CONTROL "Selected packet", EWFD_SEL_PKT_BTN, "Button", BS_AUTORADIOBUTTON, 73, 35, 68, 10 - CONTROL "Marked packets", EWFD_MARKED_BTN, "Button", BS_AUTORADIOBUTTON, 73, 47, 67, 10 - CONTROL "First to last marked", EWFD_FIRST_LAST_BTN, "Button", BS_AUTORADIOBUTTON, 73, 59, 75, 10 - CONTROL "Range:", EWFD_RANGE_BTN, "Button", BS_AUTORADIOBUTTON, 73, 71, 35, 10 - CONTROL "", EWFD_RANGE_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 112, 70, 110, 12, WS_EX_CLIENTEDGE - CONTROL "Remove Ignored packets", EWFD_REMOVE_IGN_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 73, 83, 100, 10 - CONTROL "Include depended upon packets", EWFD_INCLUDE_DPD_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 73, 95, 125, 10 - - LTEXT "0", EWFD_ALL_PKTS_CAP, 232, 24, 39, 8, SS_RIGHT - LTEXT "0", EWFD_SEL_PKT_CAP, 232, 36, 39, 8, SS_RIGHT - LTEXT "0", EWFD_MARKED_CAP, 232, 48, 39, 8, SS_RIGHT - LTEXT "0", EWFD_FIRST_LAST_CAP, 232, 60, 39, 8, SS_RIGHT - LTEXT "0", EWFD_RANGE_CAP, 232, 72, 39, 8, SS_RIGHT - LTEXT "0", EWFD_IGNORED_CAP, 232, 84, 39, 8, SS_RIGHT - LTEXT "0", EWFD_DEPENDED_CAP, 232, 96, 39, 8, SS_RIGHT - - LTEXT "0", EWFD_ALL_PKTS_DISP, 282, 24, 41, 8, SS_RIGHT - LTEXT "0", EWFD_SEL_PKT_DISP, 282, 36, 41, 8, SS_RIGHT - LTEXT "0", EWFD_MARKED_DISP, 282, 48, 41, 8, SS_RIGHT - LTEXT "0", EWFD_FIRST_LAST_DISP, 282, 60, 41, 8, SS_RIGHT - LTEXT "0", EWFD_RANGE_DISP, 282, 72, 41, 8, SS_RIGHT - LTEXT "0", EWFD_IGNORED_DISP, 282, 84, 41, 8, SS_RIGHT - LTEXT "0", EWFD_DEPENDED_DISP, 282, 96, 41, 8, SS_RIGHT - - GROUPBOX "Packet Format", EWFD_PKT_FORMAT_GB, 344, 0, 134, 106 - CONTROL "Packet summary line", EWFD_PKT_SUMMARY_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 350, 15, 84, 10 - CONTROL "Include column headings", EWFD_COL_HEADINGS_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 362, 27, 94, 10 - CONTROL "Packet details:", EWFD_PKT_DETAIL_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 350, 39, 95, 10 - COMBOBOX EWFD_PKT_DETAIL_COMBO, 362, 51, 74, 45, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Packet Bytes", EWFD_PKT_BYTES_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 350, 68, 80, 10 - CONTROL "Include secondary data sources", EWFD_DATA_SOURCES_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 362, 80, 112, 10 - CONTROL "Each packet on a new page", EWFD_PKT_NEW_PAGE_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 350, 92, 106, 10 - -} diff --git a/resources/fonts/NotoSansMath-Regular.ttf b/resources/fonts/NotoSansMath-Regular.ttf Binary files differnew file mode 100644 index 00000000..b257fa72 --- /dev/null +++ b/resources/fonts/NotoSansMath-Regular.ttf diff --git a/resources/fonts/NotoSansSymbols-VariableFont_wght.ttf b/resources/fonts/NotoSansSymbols-VariableFont_wght.ttf Binary files differnew file mode 100644 index 00000000..41fd4e3e --- /dev/null +++ b/resources/fonts/NotoSansSymbols-VariableFont_wght.ttf diff --git a/resources/fonts/OFL.txt b/resources/fonts/OFL.txt new file mode 100644 index 00000000..ce2c42c5 --- /dev/null +++ b/resources/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2022 The Noto Project Authors (https://github.com/notofonts/symbols) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/resources/freedesktop/org.wireshark.Wireshark-mime.xml b/resources/freedesktop/org.wireshark.Wireshark-mime.xml index e297d273..95025aee 100644 --- a/resources/freedesktop/org.wireshark.Wireshark-mime.xml +++ b/resources/freedesktop/org.wireshark.Wireshark-mime.xml @@ -59,12 +59,16 @@ </match> </magic> <glob pattern="*.pcapng"/> + <glob pattern="*.scap"/> <glob pattern="*.ntar"/> <glob pattern="*.pcapng.gz"/> + <glob pattern="*.scap.gz"/> <glob pattern="*.ntar.gz"/> <glob pattern="*.pcapng.zst"/> + <glob pattern="*.scap.zst"/> <glob pattern="*.ntar.zst"/> <glob pattern="*.pcapng.lz4"/> + <glob pattern="*.scap.lz4"/> <glob pattern="*.ntar.lz4"/> </mime-type> @@ -254,4 +258,10 @@ <glob pattern="*.rtp.zst"/> <glob pattern="*.rtp.lz4"/> </mime-type> + + <mime-type type="application/x-ems"> + <comment>EGNOS Message Server (EMS) file</comment> + <generic-icon name="org.wireshark.Wireshark-mimetype"/> + <glob pattern="*.ems"/> + </mime-type> </mime-info> diff --git a/resources/freedesktop/org.wireshark.Wireshark.metainfo.xml b/resources/freedesktop/org.wireshark.Wireshark.metainfo.xml index 6526beb4..6748684d 100644 --- a/resources/freedesktop/org.wireshark.Wireshark.metainfo.xml +++ b/resources/freedesktop/org.wireshark.Wireshark.metainfo.xml @@ -7,8 +7,10 @@ <component type="desktop"> <id>org.wireshark.Wireshark</id> + <launchable type="desktop-id">org.wireshark.Wireshark.desktop</launchable> <name>Wireshark</name> - <summary>Wireshark is the world's foremost protocol analyzer</summary> + <summary>Network protocol analyzer</summary> + <developer_name>The Wireshark developer community</developer_name> <content_rating type="oars-1.1"/> <metadata_license>CC0-1.0</metadata_license> <project_license>GPL-2.0</project_license> diff --git a/resources/layout_1.png b/resources/layout_1.png Binary files differindex 312ed860..fdcb5f78 100644 --- a/resources/layout_1.png +++ b/resources/layout_1.png diff --git a/resources/layout_1@2x.png b/resources/layout_1@2x.png Binary files differindex d656f7f3..5a44f488 100644 --- a/resources/layout_1@2x.png +++ b/resources/layout_1@2x.png diff --git a/resources/layout_2.png b/resources/layout_2.png Binary files differindex 62560aff..ccc880a0 100644 --- a/resources/layout_2.png +++ b/resources/layout_2.png diff --git a/resources/layout_2@2x.png b/resources/layout_2@2x.png Binary files differindex c79cb6eb..19c8bfe4 100644 --- a/resources/layout_2@2x.png +++ b/resources/layout_2@2x.png diff --git a/resources/layout_3.png b/resources/layout_3.png Binary files differindex fd9eb10e..1ae62fdf 100644 --- a/resources/layout_3.png +++ b/resources/layout_3.png diff --git a/resources/layout_3@2x.png b/resources/layout_3@2x.png Binary files differindex 7fe2fb20..39dc955b 100644 --- a/resources/layout_3@2x.png +++ b/resources/layout_3@2x.png diff --git a/resources/layout_4.png b/resources/layout_4.png Binary files differindex 16a8ff71..465c918c 100644 --- a/resources/layout_4.png +++ b/resources/layout_4.png diff --git a/resources/layout_4@2x.png b/resources/layout_4@2x.png Binary files differindex 2fca6e78..02a68c4b 100644 --- a/resources/layout_4@2x.png +++ b/resources/layout_4@2x.png diff --git a/resources/layout_5.png b/resources/layout_5.png Binary files differindex 967f9f85..746b0965 100644 --- a/resources/layout_5.png +++ b/resources/layout_5.png diff --git a/resources/layout_5@2x.png b/resources/layout_5@2x.png Binary files differindex fd151cad..b9c6eb8d 100644 --- a/resources/layout_5@2x.png +++ b/resources/layout_5@2x.png diff --git a/resources/layout_6.png b/resources/layout_6.png Binary files differindex af3a8fb4..218190c5 100644 --- a/resources/layout_6.png +++ b/resources/layout_6.png diff --git a/resources/layout_6@2x.png b/resources/layout_6@2x.png Binary files differindex 6253b703..36a04909 100644 --- a/resources/layout_6@2x.png +++ b/resources/layout_6@2x.png diff --git a/resources/layouts.svg b/resources/layouts.svg index a49b3249..c8a13733 100644 --- a/resources/layouts.svg +++ b/resources/layouts.svg @@ -2,19 +2,19 @@ <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="288" height="48" id="svg2" version="1.1" - inkscape:version="0.48.2 r9819" - sodipodi:docname="layouts.svg"> + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + sodipodi:docname="layouts.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs id="defs4"> <inkscape:perspective @@ -33,82 +33,104 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="2.9513889" - inkscape:cx="197.87294" - inkscape:cy="25.070165" + inkscape:cx="115.87765" + inkscape:cy="25.242353" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" - inkscape:window-width="1359" - inkscape:window-height="813" - inkscape:window-x="544" - inkscape:window-y="86" - inkscape:window-maximized="0" + inkscape:window-width="1920" + inkscape:window-height="1017" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" inkscape:snap-grids="false" showguides="true" - inkscape:guide-bbox="true"> + inkscape:guide-bbox="true" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> <inkscape:grid type="xygrid" id="grid3777" empspacing="5" visible="true" enabled="true" - snapvisiblegridlinesonly="true" /> + snapvisiblegridlinesonly="true" + originx="0" + originy="0" + spacingy="1" + spacingx="1" + units="px" /> <sodipodi:guide orientation="0,1" position="11.741261,35.519783" - id="guide3837" /> + id="guide3837" + inkscape:locked="false" /> <sodipodi:guide orientation="0,1" position="9.4883721,12.488372" - id="guide3839" /> + id="guide3839" + inkscape:locked="false" /> <sodipodi:guide orientation="1,0" position="24.069767,44.651163" - id="guide3845" /> + id="guide3845" + inkscape:locked="false" /> <sodipodi:guide orientation="1,0" position="108.48837,27.55814" - id="guide3849" /> + id="guide3849" + inkscape:locked="false" /> <sodipodi:guide orientation="1,0" position="131.51163,29.930233" - id="guide3851" /> + id="guide3851" + inkscape:locked="false" /> <sodipodi:guide orientation="1,0" position="156.55814,21.069767" - id="guide3853" /> + id="guide3853" + inkscape:locked="false" /> <sodipodi:guide orientation="1,0" position="179.51163,18.55814" - id="guide3855" /> + id="guide3855" + inkscape:locked="false" /> <sodipodi:guide orientation="0,1" position="203.7907,24" - id="guide3857" /> + id="guide3857" + inkscape:locked="false" /> <sodipodi:guide orientation="1,0" position="216,27.348837" - id="guide3859" /> + id="guide3859" + inkscape:locked="false" /> <sodipodi:guide orientation="0,1" position="216,8.5116279" - id="guide3861" /> + id="guide3861" + inkscape:locked="false" /> <sodipodi:guide orientation="0,1" position="218.86047,39.488372" - id="guide3863" /> + id="guide3863" + inkscape:locked="false" /> <sodipodi:guide orientation="1,0" position="248.5814,30.139535" - id="guide3865" /> + id="guide3865" + inkscape:locked="false" /> <sodipodi:guide orientation="1,0" position="279.48837,31.325581" - id="guide3867" /> + id="guide3867" + inkscape:locked="false" /> <sodipodi:guide orientation="1,0" position="264,31.674419" - id="guide3869" /> + id="guide3869" + inkscape:locked="false" /> </sodipodi:namedview> <metadata id="metadata7"> @@ -118,7 +140,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> <dc:creator> <cc:Agent> <dc:title>Gerald Combs</dc:title> @@ -143,423 +165,449 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - <rect - style="color:#000000;fill:#ffffff;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165291000000005;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:1;fill-opacity:0.73893803" - width="46" - height="46" - x="1" - y="1005.3622" - id="rect2816" - inkscape:export-filename="layout_1.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <rect - y="1005.3622" - x="49" - height="46" - width="46" - id="rect3600" - style="color:#000000;fill:#ffffff;fill-opacity:0.73893803;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165291999999999;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <rect - style="color:#000000;fill:#ffffff;fill-opacity:0.62831861;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165291999999999;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect3602" - width="46" - height="46" - x="97" - y="1005.3622" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <rect - y="1005.3622" - x="145" - height="46" - width="46" - id="rect3604" - style="color:#000000;fill:#ffffff;fill-opacity:0.73893803;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165291999999999;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <rect - style="color:#000000;fill:#ffffff;fill-opacity:0.73893803;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165291999999999;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect3606" - width="46" - height="46" - x="193" - y="1005.3622" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <rect - y="1005.3622" - x="241" - height="46" - width="46" - id="rect3608" - style="color:#000000;fill:#ffffff;fill-opacity:0.73893803;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165291999999999;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> <flowRoot xml:space="preserve" id="flowRoot3622" - style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Bitstream Vera Sans;font-style:normal;font-weight:normal;font-size:18px;-inkscape-font-specification:Bitstream Vera Sans;font-stretch:normal;font-variant:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;text-align:start;writing-mode:lr"><flowRegion + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0.01%;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion id="flowRegion3624"><rect id="rect3626" width="133.632" height="22.464001" x="11.52" y="-54.528" /></flowRegion><flowPara - id="flowPara3628" /></flowRoot> <path - style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" - d="m 2.9999313,1028.3622 42.0001367,0" - id="path3781" - inkscape:connector-curvature="0" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - inkscape:connector-curvature="0" - id="path3789" - d="m 50.999931,1028.3622 42.000137,0" - style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" - d="m 194.99993,1036.3622 42.00014,0" - id="path3791" - inkscape:connector-curvature="0" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - inkscape:connector-curvature="0" - id="path3793" - d="m 194.99993,1020.3622 42.00014,0" - style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - inkscape:connector-curvature="0" - id="path3795" - d="m 272,1049.3622 0,-42.0001" - style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" - d="m 256,1049.3622 0,-42.0001" - id="path3797" - inkscape:connector-curvature="0" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" - d="m 120,1007.362 0,42.0002" - id="path3799" - inkscape:connector-curvature="0" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - inkscape:connector-curvature="0" - id="path3801" - d="m 168,1007.3622 0,42.0002" - style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - inkscape:connector-curvature="0" - id="path3803" - d="m 99,1028.3622 19,0" - style="fill:#eeeeec;stroke:#2e3436;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - style="fill:#eeeeec;stroke:#2e3436;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" - d="m 170,1028.3622 19,0" - id="path3805" - inkscape:connector-curvature="0" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - inkscape:connector-curvature="0" - id="path3807" - d="m 71.999553,1030.3626 0,19" - style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999975999999990;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - x="9.4560003" - y="1021.3622" - id="text3630" - sodipodi:linespacing="125%" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan - sodipodi:role="line" - id="tspan3632" + id="flowPara3628" + style="font-size:18px;line-height:1.25"> </flowPara></flowRoot> + <g + id="layout_1" + inkscape:label="layout_1"> + <rect + style="color:#000000;fill:#eeeeec;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165291;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:1;fill-opacity:1" + width="46" + height="46" + x="1" + y="1005.3622" + id="rect2816" + inkscape:export-filename="layout_1.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" + d="m 2.9999313,1028.3622 42.0001367,0" + id="path3781" + inkscape:connector-curvature="0" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" x="9.4560003" - y="1021.3622">1</tspan></text> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - x="32.212002" - y="1021.3622" - id="text3634" - sodipodi:linespacing="125%" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan - sodipodi:role="line" - id="tspan3636" + y="1021.3622" + id="text3630" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan3632" + x="9.4560003" + y="1021.3622" + style="font-size:12px;line-height:1.25">1</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" x="32.212002" - y="1021.3622">2</tspan></text> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - x="20.652" - y="1044.2302" - id="text3638" - sodipodi:linespacing="125%" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan - sodipodi:role="line" - id="tspan3640" + y="1021.3622" + id="text3634" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan3636" + x="32.212002" + y="1021.3622" + style="font-size:12px;line-height:1.25">2</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" x="20.652" - y="1044.2302">3</tspan></text> - <path - style="fill:#2e3436;stroke:#2e3436;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.80088496" - d="m 23.999962,1007.3622 0,19" - id="path3809" - inkscape:connector-curvature="0" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <text - sodipodi:linespacing="125%" - id="text3871" - y="1021.3622" - x="69.456001" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - xml:space="preserve" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan + y="1044.2302" + id="text3638" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan3640" + x="20.652" + y="1044.2302" + style="font-size:12px;line-height:1.25">3</tspan></text> + <path + style="fill:#2e3436;stroke:#2e3436;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.80088496" + d="m 23.999962,1007.3622 0,19" + id="path3809" + inkscape:connector-curvature="0" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + </g> + <g + id="layout_2" + inkscape:label="layout_2"> + <rect + y="1005.3622" + x="49" + height="46" + width="46" + id="rect3600" + style="color:#000000;fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165292;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:connector-curvature="0" + id="path3789" + d="m 50.999931,1028.3622 42.000137,0" + style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:connector-curvature="0" + id="path3807" + d="m 71.999553,1030.3626 0,19" + style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999975999999990;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <text + id="text3871" y="1021.3622" x="69.456001" - id="tspan3873" - sodipodi:role="line">1</tspan></text> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - x="105.456" - y="1021.3622" - id="text3875" - sodipodi:linespacing="125%" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan - sodipodi:role="line" - id="tspan3877" - x="105.456" - y="1021.3622">1</tspan></text> - <text - sodipodi:linespacing="125%" - id="text3879" - y="1032.3622" - x="153.45599" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - xml:space="preserve" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan - y="1032.3622" - x="153.45599" - id="tspan3881" - sodipodi:role="line">1</tspan></text> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - x="212.45599" - y="1016.8622" - id="text3883" - sodipodi:linespacing="125%" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan - sodipodi:role="line" - id="tspan3885" - x="212.45599" - y="1016.8622">1</tspan></text> - <text - sodipodi:linespacing="125%" - id="text3887" - y="1032.3622" - x="245.45599" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - xml:space="preserve" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan - y="1032.3622" - x="245.45599" - id="tspan3889" - sodipodi:role="line">1</tspan></text> - <text - sodipodi:linespacing="125%" - id="text3891" - y="1044.3622" - x="57.212002" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - xml:space="preserve" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" + xml:space="preserve" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + y="1021.3622" + x="69.456001" + id="tspan3873" + sodipodi:role="line" + style="font-size:12px;line-height:1.25">1</tspan></text> + <text + id="text3891" y="1044.3622" x="57.212002" - id="tspan3893" - sodipodi:role="line">2</tspan></text> - <text - sodipodi:linespacing="125%" - id="text3895" - y="1044.2302" - x="80.652" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - xml:space="preserve" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" + xml:space="preserve" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + y="1044.3622" + x="57.212002" + id="tspan3893" + sodipodi:role="line" + style="font-size:12px;line-height:1.25">2</tspan></text> + <text + id="text3895" y="1044.2302" x="80.652" - id="tspan3897" - sodipodi:role="line">3</tspan></text> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - x="105.212" - y="1044.3622" - id="text3899" - sodipodi:linespacing="125%" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan - sodipodi:role="line" - id="tspan3901" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" + xml:space="preserve" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + y="1044.2302" + x="80.652" + id="tspan3897" + sodipodi:role="line" + style="font-size:12px;line-height:1.25">3</tspan></text> + </g> + <g + id="layout_3" + inkscape:label="layout_3"> + <rect + style="color:#000000;fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165292;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3602" + width="46" + height="46" + x="97" + y="1005.3622" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" + d="m 120,1007.362 0,42.0002" + id="path3799" + inkscape:connector-curvature="0" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:connector-curvature="0" + id="path3803" + d="m 99,1028.3622 19,0" + style="fill:#eeeeec;stroke:#2e3436;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" + x="105.456" + y="1021.3622" + id="text3875" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan3877" + x="105.456" + y="1021.3622" + style="font-size:12px;line-height:1.25">1</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" x="105.212" - y="1044.3622">2</tspan></text> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - x="128.65199" - y="1032.2302" - id="text3903" - sodipodi:linespacing="125%" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan - sodipodi:role="line" - id="tspan3905" + y="1044.3622" + id="text3899" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan3901" + x="105.212" + y="1044.3622" + style="font-size:12px;line-height:1.25">2</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" x="128.65199" - y="1032.2302">3</tspan></text> - <text - sodipodi:linespacing="125%" - id="text3907" - y="1021.3622" - x="176.21201" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - xml:space="preserve" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan + y="1032.2302" + id="text3903" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan3905" + x="128.65199" + y="1032.2302" + style="font-size:12px;line-height:1.25">3</tspan></text> + </g> + <g + id="layout_4" + inkscape:label="layout_4"> + <rect + y="1005.3622" + x="145" + height="46" + width="46" + id="rect3604" + style="color:#000000;fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165292;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:connector-curvature="0" + id="path3801" + d="m 168,1007.3622 0,42.0002" + style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="fill:#eeeeec;stroke:#2e3436;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" + d="m 170,1028.3622 19,0" + id="path3805" + inkscape:connector-curvature="0" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <text + id="text3879" + y="1032.3622" + x="153.45599" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" + xml:space="preserve" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + y="1032.3622" + x="153.45599" + id="tspan3881" + sodipodi:role="line" + style="font-size:12px;line-height:1.25">1</tspan></text> + <text + id="text3907" y="1021.3622" x="176.21201" - id="tspan3909" - sodipodi:role="line">2</tspan></text> - <text - sodipodi:linespacing="125%" - id="text3911" - y="1044.2302" - x="176.65199" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - xml:space="preserve" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" + xml:space="preserve" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + y="1021.3622" + x="176.21201" + id="tspan3909" + sodipodi:role="line" + style="font-size:12px;line-height:1.25">2</tspan></text> + <text + id="text3911" y="1044.2302" x="176.65199" - id="tspan3913" - sodipodi:role="line">3</tspan></text> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - x="212.21201" - y="1032.3622" - id="text3915" - sodipodi:linespacing="125%" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan - sodipodi:role="line" - id="tspan3917" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" + xml:space="preserve" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + y="1044.2302" + x="176.65199" + id="tspan3913" + sodipodi:role="line" + style="font-size:12px;line-height:1.25">3</tspan></text> + </g> + <g + id="layout_5" + inkscape:label="layout_5"> + <rect + style="color:#000000;fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165292;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3606" + width="46" + height="46" + x="193" + y="1005.3622" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.8;stroke-dasharray:none;fill-opacity:1" + d="m 194.99993,1036.3622 42.00014,0" + id="path3791" + inkscape:connector-curvature="0" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:connector-curvature="0" + id="path3793" + d="m 194.99993,1020.3622 42.00014,0" + style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" + x="212.45599" + y="1016.8622" + id="text3883" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan3885" + x="212.45599" + y="1016.8622" + style="font-size:12px;line-height:1.25">1</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" x="212.21201" - y="1032.3622">2</tspan></text> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - x="212.65199" - y="1048.2302" - id="text3919" - sodipodi:linespacing="125%" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan - sodipodi:role="line" - id="tspan3921" + y="1032.3622" + id="text3915" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan3917" + x="212.21201" + y="1032.3622" + style="font-size:12px;line-height:1.25">2</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" x="212.65199" - y="1048.2302">3</tspan></text> - <text - sodipodi:linespacing="125%" - id="text3923" - y="1032.3622" - x="261.21201" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - xml:space="preserve" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan + y="1048.2302" + id="text3919" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan3921" + x="212.65199" + y="1048.2302" + style="font-size:12px;line-height:1.25">3</tspan></text> + </g> + <g + id="layout_6" + inkscape:label="layout_6"> + <rect + y="1005.3622" + x="241" + height="46" + width="46" + id="rect3608" + style="color:#000000;fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165292;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:connector-curvature="0" + id="path3795" + d="m 272,1049.3622 0,-42.0001" + style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504" + d="m 256,1049.3622 0,-42.0001" + id="path3797" + inkscape:connector-curvature="0" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <text + id="text3887" + y="1032.3622" + x="245.45599" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" + xml:space="preserve" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + y="1032.3622" + x="245.45599" + id="tspan3889" + sodipodi:role="line" + style="font-size:12px;line-height:1.25">1</tspan></text> + <text + id="text3923" y="1032.3622" x="261.21201" - id="tspan3925" - sodipodi:role="line">2</tspan></text> - <text - sodipodi:linespacing="125%" - id="text3927" - y="1032.2302" - x="276.65201" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue" - xml:space="preserve" - inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" + xml:space="preserve" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + y="1032.3622" + x="261.21201" + id="tspan3925" + sodipodi:role="line" + style="font-size:12px;line-height:1.25">2</tspan></text> + <text + id="text3927" y="1032.2302" x="276.65201" - id="tspan3929" - sodipodi:role="line">3</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" + xml:space="preserve" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + y="1032.2302" + x="276.65201" + id="tspan3929" + sodipodi:role="line" + style="font-size:12px;line-height:1.25">3</tspan></text> + </g> </g> </svg> diff --git a/resources/logray.exe.manifest.in b/resources/logray.exe.manifest.in index 407861d4..aa134c3d 100644 --- a/resources/logray.exe.manifest.in +++ b/resources/logray.exe.manifest.in @@ -35,12 +35,6 @@ - The NTDDI_VERSION and _WIN32_WINNT parts of cmakeconfig.h.in - The WinVer parts of packaging\nsis\logray.nsi --> - <!-- Windows 7 --> - <!-- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> --> - <!-- Windows 8 --> - <!-- <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> --> - <!-- Windows 8.1 --> - <!-- <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> --> <!-- Windows 10 & 11 --> <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> </application> @@ -57,6 +51,7 @@ of PerMonitor. Unfortunately that causes layout issues with Qt 5.6 and 5.9. For now enable PerMonitor DPI awareness by enabling Qt::AA_EnableHighDpiScaling in ui/qt/main.cpp. + Qt 6 is Per-Monitor DPI Aware V2 by default. --> <!-- <application xmlns="urn:schemas-microsoft-com:asm.v3"> diff --git a/resources/protocols/diameter/CiscoSystems.xml b/resources/protocols/diameter/CiscoSystems.xml index 9bd03fc0..31a5b267 100644 --- a/resources/protocols/diameter/CiscoSystems.xml +++ b/resources/protocols/diameter/CiscoSystems.xml @@ -211,6 +211,14 @@ http://www.cisco.com/c/dam/en/us/td/docs/wireless/asr_5000/20/AAA/20-AAA-Referen <enum name="Pre-Emption-Vulnerability-Disabled" code="1"/> </avp> + <avp name="Cumulative-Acct-Input-Octets" code="132044" vendor-id="CiscoSystems" > + <type type-name="Unsigned64" /> + </avp> + + <avp name="Cumulative-Acct-Output-Octets" code="132045" vendor-id="CiscoSystems" > + <type type-name="Unsigned64" /> + </avp> + <avp name="Override-Tos-Value" code="132046" vendor-id="CiscoSystems"> <grouped> <gavp name="Override-Tos-Direction" /> diff --git a/resources/protocols/diameter/Starent.xml b/resources/protocols/diameter/Starent.xml index 0e2ed2c1..3faad13d 100644 --- a/resources/protocols/diameter/Starent.xml +++ b/resources/protocols/diameter/Starent.xml @@ -912,7 +912,7 @@ <enum name="intra-ggsn-handoff" code="510"/> <enum name="WSG-Auth-failed" code="511"/> <enum name="Gtp-non-existent-pdp-context" code="512"/> - <enum name="sgsn-cancel-loc-inital-attach" code="513"/> + <enum name="sgsn-cancel-loc-initial-attach" code="513"/> <enum name="Local-fallback-timeout" code="514"/> <enum name="sgsn-nrspca-actv-rej-by-sgsn" code="515"/> <enum name="sgsn-nrspca-actv-rej-by-ms" code="516"/> @@ -1176,16 +1176,16 @@ <type type-name="Unsigned32"/> </avp> - <avp name="SN-IPv6-Primary-DNS" code="101" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must"> - <type type-name="IPAddress"/> + <avp name="SN1-IPv6-Primary-DNS" code="101" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must"> + <type type-name="Address"/> </avp> <avp name="SN-IPv6-rtr-advt-interval" code="96" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must"> <type type-name="Unsigned32"/> </avp> - <avp name="SN-IPv6-Secondary-DNS" code="102" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must"> - <type type-name="OctetString"/> + <avp name="SN1-IPv6-Secondary-DNS" code="102" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must"> + <type type-name="Address"/> </avp> <avp name="SN-IPv6-Sec-Pool" code="124" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must"> @@ -1618,8 +1618,8 @@ <type type-name="UTF8String"/> </avp> - <avp name="SN-Primary-DNS-Server" code="5" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must"> - <type type-name="IPAddress"/> + <avp name="SN1-Primary-DNS-Server" code="5" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must"> + <type type-name="Address"/> </avp> <avp name="SN-Primary-NBNS-Server" code="148" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must"> @@ -1881,8 +1881,8 @@ <type type-name="UTF8String"/> </avp> - <avp name="SN-Secondary-DNS-Server" code="6" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must"> - <type type-name="IPAddress"/> + <avp name="SN1-Secondary-DNS-Server" code="6" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must"> + <type type-name="Address"/> </avp> <avp name="SN-Secondary-NBNS-Server" code="149" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must"> @@ -1965,7 +1965,7 @@ <avp name="SN-Subscriber-Acct-Mode" code="192" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must"> <type type-name="Unsigned32"/> - <enum name="flow-based-auxilliary" code="0"/> + <enum name="flow-based-auxiliary" code="0"/> <enum name="flow-based-all" code="1"/> <enum name="flow-based-none" code="2"/> <enum name="session-based" code="3"/> diff --git a/resources/protocols/diameter/Travelping.xml b/resources/protocols/diameter/Travelping.xml new file mode 100644 index 00000000..180bac10 --- /dev/null +++ b/resources/protocols/diameter/Travelping.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- Travelping vendor-specific AVPs. --> + +<vendor vendor-id="Travelping" code="18681" name="Travelping"> + <avp name="TP-NAT-IP-Address" code="16" vendor-id="Travelping" mandatory="may" protected="may" may-encrypt="yes" vendor-bit="must"> + <type type-name="OctetString"/> + </avp> + + <avp name="TP-NAT-Pool-Id" code="27" vendor-id="Travelping" mandatory="may" protected="may" may-encrypt="yes" vendor-bit="must"> + <type type-name="UTF8String"/> + </avp> + + <avp name="TP-NAT-Port-End" code="29" vendor-id="Travelping" mandatory="may" protected="may" may-encrypt="yes" vendor-bit="must"> + <type type-name="Unsigned32"/> + </avp> + + <avp name="TP-NAT-Port-Start" code="28" vendor-id="Travelping" mandatory="may" protected="may" may-encrypt="yes" vendor-bit="must"> + <type type-name="Unsigned32"/> + </avp> + + <avp name="TP-Previous-PS-Information" code="64" vendor-id="Travelping" mandatory="may" protected="may" may-encrypt="yes" vendor-bit="must"> + <grouped> + <gavp name="QoS-Information"/> + <gavp name="SGSN-Address"/> + <gavp name="3GPP-SGSN-MCC-MNC"/> + <gavp name="3GPP-MS-TimeZone"/> + <gavp name="3GPP-User-Location-Info"/> + <gavp name="3GPP-RAT-Type"/> + </grouped> + </avp> +</vendor> diff --git a/resources/protocols/diameter/VerizonWireless.xml b/resources/protocols/diameter/VerizonWireless.xml index ab39ecc9..04015bbf 100644 --- a/resources/protocols/diameter/VerizonWireless.xml +++ b/resources/protocols/diameter/VerizonWireless.xml @@ -11,13 +11,21 @@ </avp> <avp name="Charging-Gateway-Function-Host" vendor-id="VerizonWireless" code="6068" > - <type type-name="OctetString"/> + <type type-name="UTF8String"/> </avp> <avp name="Charging-Group-ID" vendor-id="VerizonWireless" code="6069" > <type type-name="OctetString"/> </avp> + <avp name="Originating-User-Location-Info" vendor-id="VerizonWireless" code="6080" > + <type type-name="OctetString"/> + </avp> + + <avp name="Originating-BSID" vendor-id="VerizonWireless" code="6081" > + <type type-name="OctetString"/> + </avp> + <avp name="LI-Indicator-Gx" code="6092" vendor-id="VerizonWireless" > <grouped> <gavp name="Random-Vector"/> diff --git a/resources/protocols/diameter/dictionary.xml b/resources/protocols/diameter/dictionary.xml index cdbd7778..4e69196a 100644 --- a/resources/protocols/diameter/dictionary.xml +++ b/resources/protocols/diameter/dictionary.xml @@ -34,6 +34,7 @@ <!ENTITY Siemens SYSTEM "Siemens.xml"> <!ENTITY Microsoft SYSTEM "Microsoft.xml"> <!ENTITY Metaswitch SYSTEM "Metaswitch.xml"> + <!ENTITY Travelping SYSTEM "Travelping.xml"> <!ENTITY Custom SYSTEM "Custom.xml"> ]> <dictionary> @@ -304,6 +305,17 @@ The UTF8String MUST not contain any octets with a value of zero. --> + <typedefn type-name="Address" type-parent="OctetString"/> + <!-- + The Address format is derived from the OctetString AVP Base + Format. It represents 32 bit (IPv4) [17] or 128 bit (IPv6) [16] + address, most significant octet first. The format of the + address (IPv4 or IPv6) is determined by the length. If the + attribute value is an IPv4 address, the AVP Length field MUST + be 12 (16 if 'V' bit is enabled), otherwise the AVP Length + field MUST be set to 24 (28 if the 'V' bit is enabled) for IPv6 + addresses. + --> <typedefn type-name="IPAddress" type-parent="OctetString"/> <!-- The IPAddress format is derived from the OctetString AVP Base @@ -314,6 +326,8 @@ be 12 (16 if 'V' bit is enabled), otherwise the AVP Length field MUST be set to 24 (28 if the 'V' bit is enabled) for IPv6 addresses. + For AVPs with codes < 256, the RADIUS ipaddr encoding is used + instead. --> <typedefn type-name="DiameterIdentity" type-parent="OctetString"/> <!-- @@ -1127,7 +1141,7 @@ <type type-name="UTF8String"/> </avp> <avp name="Framed-Pool" code="88" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot"> - <type type-name="OctetString"/> + <type type-name="UTF8String"/> </avp> <avp name="CUI" code="89" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot"> <type type-name="UTF8String"/> @@ -6411,6 +6425,9 @@ <avp name="PC5-Link-AMBR" code="1718" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP"> <type type-name="Integer32"/> </avp> + <avp name="Third-Context-Identifier" code="1719" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP"> + <type type-name="Unsigned32"/> + </avp> <avp name="SMS-Information" code="2000" vendor-bit="must" vendor-id="TGPP"> <grouped> @@ -8320,7 +8337,7 @@ <gavp name="Reporting-Time-Stamp"/> <gavp name="Updated-Network-Configuration"/> <gavp name="SCEF-Reference-ID-Ext"/> - <gavp name="SCEF-Reference-ID-For-Deletion-Ext"/> + <gavp name="SCEF-Reference-ID-for-Deletion-Ext"/> <gavp name="Event-Handling"/> <gavp name="Loss-Of-Connectivity-Reason"/> <gavp name="PDN-Connectivity-Status-Report"/> @@ -9125,5 +9142,6 @@ &Siemens; &Microsoft; &Metaswitch; + &Travelping; &Custom; </dictionary> diff --git a/resources/protocols/radius/.editorconfig b/resources/protocols/radius/.editorconfig new file mode 100644 index 00000000..b0ae8303 --- /dev/null +++ b/resources/protocols/radius/.editorconfig @@ -0,0 +1,4 @@ +# RADIUS dictionaries, FreeRADIUS format +[dictionary.*] +indent_style = tab +indent_size = 8 diff --git a/resources/protocols/radius/README.radius_dictionary b/resources/protocols/radius/README.radius_dictionary index d6401311..c26513fb 100644 --- a/resources/protocols/radius/README.radius_dictionary +++ b/resources/protocols/radius/README.radius_dictionary @@ -1,70 +1,85 @@ -[Dec-01-2010] - Commented out global VSA:s from dictionary.ascend to avoid name clashes with IANA assigned VSA:s - https://gitlab.com/wireshark/wireshark/-/issues/5455 +Changes from FreeRADIUS 3.2.4 [2024-05-29]: -[Jul-09-2009] +FreeRADIUS 3.2.4's share directory includes some non-RADIUS dictionaries +(which are not included in the base dictionary file). Wireshark doesn't +need those. The pre-4.0 branch of FreeRADIUS removes them into a separate +directory. -As of the above date the dictionary files in this directory are those from the FreeRadius 2.1.6 [May-18-2009] release -with the following changes: +tlv types are unwrapped with BEGIN-TLV / END-TLV to accommodate Wireshark's +parser. Note this might not work for TLVs within extended attributes. + +A few dictionaries have minor spelling or capitalization fixes. 1. dictionary - - enabled include: dictionary.cisco.vpn3000 - - disabled include: dictionary.vqp + - enabled include: dictionary.cisco.vpn3000 (disabled altiga - + the two are the same - note dictionary.cisco.asa conflicts) - disabled include: dictionary.freeradius.internal - - added include: dictionary.chillispot: as per the 2009-06-11 commit in the FreeRadius repository. - - added: Comment re Wireshark usage of the integer data type. - -2. dictionary.airespace - - FreeRADIUS version plus: - Added additional attributes from later Cisco documentation and - support forum post. - -3. dictionary.wimax - - Freeradius 2.1.6 dictionary.wimax plus: - Added missing END-VENDOR WIMAX statement. - - Note that Attribute WiMAX-MN-hHA-MIP4-SPI [11] had a type of "octets" - in the previous Wireshark version of this file. - This attribute in the FreeRadius version of this file - has an attribute type of "integer". - -4. dictionary.cablelabs + - added: comment re wireshark usage of the integer data type. + - added: dictionary.5x9, dictionary.enterasys, dictionary.identity_engines, + dictionary.jradius, dictionary.unisphere, custom.includes + +2. dictionary.3gpp + - FreeRadius 3.2.4 dictionary.3gpp plus updates based upon: + TS 29.061 + https://www.3gpp.org/dynareport/29061.htm + TS 29.561 5G System; Internetworking between 5G Network and external Data Networks + https://www.3gpp.org/DynaReport/29561.htm + +3. dictionary.3gpp2 + - FreeRadius 3.2.4 dictionary.3gpp2 plus updates based upon + the latest 3GPP2 specification: + "cdma2000 Wireless IP Network Standard: Accounting Services and 3GPP2 Radius VSAs + 3GPP2 X.S0011-005-D + Version: 2.0 + Version Date: November 2008" + http://www.3gpp2.org/public_html/Specs/X.S0011-005-D_v2.0_081103.pdf + +4. dictionary.aruba + - FreeRADIUS version, but with one attribute they removed left in. + +5. dictionary.cablelabs - FreeRADIUS version plus additions based upon: PacketCable(TM) 1.5 Specification: Event Messages PacketCable(TM) Specification: Multimedia Specification - Added additional comments and changes related to Wireshark use of this file. -5. dictionary.microsoft - - FreeRadius v 2.1.6 dictionary.microsoft plus additions based upon - Wireshark commit SVN #17706. - Essentially: Add "VALUES" for - ATTRIBUTE MS-MPPE-Encryption-Policy and - ATTRIBUTE MS-MPPE-Encryption-Types. - -7. dictionary.cisco.vpn3000 - - FreeRadius 2.1.6 dictionary.cisco.vpn3000 plus additions: +6. dictionary.cisco.vpn3000 + - FreeRadius 3.2.4 dictionary.cisco.vpn3000 plus additions: a. VALUEs as defined in the previous Wireshark version of dictionary.cisco.vpn3000; b. ATTRIBUTEs as defined in: http://www.cisco.com/en/US/docs/security/vpn3000/vpn3000_47/configuration/guide/ldapapp.html#wp1564468 Additions from the FreeRadius version are marked with "## [wireshark]". -8. dictionary.aruba - - FreeRADIUS version, but with one attribute they removed left in. +7. dictionary.extreme + - Updated to vendor provided files in commit + 9fc4ac6caed474f149f0a13cdcd6106013e9d50c -9. dictionary.3gpp2 - - FreeRadius 2.1.6 dictionary.3gpp2 plus updates based upon - the latest 3GPP2 specification: - "cdma2000 Wireless IP Network Standard: Accounting Services and 3GPP2 Radius VSAs - 3GPP2 X.S0011-005-D - Version: 2.0 - Version Date: November 2008" - http://www.3gpp2.org/public_html/Specs/X.S0011-005-D_v2.0_081103.pdf - -10. dictionary.3gpp - - FreeRadius 2.1.6 dictionary.3gpp plus updates based upon: - http://pda.etsi.org/exchangefolder/ts_129061v080300p.pdf - (ETSI TS 129 061 V8.3.0 (2009-06)) - -11. dictionary.iea +8. dictionary.iea - FreeRADIUS version, with some additional attributes supplied in a Wireshark bug report. + +9. dictionary.meinberg + - VALUES added by Wireshark commit 38a4ffb6c4098766f509487add5d8e75665ffe6f + +10. dictionary.microsoft + - FreeRadius v 3.2.4 dictionary.microsoft plus correct VALUES for + ATTRIBUTE MS-MPPE-Encryption-Types. (FreeRADIUS is incorrect according + to RFC 2548.) + +11. dictionary.ruckus + - Replaced a no longer used ATTRIBUTE with a newer value + 39d5557e7dc4899f1de80742ab138b7597830767 db5aa275a0334e1c5fd0229f20f23f299ea9f291 + +12. dictionary.symbol + - Version received from vendor, commit ca96dfe0592d7d21e484634873d2f77529a25ae3 + +13. dictionary.trapeze + - Has additional Attributes as defined in the master (pre-4.0) branch of FreeRADIUS. + +14. dictionary.travelping + - Has additional Attributes as defined in the master (pre-4.0) branch of FreeRADIUS. + +15. dictionary.usr + - Has additional ATTRIBUTEs and VALUEs added by Wireshark commits, e.g. + 455381dace25101fd7cb8ab74c307c8b03650221 and 91f44b2940cb36f3eaf0580726155bb58304ebb6 diff --git a/resources/protocols/radius/dictionary b/resources/protocols/radius/dictionary index b2a67e49..67cabbec 100644 --- a/resources/protocols/radius/dictionary +++ b/resources/protocols/radius/dictionary @@ -1,31 +1,12 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Version $Id$ -# 2014-11-03 Comment out -# dictionary.rfc7155 -# dictionary.rfc7268 -# As they give errors in the test, something may have changed in the free rasdius syntax -# -# 2014-10-26 Updated based upon FreeRadius v3.0.4 dictionary file -# - Added : actelis, aerohive, alvarion.wimax.v2_2, bluecoat, broadsoft, brocade, bskyb, -# bt, camiant, cisco.asa, citrix, compatible, dante, dlink, dragonwave, efficientip, -# equallogic, ericsson.packet.core.networks, f5, fdxtended, freedhcp, iana, infoblox, -# kineto, meru, paloalto, proxim, purewave, riverbed, ruckus, sg, siemens, starent.vsa1, -# surfnet, symbol, terena, wimax.alvarion, yubico, zeus, zte -# - Added : rfc6677, rfc6911, rfc6929, rfc6930, rfc7055, rfc7155, rfc7268 -# - Renamed Redback to Ericsson-AB -# - Renamed Alcatel-lucent.xylan to Xylan -# -# 2011-05-24 Updated based upon FreeRadius v2.1.10 dictionary file -# - Added: acme, alcatel.sr, iea, motorola.wimax, rfc4603, rfc 5580, rfc5607, rfc5904, wichorus -# - Added: additional Integer Translations -# -# 2009-07-09 Wireshark changes to FreeRadius v2.1.6 dictionary file -# - enabled include: dictionary.cisco.vpn3000 -# - disabled include: dictionary.vqp -# - disabled include: dictionary.freeradius.internal -# - added include: dictionary.chillispot: as per 2009-06-11 commit in FreeRadius repository. -# - added: Comment re Wireshark usage of the integer data type. +# +# 2024-06-27 Updated based upon FreeRadius v3.2.4 dictionary file +# - Added : rfc8045 (commented out for now), rfc8559 +# - Uncommented : rfc7499, rfc7930 # # DO NOT EDIT THE FILES IN THIS DIRECTORY # @@ -43,25 +24,30 @@ # composed of Attribute/Value Pairs. The value of each attribute # is specified as one of a few data types. Valid data types are: # -# text - printable, generally UTF-8 encoded (subset of 'string') -# string - 0-253 octets +# string - printable text, generally UTF-8 encoded. (The RFCs call this "text") # ipaddr - 4 octets in network byte order -# integer - 32 bit value in big endian order (high byte first) -# [wireshark uses this type for non-standard 1-2-3 and 8 byte integers as well] +# ipv4prefix - 1 octet reserved, one octet prefix, 4 octets ipaddr +# integer - 32 bit value in big endian order +# [wireshark uses this type for non-standard 1-2-3 and 8 byte integers as well] +# integer64 - 64 bit value in big endian order # date - 32 bit value in big endian order - seconds since # 00:00:00 GMT, Jan. 1, 1970 # ifid - 8 octets in network byte order # ipv6addr - 16 octets in network byte order -# ipv6prefix - 18 octets in network byte order +# ipv6prefix - 1 octet reserved, one octet prefix, 16 octets ipv6addr +# tlv - type-length-value # # FreeRADIUS includes data types which are not defined # in the RFC's. These data types are: # # abinary - Ascend's binary filter format. -# ether - 6 octets of hh:hh:hh:hh:hh:hh -# where 'h' is hex digits, upper or lowercase. +# byte - 8 bit unsigned integer +# ether - 6 octets of hh:hh:hh:hh:hh:hh +# where 'h' is hex digits, upper or lowercase. +# short - 16-bit unsigned integer in network byte order +# signed - 32-bit signed integer in network byte order # octets - raw octets, printed and input as hex strings. -# e.g.: 0x123456789abcdef +# e.g.: 0x123456789abcdef The RFCs call this "string". # # FreeRADIUS uses a number of data types which are defined in # RFC 6929. These data types should NEVER be used in any other @@ -121,10 +107,12 @@ $INCLUDE dictionary.rfc6911 $INCLUDE dictionary.rfc6929 $INCLUDE dictionary.rfc6930 $INCLUDE dictionary.rfc7055 -#$INCLUDE dictionary.rfc7155 -#$INCLUDE dictionary.rfc7268 +$INCLUDE dictionary.rfc7155 +$INCLUDE dictionary.rfc7268 $INCLUDE dictionary.rfc7499 $INCLUDE dictionary.rfc7930 +#$INCLUDE dictionary.rfc8045 +$INCLUDE dictionary.rfc8559 # # Mostly values which have been allocated by IANA under @@ -133,6 +121,33 @@ $INCLUDE dictionary.rfc7930 $INCLUDE dictionary.iana # +# These dictionaries define attributes in the IETF managed space. +# (i.e. 1..255). This is wrong. We include them here to allow them. +# The IETF allocated ones are listed below, which gives them priority. + +# i.e. don't do this. Don't use these attributes +# +# [wireshark: We move this section after the IETF managed dictionaries +# so that if uncommented they override the conflicting IETF allocated +# attributes. It would be nice to have this as a Wireshark pref instead +# of forcing people to uncomment or include a file.] +# +#$INCLUDE dictionary.usr.illegal +#$INCLUDE dictionary.ascend.illegal +#$INCLUDE dictionary.motorola.illegal + +# +# Commented out because of attribute conflicts. +# +#$INCLUDE dictionary.alvarion.wimax.v2_2 +#$INCLUDE dictionary.nokia.conflict +#$INCLUDE dictionary.openser +#enabled in lieu of dictionary.starent by request in #10688 +$INCLUDE dictionary.starent.vsa1 +#$INCLUDE dictionary.wimax.alvarion +#$INCLUDE dictionary.wimax.wichorus + +# # Vendor dictionaries are listed after the standard ones. # $INCLUDE dictionary.3com @@ -142,51 +157,76 @@ $INCLUDE dictionary.5x9 $INCLUDE dictionary.acc $INCLUDE dictionary.acme $INCLUDE dictionary.actelis +$INCLUDE dictionary.adtran +$INCLUDE dictionary.adva +$INCLUDE dictionary.aerohive $INCLUDE dictionary.airespace $INCLUDE dictionary.alcatel -$INCLUDE dictionary.alcatel.sr $INCLUDE dictionary.alcatel-lucent.aaa +$INCLUDE dictionary.alcatel.esam +$INCLUDE dictionary.alcatel.sr +$INCLUDE dictionary.alphion $INCLUDE dictionary.alteon +#$INCLUDE dictionary.altiga $INCLUDE dictionary.alvarion $INCLUDE dictionary.apc $INCLUDE dictionary.aptilo +$INCLUDE dictionary.aptis $INCLUDE dictionary.arbor +$INCLUDE dictionary.arista $INCLUDE dictionary.aruba -$INCLUDE dictionary.azaire $INCLUDE dictionary.ascend +$INCLUDE dictionary.asn +$INCLUDE dictionary.audiocodes +$INCLUDE dictionary.avaya +$INCLUDE dictionary.azaire $INCLUDE dictionary.bay +$INCLUDE dictionary.bigswitch $INCLUDE dictionary.bintec $INCLUDE dictionary.bluecoat +$INCLUDE dictionary.boingo +$INCLUDE dictionary.bristol $INCLUDE dictionary.broadsoft $INCLUDE dictionary.brocade $INCLUDE dictionary.bskyb $INCLUDE dictionary.bt $INCLUDE dictionary.cablelabs $INCLUDE dictionary.cabletron +$INCLUDE dictionary.calix +$INCLUDE dictionary.cambium $INCLUDE dictionary.camiant +$INCLUDE dictionary.centec +$INCLUDE dictionary.checkpoint $INCLUDE dictionary.chillispot +$INCLUDE dictionary.ciena $INCLUDE dictionary.cisco -$INCLUDE dictionary.cisco.asa +#$INCLUDE dictionary.cisco.asa # -# The Cisco VPN300 dictionary is the same as the altiga one. +# The Cisco VPN300 dictionary uses the same Vendor ID as the ASA one. # You shouldn't use both at the same time. # +# Note : the altiga dictionary, not listed here, also uses the same Vendor ID +# [wireshark: We enable the Cisco VPN3000 dictionary by default] +# $INCLUDE dictionary.cisco.vpn3000 -$INCLUDE dictionary.cisco.vpn5000 $INCLUDE dictionary.cisco.bbsm +$INCLUDE dictionary.cisco.vpn5000 $INCLUDE dictionary.citrix +$INCLUDE dictionary.ckey $INCLUDE dictionary.clavister $INCLUDE dictionary.cnergee $INCLUDE dictionary.colubris +$INCLUDE dictionary.columbia_university $INCLUDE dictionary.compatible $INCLUDE dictionary.cosine +$INCLUDE dictionary.covaro $INCLUDE dictionary.dante $INCLUDE dictionary.dellemc -#$INCLUDE dictionary.dhcp -$INCLUDE dictionary.dlink $INCLUDE dictionary.digium +$INCLUDE dictionary.dlink $INCLUDE dictionary.dragonwave $INCLUDE dictionary.efficientip +$INCLUDE dictionary.eleven $INCLUDE dictionary.eltex $INCLUDE dictionary.enterasys $INCLUDE dictionary.epygi @@ -194,68 +234,77 @@ $INCLUDE dictionary.equallogic $INCLUDE dictionary.ericsson $INCLUDE dictionary.ericsson.ab $INCLUDE dictionary.ericsson.packet.core.networks +$INCLUDE dictionary.erx $INCLUDE dictionary.extreme $INCLUDE dictionary.f5 $INCLUDE dictionary.fdxtended -$INCLUDE dictionary.freeradius -$INCLUDE dictionary.freeswitch +$INCLUDE dictionary.force10 $INCLUDE dictionary.fortinet $INCLUDE dictionary.foundry +$INCLUDE dictionary.freeradius +$INCLUDE dictionary.freeradius.evs5 +$INCLUDE dictionary.freeswitch $INCLUDE dictionary.gandalf +$INCLUDE dictionary.garderos $INCLUDE dictionary.gemtek $INCLUDE dictionary.h3c +$INCLUDE dictionary.hillstone $INCLUDE dictionary.hp $INCLUDE dictionary.huawei $INCLUDE dictionary.identity_engines $INCLUDE dictionary.iea +$INCLUDE dictionary.infinera +$INCLUDE dictionary.infoblox $INCLUDE dictionary.infonet +$INCLUDE dictionary.ipunplugged $INCLUDE dictionary.issanni $INCLUDE dictionary.itk -$INCLUDE dictionary.ipunplugged $INCLUDE dictionary.juniper $INCLUDE dictionary.jradius $INCLUDE dictionary.karlnet $INCLUDE dictionary.kineto $INCLUDE dictionary.lancom +$INCLUDE dictionary.lantronix $INCLUDE dictionary.livingston $INCLUDE dictionary.localweb $INCLUDE dictionary.lucent $INCLUDE dictionary.manzara $INCLUDE dictionary.meinberg +$INCLUDE dictionary.mellanox $INCLUDE dictionary.meraki $INCLUDE dictionary.merit $INCLUDE dictionary.meru $INCLUDE dictionary.microsemi $INCLUDE dictionary.microsoft $INCLUDE dictionary.mikrotik +$INCLUDE dictionary.mimosa $INCLUDE dictionary.motorola $INCLUDE dictionary.motorola.wimax $INCLUDE dictionary.navini +$INCLUDE dictionary.net +$INCLUDE dictionary.netelastic $INCLUDE dictionary.netscreen $INCLUDE dictionary.networkphysics $INCLUDE dictionary.nexans -$INCLUDE dictionary.ntua +$INCLUDE dictionary.nile $INCLUDE dictionary.nokia -# -# Commented out because of attribute conflicts. -# -#$INCLUDE dictionary.nokia.conflict $INCLUDE dictionary.nomadix $INCLUDE dictionary.nortel -# -# Commented out because of attribute conflicts. -# -#$INCLUDE dictionary.openser +$INCLUDE dictionary.ntua +$INCLUDE dictionary.openwifi $INCLUDE dictionary.packeteer $INCLUDE dictionary.paloalto $INCLUDE dictionary.patton $INCLUDE dictionary.perle +$INCLUDE dictionary.pfsense +$INCLUDE dictionary.pica8 $INCLUDE dictionary.propel $INCLUDE dictionary.prosoft $INCLUDE dictionary.proxim $INCLUDE dictionary.purewave $INCLUDE dictionary.quiconnect $INCLUDE dictionary.quintum +$INCLUDE dictionary.rcntec $INCLUDE dictionary.redcreek $INCLUDE dictionary.riverbed $INCLUDE dictionary.riverstone @@ -263,35 +312,42 @@ $INCLUDE dictionary.roaringpenguin $INCLUDE dictionary.ruckus $INCLUDE dictionary.ruggedcom $INCLUDE dictionary.sangoma -$INCLUDE dictionary.shasta $INCLUDE dictionary.sg +$INCLUDE dictionary.shasta $INCLUDE dictionary.shiva $INCLUDE dictionary.siemens $INCLUDE dictionary.slipstream +$INCLUDE dictionary.smartsharesystems +$INCLUDE dictionary.sofaware +$INCLUDE dictionary.softbank $INCLUDE dictionary.sonicwall $INCLUDE dictionary.springtide -#$INCLUDE dictionary.starent Thes two are mutally exlusive I think, make the "old" one the default -$INCLUDE dictionary.starent.vsa1 +#$INCLUDE dictionary.starent Make the "old" one above the default (#10688) $INCLUDE dictionary.surfnet $INCLUDE dictionary.symbol +$INCLUDE dictionary.t_systems_nova $INCLUDE dictionary.telebit +$INCLUDE dictionary.telkom +$INCLUDE dictionary.telrad $INCLUDE dictionary.terena +$INCLUDE dictionary.tplink $INCLUDE dictionary.trapeze $INCLUDE dictionary.travelping +$INCLUDE dictionary.tripplite $INCLUDE dictionary.tropos -$INCLUDE dictionary.t_systems_nova $INCLUDE dictionary.ukerna $INCLUDE dictionary.unisphere $INCLUDE dictionary.unix $INCLUDE dictionary.usr $INCLUDE dictionary.utstarcom $INCLUDE dictionary.valemount -$INCLUDE dictionary.versanet +$INCLUDE dictionary.vasexperts $INCLUDE dictionary.verizon -###$INCLUDE dictionary.vqp -$INCLUDE dictionary.waverider +$INCLUDE dictionary.versanet $INCLUDE dictionary.walabi +$INCLUDE dictionary.waverider $INCLUDE dictionary.wichorus +$INCLUDE dictionary.wifialliance $INCLUDE dictionary.wimax $INCLUDE dictionary.wispr $INCLUDE dictionary.xedia @@ -304,41 +360,6 @@ $INCLUDE custom.includes # # And finally the server internal attributes. +# These are attributes which NEVER go into a RADIUS packet. # ###$INCLUDE dictionary.freeradius.internal - -# -# Miscellaneous attributes defined in weird places that -# don't really belong anywhere else... -# -ATTRIBUTE Originating-Line-Info 94 string - -# As defined in draft-sterman-aaa-sip-00.txt -ATTRIBUTE Digest-Response 206 string -ATTRIBUTE Digest-Attributes 207 octets # stupid format - -# -# Integer Translations -# -VALUE Service-Type Voice 12 -VALUE Service-Type Fax 13 -VALUE Service-Type Modem-Relay 14 -VALUE Service-Type IAPP-Register 15 -VALUE Service-Type IAPP-AP-Check 16 - -VALUE Framed-Protocol GPRS-PDP-Context 7 - -VALUE NAS-Port-Type Wireless-CDMA2000 22 -VALUE NAS-Port-Type Wireless-UMTS 23 -VALUE NAS-Port-Type Wireless-1X-EV 24 -VALUE NAS-Port-Type IAPP 25 - -VALUE NAS-Port-Type FTTP 26 -VALUE NAS-Port-Type Wireless-802.16 27 -VALUE NAS-Port-Type Wireless-802.20 28 -VALUE NAS-Port-Type Wireless-802.22 29 - -VALUE NAS-Port-Type xPON 35 -VALUE NAS-Port-Type Wireless-XGP 36 - -VALUE Framed-Protocol PPTP 9 diff --git a/resources/protocols/radius/dictionary.3com b/resources/protocols/radius/dictionary.3com index 4d0ad48c..439c8ae7 100644 --- a/resources/protocols/radius/dictionary.3com +++ b/resources/protocols/radius/dictionary.3com @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # 3com SuperStack Firewall dictionary # Bought from Sonicwall, apparently, from Enterprise number 8741. # -# $Id: 2898ff656afb26c302ec2c613f29223689f03859 $ +# $Id: 19353871f3e35469bca89cbfe7dc815675e98942 $ # VENDOR 3com 43 diff --git a/resources/protocols/radius/dictionary.3gpp b/resources/protocols/radius/dictionary.3gpp index e0fa7c38..63ed0e04 100644 --- a/resources/protocols/radius/dictionary.3gpp +++ b/resources/protocols/radius/dictionary.3gpp @@ -1,14 +1,12 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # 3GPP stuff. # -# http://pda.etsi.org/exchangefolder/ts_129061v080300p.pdf -# ETSI TS 129 061 V8.3.0 (2009-06) +# ftp://ftp.3gpp.org/specs/2002-06/R1999/29_series/29061-3a0.zip # -# [wireshark] 2009-07-07: Updated FreeRadius 2.1.6 dictionary.3gpp -# based upon the above specification. -# -# $Id$ +# $Id: ce5b6bc571f2d93183775ab983467ec44c0df19f $ # VENDOR 3GPP 10415 @@ -28,7 +26,7 @@ ATTRIBUTE 3GPP-GGSN-Address 7 ipaddr ATTRIBUTE 3GPP-IMSI-MCC-MNC 8 string ATTRIBUTE 3GPP-GGSN-MCC-MNC 9 string ATTRIBUTE 3GPP-NSAPI 10 string -ATTRIBUTE 3GPP-Session-Stop-Indicator 11 octets +ATTRIBUTE 3GPP-Session-Stop-Indicator 11 byte ATTRIBUTE 3GPP-Selection-Mode 12 string ATTRIBUTE 3GPP-Charging-Characteristics 13 string ATTRIBUTE 3GPP-Charging-Gateway-IPv6-Address 14 ipv6addr @@ -36,21 +34,26 @@ ATTRIBUTE 3GPP-SGSN-IPv6-Address 15 ipv6addr ATTRIBUTE 3GPP-GGSN-IPv6-Address 16 ipv6addr # -# This attribute is really an array of IPv6 addresses. -# Why the heck couldn't they just send multiple attributes? +# This attribute is really an array of IPv6 addresses. +# Why the heck couldn't they just send multiple attributes? # ATTRIBUTE 3GPP-IPv6-DNS-Servers 17 octets ATTRIBUTE 3GPP-SGSN-MCC-MNC 18 string -ATTRIBUTE 3GPP-Teardown-Indicator 19 octets +ATTRIBUTE 3GPP-Teardown-Indicator 19 byte ATTRIBUTE 3GPP-IMEISV 20 string -ATTRIBUTE 3GPP-RAT-Type 21 integer +ATTRIBUTE 3GPP-RAT-Type 21 byte + +# +# See http://www.3gpp.org/DynaReport/29061.htm +# http://www.3gpp.org/DynaReport/29274.htm +# ATTRIBUTE 3GPP-User-Location-Info 22 octets -ATTRIBUTE 3GPP-MS-TimeZone 23 octets +ATTRIBUTE 3GPP-MS-TimeZone 23 octets[2] ATTRIBUTE 3GPP-Camel-Charging-Info 24 octets ATTRIBUTE 3GPP-Packet-Filter 25 octets -ATTRIBUTE 3GPP-Negotiated-DSCP 26 integer -ATTRIBUTE 3GPP-Allocate-IP-Type 27 integer +ATTRIBUTE 3GPP-Negotiated-DSCP 26 byte +ATTRIBUTE 3GPP-Allocate-IP-Type 27 byte ATTRIBUTE External-Identifier 28 octets ATTRIBUTE TWAN-Identifier 29 octets @@ -83,28 +86,27 @@ ATTRIBUTE 3GPP-Session-Id 128 octets ATTRIBUTE 3GPP-GCI 129 octets ATTRIBUTE Supported-Features 628 tlv -VALUE 3GPP-PDP-Type IPv4 0 -VALUE 3GPP-PDP-Type PPP 1 -VALUE 3GPP-PDP-Type IPv6 2 -VALUE 3GPP-PDP-Type IPv4v6 3 +VALUE 3GPP-PDP-Type IPv4 0 +VALUE 3GPP-PDP-Type PPP 1 +VALUE 3GPP-PDP-Type IPv6 2 +VALUE 3GPP-PDP-Type IPv4v6 3 -VALUE 3GPP-RAT-Type Reserved 0 -VALUE 3GPP-RAT-Type UTRAN 1 -VALUE 3GPP-RAT-Type GERAN 2 -VALUE 3GPP-RAT-Type WLAN 3 -VALUE 3GPP-RAT-Type GAN 4 -VALUE 3GPP-RAT-Type HSPA-Evolution 5 -VALUE 3GPP-RAT-Type EUTRAN 6 -VALUE 3GPP-RAT-Type Virtual 7 -VALUE 3GPP-RAT-Type IEEE-802-16e 101 -VALUE 3GPP-RAT-Type 3GPP2-eHRPD 102 -VALUE 3GPP-RAT-Type 3GPP2-HRPD 103 -VALUE 3GPP-RAT-Type 3GPP2-1xRTT 104 -VALUE 3GPP-RAT-Type 3GPP2-UMB 105 +VALUE 3GPP-RAT-Type Reserved 0 +VALUE 3GPP-RAT-Type UTRAN 1 +VALUE 3GPP-RAT-Type GERAN 2 +VALUE 3GPP-RAT-Type WLAN 3 +VALUE 3GPP-RAT-Type GAN 4 +VALUE 3GPP-RAT-Type HSPA-Evolution 5 +VALUE 3GPP-RAT-Type EUTRAN 6 +VALUE 3GPP-RAT-Type Virtual 7 +VALUE 3GPP-RAT-Type IEEE-802.16e 101 +VALUE 3GPP-RAT-Type 3GPP2-eHRPD 102 +VALUE 3GPP-RAT-Type 3GPP2-HRPD 103 +VALUE 3GPP-RAT-Type 3GPP2-1xRTT 104 -VALUE 3GPP-Allocate-IP-Type Do-Not-Allocate-IPv4-IPv6 0 -VALUE 3GPP-Allocate-IP-Type Allocate-IPv4 1 -VALUE 3GPP-Allocate-IP-Type Allocate-IPv6-Prefix 2 -VALUE 3GPP-Allocate-IP-Type Allocate-IPv4-IPv6-Prefix 3 +VALUE 3GPP-Allocate-IP-Type Do-Not-Allocate 0 +VALUE 3GPP-Allocate-IP-Type Allocate-IPv4-Address 1 +VALUE 3GPP-Allocate-IP-Type Allocate-IPv6-Prefix 2 +VALUE 3GPP-Allocate-IP-Type Allocate-IPv4-and-IPv6 3 -END-VENDOR 3GPP +END-VENDOR 3GPP diff --git a/resources/protocols/radius/dictionary.3gpp2 b/resources/protocols/radius/dictionary.3gpp2 index 5593d379..28cf6943 100644 --- a/resources/protocols/radius/dictionary.3gpp2 +++ b/resources/protocols/radius/dictionary.3gpp2 @@ -1,4 +1,6 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # 3GPP2 stuff. # @@ -32,18 +34,18 @@ ATTRIBUTE 3GPP2-Diffserv-Class-Option 5 integer # Contains embedded 3GPP2 accounting attributes. ATTRIBUTE 3GPP2-Accounting-Container 6 octets -ATTRIBUTE 3GPP2-Home-Agent-IP-Address 7 octets ## if 4 octets: ipaddr; if 16: ipv6 address +ATTRIBUTE 3GPP2-Home-Agent-IP-Address 7 combo-ip # A number formed from the concatenation of the home RADIUS IP address, # the FA IP address, and a 32-bit Unix timestamp, all encoded as 8 ASCII # hex characters. -ATTRIBUTE 3GPP2-KeyID 8 string # 20 octets +ATTRIBUTE 3GPP2-KeyID 8 string # 20 octets ATTRIBUTE 3GPP2-PCF-IP-Address 9 ipaddr -ATTRIBUTE 3GPP2-BSID 10 string -ATTRIBUTE 3GPP2-User-Id 11 integer -ATTRIBUTE 3GPP2-Forward-FCH-Mux-Option 12 integer -ATTRIBUTE 3GPP2-Reverse-FCH-Mux-Option 13 integer +ATTRIBUTE 3GPP2-BSID 10 string +ATTRIBUTE 3GPP2-User-Id 11 integer +ATTRIBUTE 3GPP2-Forward-FCH-Mux-Option 12 integer +ATTRIBUTE 3GPP2-Reverse-FCH-Mux-Option 13 integer # # 14-15 ? # @@ -53,7 +55,7 @@ ATTRIBUTE 3GPP2-Reverse-Traffic-Type 18 integer ATTRIBUTE 3GPP2-FCH-Frame-Size 19 integer ATTRIBUTE 3GPP2-Forward-FCH-RC 20 integer ATTRIBUTE 3GPP2-Reverse-FCH-RC 21 integer -ATTRIBUTE 3GPP2-IP-Technology 22 integer +ATTRIBUTE 3GPP2-IP-Technology 22 integer ATTRIBUTE 3GPP2-Compulsory-Tunnel-Indicator 23 integer ATTRIBUTE 3GPP2-Release-Indicator 24 integer ATTRIBUTE 3GPP2-Bad-PPP-Frame-Count 25 integer @@ -66,338 +68,364 @@ ATTRIBUTE 3GPP2-Originating-SDB-OCtet-Count 32 integer ATTRIBUTE 3GPP2-Terminating-Number-SDBs 33 integer ATTRIBUTE 3GPP2-Originating-Number-SDBs 34 integer # 35 ? -ATTRIBUTE 3GPP2-IP-QoS 36 integer +ATTRIBUTE 3GPP2-IP-QoS 36 integer # 37-38 ? -ATTRIBUTE 3GPP2-Airlink-Priority 39 integer -ATTRIBUTE 3GPP2-Airlink-Record-Type 40 integer -ATTRIBUTE 3GPP2-R-P-Session-ID 41 octets +ATTRIBUTE 3GPP2-Airlink-Priority 39 integer +ATTRIBUTE 3GPP2-Airlink-Record-Type 40 integer +ATTRIBUTE 3GPP2-R-P-Session-ID 41 octets ATTRIBUTE 3GPP2-Airlink-Sequence-Number 42 integer -ATTRIBUTE 3GPP2-Received-HDLC-Octets 43 integer -ATTRIBUTE 3GPP2-Correlation-Id 44 string +ATTRIBUTE 3GPP2-Received-HDLC-Octets 43 integer +ATTRIBUTE 3GPP2-Correlation-Id 44 string ATTRIBUTE 3GPP2-Module-Orig-Term-Indicator 45 integer ATTRIBUTE 3GPP2-Inbound-Mobile-IP-Sig-Octets 46 integer ATTRIBUTE 3GPP2-Outbound-Mobile-IP-Sig-Octets 47 integer -ATTRIBUTE 3GPP2-Session-Continue 48 integer -ATTRIBUTE 3GPP2-Active-Time 49 integer -ATTRIBUTE 3GPP2-DCCH-Frame-Size 50 integer -ATTRIBUTE 3GPP2-Begin-Session 51 integer -ATTRIBUTE 3GPP2-ESN 52 string +ATTRIBUTE 3GPP2-Session-Continue 48 integer +ATTRIBUTE 3GPP2-Active-Time 49 integer +ATTRIBUTE 3GPP2-DCCH-Frame-Size 50 integer +ATTRIBUTE 3GPP2-Begin-Session 51 integer +ATTRIBUTE 3GPP2-ESN 52 string # 53 ? -ATTRIBUTE 3GPP2-S-Key 54 octets -ATTRIBUTE 3GPP2-S-Request 55 integer -ATTRIBUTE 3GPP2-S-Lifetime 56 date -ATTRIBUTE 3GPP2-MN-HA-SPI 57 integer -ATTRIBUTE 3GPP2-MN-HA-Shared-Key 58 string encrypt=2 +ATTRIBUTE 3GPP2-S-Key 54 octets +ATTRIBUTE 3GPP2-S-Request 55 integer +ATTRIBUTE 3GPP2-S-Lifetime 56 date +ATTRIBUTE 3GPP2-MN-HA-SPI 57 integer +ATTRIBUTE 3GPP2-MN-HA-Shared-Key 58 string encrypt=2 # The next set of attributes contain sub-types -ATTRIBUTE 3GPP2-Remote-IP-Address 59 octets +ATTRIBUTE 3GPP2-Remote-IP-Address 59 tlv +BEGIN-TLV 3GPP2-Remote-IP-Address + ATTRIBUTE 3GPP2-Remote-IP-Address-Value 1 ipaddr + ATTRIBUTE 3GPP2-Remote-IP-Address-Mask 2 integer + ATTRIBUTE 3GPP2-Remote-IP-Qualifier 3 short +END-TLV 3GPP2-Remote-IP-Address ATTRIBUTE 3GPP2-HRPD-Access/Terminal-Authentication-and-1x-Access-Authorization 60 integer -ATTRIBUTE 3GPP2-AT-Hardware-Identifier 61 integer -BEGIN-TLV - ATTRIBUTE AT-hardware-identifier-type 1 string - ATTRIBUTE AT-hardware-identifier-value 2 string -END-TLV +ATTRIBUTE 3GPP2-AT-Hardware-Identifier 61 tlv +BEGIN-TLV 3GPP2-AT-Hardware-Identifier + ATTRIBUTE AT-hardware-identifier-type 1 integer + ATTRIBUTE AT-hardware-identifier-value 2 octets +END-TLV 3GPP2-AT-Hardware-Identifier # 62 - 69 are marked "reserved" -ATTRIBUTE 3GPP2-Remote-IPv6-Address 70 octets -ATTRIBUTE 3GPP2-Remote-Address-Table-Index 71 octets -ATTRIBUTE 3GPP2-Remote-IPv4-Addr-Octet-Count 72 octets -ATTRIBUTE 3GPP2-Allowed-Diffserv-Marking 73 tlv +ATTRIBUTE 3GPP2-Remote-IPv6-Address 70 tlv +BEGIN-TLV 3GPP2-Remote-IP-Address + ATTRIBUTE 3GPP2-Remote-IPv6-Address-Value 1 ipv6addr + ATTRIBUTE 3GPP2-Remote-IPv6-Address-Prefix-Length 2 integer + ATTRIBUTE 3GPP2-Remote-IPv6-Address-Qualifier 3 short +END-TLV 3GPP2-Remote-IP-Address + +ATTRIBUTE 3GPP2-Remote-Address-Table-Index 71 tlv +BEGIN-TLV 3GPP2-Remote-Address-Table-Index + ATTRIBUTE 3GPP2-Remote-Address-Table-Index-Value 1 short + ATTRIBUTE 3GPP2-Remote-Address-Table-Index-Qualifier 2 short +END-TLV 3GPP2-Remote-Address-Table-Index + +ATTRIBUTE 3GPP2-Remote-IPv4-Addr-Octet-Count 72 tlv +BEGIN-TLV 3GPP2-Remote-IPv4-Addr-Octet-Count + ATTRIBUTE 3GPP2-Remote-IPv4-Addr-Octet-Count-Address 1 ipaddr + ATTRIBUTE 3GPP2-Remote-IPv4-Addr-Octet-Count-Mask 2 integer + ATTRIBUTE 3GPP2-Remote-IPv4-Addr-Octet-Count-Forward 3 integer + ATTRIBUTE 3GPP2-Remote-IPv4-Addr-Octet-Count-Reverse 4 integer + ATTRIBUTE 3GPP2-Remote-IPv4-Addr-Octet-Count-Table-Index 5 short + ATTRIBUTE 3GPP2-Remote-IPv4-Addr-Octet-Count-Forward-Overflow 6 short + ATTRIBUTE 3GPP2-Remote-IPv4-Addr-Octet-Count-Reverse-Overflow 7 short +END-TLV 3GPP2-Remote-IPv4-Addr-Octet-Count +ATTRIBUTE 3GPP2-Allowed-Diffserv-Marking 73 tlv BEGIN-TLV 3GPP2-Allowed-Diffserv-Marking ATTRIBUTE flags-for-Allowed-Diffserv-class 1 string - ATTRIBUTE Max-class-selection-marking 2 string - ATTRIBUTE Reverse-tunnel-marking 3 string + ATTRIBUTE Max-class-selection-marking 2 string + ATTRIBUTE Reverse-tunnel-marking 3 string END-TLV 3GPP2-Allowed-Diffserv-Marking #contains subtypes -ATTRIBUTE 3GPP2-Service-Option-Profile 74 tlv +ATTRIBUTE 3GPP2-Service-Option-Profile 74 tlv BEGIN-TLV 3GPP2-Service-Option-Profile - ATTRIBUTE service-option 1 integer + ATTRIBUTE service-option 1 integer END-TLV 3GPP2-Service-Option-Profile # the following don't contain subtypes -ATTRIBUTE 3GPP2-DNS-Update-Required 75 integer +ATTRIBUTE 3GPP2-DNS-Update-Required 75 integer # 76 ? # 77 ? -ATTRIBUTE 3GPP2-Always-On 78 integer -ATTRIBUTE 3GPP2-Foreign-Agent-Address 79 ipaddr -ATTRIBUTE 3GPP2-Last-User-Activity-Time 80 integer -ATTRIBUTE 3GPP2-MN-AAA-Removal-Indication 81 integer +ATTRIBUTE 3GPP2-Always-On 78 integer +ATTRIBUTE 3GPP2-Foreign-Agent-Address 79 ipaddr +ATTRIBUTE 3GPP2-Last-User-Activity-Time 80 integer +ATTRIBUTE 3GPP2-MN-AAA-Removal-Indication 81 integer ATTRIBUTE 3GPP2-RN-Packet-Data-Inactivity-Timer 82 integer -ATTRIBUTE 3GPP2-Forward-PDCH-RC 83 integer -ATTRIBUTE 3GPP2-Forward-DCCH-Mux-Option 84 integer -ATTRIBUTE 3GPP2-Reverse-DCCH-Mux-Option 85 integer -ATTRIBUTE 3GPP2-Forward-DCCH-RC 86 integer -ATTRIBUTE 3GPP2-Reverse-DHHC-RC 87 integer +ATTRIBUTE 3GPP2-Forward-PDCH-RC 83 integer +ATTRIBUTE 3GPP2-Forward-DCCH-Mux-Option 84 integer +ATTRIBUTE 3GPP2-Reverse-DCCH-Mux-Option 85 integer +ATTRIBUTE 3GPP2-Forward-DCCH-RC 86 integer +ATTRIBUTE 3GPP2-Reverse-DHHC-RC 87 integer ATTRIBUTE 3GPP2-Session-Termination-Capability 88 integer -ATTRIBUTE 3GPP2-Allowed-Persistent-TFTs 89 integer +ATTRIBUTE 3GPP2-Allowed-Persistent-TFTs 89 integer -# The next set of attributes contain sub-types -ATTRIBUTE 3GPP2-Prepaid-Acct-Quota 90 tlv +ATTRIBUTE 3GPP2-Prepaid-Acct-Quota 90 tlv BEGIN-TLV 3GPP2-Prepaid-Acct-Quota - ATTRIBUTE QID 1 integer - ATTRIBUTE VolumeQuota 2 integer - ATTRIBUTE VolumeQuotaOverflow 3 m2integer - ATTRIBUTE VolumeThreshold 4 integer - ATTRIBUTE VolumeThreshouldOverflow 5 integer - ATTRIBUTE DurationQuota 6 integer - ATTRIBUTE DurationThreshold 7 integer - ATTRIBUTE Update-Reason 8 integer + ATTRIBUTE QID 1 integer + ATTRIBUTE VolumeQuota 2 integer + ATTRIBUTE VolumeQuotaOverflow 3 m2integer + ATTRIBUTE VolumeThreshold 4 integer + ATTRIBUTE VolumeThreshouldOverflow 5 integer + ATTRIBUTE DurationQuota 6 integer + ATTRIBUTE DurationThreshold 7 integer + ATTRIBUTE Update-Reason 8 integer END-TLV 3GPP2-Prepaid-Acct-Quota -#contains sub-types -ATTRIBUTE 3GPP2-Prepaid-acct-Capability 91 tlv +ATTRIBUTE 3GPP2-Prepaid-acct-Capability 91 tlv BEGIN-TLV 3GPP2-Prepaid-acct-Capability - ATTRIBUTE AvailableInClient 1 integer - ATTRIBUTE SelectedForSession 2 integer + ATTRIBUTE AvailableInClient 1 integer + ATTRIBUTE SelectedForSession 2 integer END-TLV 3GPP2-Prepaid-acct-Capability -ATTRIBUTE 3GPP2-MIP-Lifetime 92 octets +ATTRIBUTE 3GPP2-MIP-Lifetime 92 octets -ATTRIBUTE 3GPP2-Acct-Stop-Trigger 93 integer +ATTRIBUTE 3GPP2-Acct-Stop-Trigger 93 integer # contains subtypes -ATTRIBUTE 3GPP2-Service-Reference-Id 94 octets - -ATTRIBUTE 3GPP2-DNS-Update-Capability 95 integer -ATTRIBUTE 3GPP2-Disconnect-Reason 96 integer - -# The next set of attributes contain sub-types -ATTRIBUTE 3GPP2-Remote-IPv6-Octet-Count 97 octets -#contains sub-types -ATTRIBUTE 3GPP2-PrePaid-Tariff-Switching 98 tlv +ATTRIBUTE 3GPP2-Service-Reference-Id 94 tlv +BEGIN-TLV 3GPP2-Service-Reference-Id + ATTRIBUTE 3GPP2-Service-Reference-Id-Value 1 short + ATTRIBUTE 3GPP2-Service-Reference-Main-SC-Indicator 2 short +END-TLV 3GPP2-Service-Reference-Id + +ATTRIBUTE 3GPP2-DNS-Update-Capability 95 integer +ATTRIBUTE 3GPP2-Disconnect-Reason 96 integer + +ATTRIBUTE 3GPP2-Remote-IPv6-Octet-Count 97 tlv +BEGIN-TLV 3GPP2-Remote-IPv6-Octet-Count + ATTRIBUTE 3GPP2-Remote-IPv6-Count-Address 1 ipv6addr + ATTRIBUTE 3GPP2-Remote-IPv6-Prefix-Length 2 short + ATTRIBUTE 3GPP2-Remote-IPv6-Forward-Octet-Count 3 integer + ATTRIBUTE 3GPP2-Remote-IPv6-Reverse-Octet-Count 4 integer + ATTRIBUTE 3GPP2-Remote-IPv6-Table-Index 5 short + ATTRIBUTE 3GPP2-Remote-IPv6-Reverse-Octet-Count-Overflow 6 short +END-TLV 3GPP2-Remote-IPv6-Octet-Count + +ATTRIBUTE 3GPP2-PrePaid-Tariff-Switching 98 tlv BEGIN-TLV 3GPP2-PrePaid-Tariff-Switching - ATTRIBUTE QuotaIDentifier 1 integer - ATTRIBUTE VolumeUsedAfterTariffSwitch 2 integer - ATTRIBUTE VolumeUsedATSOverflow 3 integer - ATTRIBUTE TariffSwitchInterval 4 integer + ATTRIBUTE QuotaIDentifier 1 integer + ATTRIBUTE VolumeUsedAfterTariffSwitch 2 integer + ATTRIBUTE VolumeUsedATSOverflow 3 integer + ATTRIBUTE TariffSwitchInterval 4 integer ATTRIBUTE TimeIntervalafterTariffSwitchUpdate 5 integer END-TLV 3GPP2-PrePaid-Tariff-Switching -#contain sub-types -ATTRIBUTE 3GPP2-Authorization-Parameters 99 tlv + +ATTRIBUTE 3GPP2-Authorization-Parameters 99 tlv BEGIN-TLV 3GPP2-Authorization-Parameters - ATTRIBUTE BAK-Identifier 1 integer - ATTRIBUTE Timestamp-long 2 integer - ATTRIBUTE Authorization-Signature 3 string + ATTRIBUTE BAK-Identifier 1 integer + ATTRIBUTE Timestamp-long 2 integer + ATTRIBUTE Authorization-Signature 3 string END-TLV 3GPP2-Authorization-Parameters +ATTRIBUTE 3GPP2-BCMCS_FLOW_ID 100 octets -ATTRIBUTE 3GPP2-BCMCS_FLOW_ID 100 bytes - -#contain sub-types -ATTRIBUTE 3GPP2-BCMCS-Capability 101 tlv +ATTRIBUTE 3GPP2-BCMCS-Capability 101 tlv BEGIN-TLV 3GPP2-BCMCS-Capability - ATTRIBUTE Protocol-Revision 1 integer + ATTRIBUTE Protocol-Revision 1 integer END-TLV 3GPP2-BCMCS-Capability -#contain sub-types -ATTRIBUTE 3GPP2-Common-Session-Info 102 tlv +ATTRIBUTE 3GPP2-Common-Session-Info 102 tlv BEGIN-TLV 3GPP2-Common-Session-Info - ATTRIBUTE BCMCS_FLOW_ID 1 bytes - ATTRIBUTE Program-Start-Time 2 date - ATTRIBUTE Program-End-Time 3 date + ATTRIBUTE BCMCS_FLOW_ID 1 bytes + ATTRIBUTE Program-Start-Time 2 date + ATTRIBUTE Program-End-Time 3 date ATTRIBUTE Program-Allowed-Registration-Time(seconds) 4 integer - ATTRIBUTE Authorization-Required-Flag 5 string - ATTRIBUTE QoS-Parameter 6 integer #?? - ATTRIBUTE BCMCS_Flow_Priority 7 integer + ATTRIBUTE Authorization-Required-Flag 5 string + ATTRIBUTE QoS-Parameter 6 integer #?? + ATTRIBUTE BCMCS_Flow_Priority 7 integer END-TLV 3GPP2-Common-Session-Info -#contain sub-types -ATTRIBUTE BSN-Session-Info 103 tlv +ATTRIBUTE BSN-Session-Info 103 tlv BEGIN-TLV BSN-Session-Info - ATTRIBUTE BCMCS_FLOW_ID 1 bytes - ATTRIBUTE Multicast-IP-Address 2 ipaddr - ATTRIBUTE Destination-Port-Number 3 integer + ATTRIBUTE BCMCS_FLOW_ID 1 bytes + ATTRIBUTE Multicast-IP-Address 2 ipaddr + ATTRIBUTE Destination-Port-Number 3 integer ATTRIBUTE Header-Compression-Algorithm 4 string - ATTRIBUTE CID 5 string - ATTRIBUTE MAX-CID 6 integer - ATTRIBUTE Compression-Profile 7 integer - ATTRIBUTE MAX-Header-Size 8 integer - ATTRIBUTE MRRU 9 integer + ATTRIBUTE CID 5 string + ATTRIBUTE MAX-CID 6 integer + ATTRIBUTE Compression-Profile 7 integer + ATTRIBUTE MAX-Header-Size 8 integer + ATTRIBUTE MRRU 9 integer ATTRIBUTE Content-Server-Source-IP-Address 10 ipaddr ATTRIBUTE Content-Server-Source-IPv6-Address 11 ipv6addr END-TLV BSN-Session-Info -#contain sub-types -ATTRIBUTE RAN-Session-Info 104 tlv +ATTRIBUTE RAN-Session-Info 104 tlv BEGIN-TLV RAN-Session-Info - ATTRIBUTE BCMCS_FLOW_ID 1 integer - ATTRIBUTE Encryption-Mechanism 2 integer - ATTRIBUTE BAK-Identifier 3 integer - ATTRIBUTE BAK 4 string - ATTRIBUTE BAK-Expire-Time 5 string - ATTRIBUTE Session-Bandwidth 6 integer + ATTRIBUTE BCMCS_FLOW_ID 1 integer + ATTRIBUTE Encryption-Mechanism 2 integer + ATTRIBUTE BAK-Identifier 3 integer + ATTRIBUTE BAK 4 string + ATTRIBUTE BAK-Expire-Time 5 string + ATTRIBUTE Session-Bandwidth 6 integer END-TLV RAN-Session-Info - -ATTRIBUTE Reason-Code 105 integer -ATTRIBUTE 3GPP2-BCMCS-Flow-Transmission-Time 107 date -#contain sub-types -ATTRIBUTE 3GPP2-Subnet 108 tlv +ATTRIBUTE Reason-Code 105 integer +ATTRIBUTE 3GPP2-BCMCS-Flow-Transmission-Time 107 date + +ATTRIBUTE 3GPP2-Subnet 108 tlv BEGIN-TLV 3GPP2-Subnet - ATTRIBUTE Subnet 1 bytes - ATTRIBUTE Sector-ID 2 bytes + ATTRIBUTE Subnet 1 bytes + ATTRIBUTE Sector-ID 2 bytes END-TLV 3GPP2-Subnet -ATTRIBUTE 3GPP2-Multicast-IP-Address 109 ipaddr -ATTRIBUTE 3GPP2-Port 110 integer +ATTRIBUTE 3GPP2-Multicast-IP-Address 109 ipaddr +ATTRIBUTE 3GPP2-Port 110 integer -#contain sub-typess -ATTRIBUTE 3GPP2-TK-Info 112 tlv +ATTRIBUTE 3GPP2-TK-Info 112 tlv BEGIN-TLV 3GPP2-TK-Info - ATTRIBUTE TK 1 integer - ATTRIBUTE TK_RAND 2 integer + ATTRIBUTE TK 1 integer + ATTRIBUTE TK_RAND 2 integer END-TLV 3GPP2-TK-Info -#contain sub-types -ATTRIBUTE 3GPP2-BAK-ID 113 tlv + +ATTRIBUTE 3GPP2-BAK-ID 113 tlv BEGIN-TLV 3GPP2-BAK-ID - ATTRIBUTE BAK_ID 1 integer - ATTRIBUTE BAK_Expire 2 integer + ATTRIBUTE BAK_ID 1 integer + ATTRIBUTE BAK_Expire 2 integer END-TLV 3GPP2-BAK-ID -ATTRIBUTE 3GPP2-Reverse-PDCH-RC 114 integer -ATTRIBUTE 3GPP2-MEID 116 string -#contain sub-types -ATTRIBUTE 3GPP2-DNS-Server-IP-Address 117 tlv +ATTRIBUTE 3GPP2-Reverse-PDCH-RC 114 integer +ATTRIBUTE 3GPP2-MEID 116 string + +ATTRIBUTE 3GPP2-DNS-Server-IP-Address 117 tlv BEGIN-TLV 3GPP2-DNS-Server-IP-Address - ATTRIBUTE Primary-DNS-Server 1 ipaddr - ATTRIBUTE Secondary-DNS-Server 2 ipaddr - ATTRIBUTE Flag 3 integer - ATTRIBUTE Entity-Type 4 integer + ATTRIBUTE Primary-DNS-Server 1 ipaddr + ATTRIBUTE Secondary-DNS-Server 2 ipaddr + ATTRIBUTE Flag 3 integer + ATTRIBUTE Entity-Type 4 integer END-TLV 3GPP2-DNS-Server-IP-Address ATTRIBUTE 3GPP2-MIP6-Home-Agent-Address-From-BU 118 ipv6addr -ATTRIBUTE 3GPP2-MIP6-Care-of-Address 119 ipv6addr -ATTRIBUTE 3GPP2-Home-Agent-Not-Authorized 120 integer -ATTRIBUTE 3GPP2-MIP6-Session-Key 121 octets +ATTRIBUTE 3GPP2-MIP6-Care-of-Address 119 ipv6addr +ATTRIBUTE 3GPP2-Home-Agent-Not-Authorized 120 integer +ATTRIBUTE 3GPP2-MIP6-Session-Key 121 octets ATTRIBUTE 3GPP2-Hot-Line-Accounting-Information 122 string -ATTRIBUTE 3GPP2-MIP6-Mesg-ID 123 octets -ATTRIBUTE 3GPP2-Filter-Rule 124 string -ATTRIBUTE 3GPP2-HTTP-Redirection-Rule 125 string -ATTRIBUTE 3GPP2-IP-Redirection-Rule 126 string -ATTRIBUTE 3GPP2-Hot-Line-Capability 127 integer -ATTRIBUTE 3GPP2-MIP6-Home-Link-Prefix-Attr-A 128 octets +ATTRIBUTE 3GPP2-MIP6-Mesg-ID 123 octets +ATTRIBUTE 3GPP2-Filter-Rule 124 string +ATTRIBUTE 3GPP2-HTTP-Redirection-Rule 125 string +ATTRIBUTE 3GPP2-IP-Redirection-Rule 126 string +ATTRIBUTE 3GPP2-Hot-Line-Capability 127 integer +ATTRIBUTE 3GPP2-MIP6-Home-Link-Prefix-Attr-A 128 octets -ATTRIBUTE 3GPP2-Max-Authorized-Aggr-Bandwidth 130 integer +ATTRIBUTE 3GPP2-Max-Authorized-Aggr-Bandwidth 130 integer -# The next set of attributes contain sub-types -ATTRIBUTE 3GPP2-Authorized-Flow-Profile-IDs 131 tlv +ATTRIBUTE 3GPP2-Authorized-Flow-Profile-IDs 131 tlv BEGIN-TLV 3GPP2-Authorized-Flow-Profile-IDs - ATTRIBUTE ProfileID_Forward 1 string - ATTRIBUTE ProfileID_Reverse 2 string - ATTRIBUTE ProfileID_Bi-direction 3 string + ATTRIBUTE ProfileID_Forward 1 string + ATTRIBUTE ProfileID_Reverse 2 string + ATTRIBUTE ProfileID_Bi-direction 3 string END-TLV 3GPP2-Authorized-Flow-Profile-IDs -ATTRIBUTE 3GPP2-Granted-QoS-Parameters 132 tlv +ATTRIBUTE 3GPP2-Granted-QoS-Parameters 132 tlv BEGIN-TLV 3GPP2-Granted-QoS-Parameters - ATTRIBUTE Direction 1 integer - ATTRIBUTE FLOW_ID 2 integer - ATTRIBUTE QoS_ATTRIBUTE_SET_ID 3 integer - ATTRIBUTE FlowProfileID 4 integer - ATTRIBUTE Traffic_Class 5 string - ATTRIBUTE Peak_Rate 6 string - ATTRIBUTE Bucket_Size 7 string - ATTRIBUTE Token_Rate 8 string - ATTRIBUTE Max_Latency 9 string - ATTRIBUTE Max_IP_Packet_Loss_Rate 10 string - ATTRIBUTE Packet_Size 11 string - ATTRIBUTE Delay_Var_Sensitive 12 string + ATTRIBUTE Direction 1 integer + ATTRIBUTE FLOW_ID 2 integer + ATTRIBUTE QoS_ATTRIBUTE_SET_ID 3 integer + ATTRIBUTE FlowProfileID 4 integer + ATTRIBUTE Traffic_Class 5 string + ATTRIBUTE Peak_Rate 6 string + ATTRIBUTE Bucket_Size 7 string + ATTRIBUTE Token_Rate 8 string + ATTRIBUTE Max_Latency 9 string + ATTRIBUTE Max_IP_Packet_Loss_Rate 10 string + ATTRIBUTE Packet_Size 11 string + ATTRIBUTE Delay_Var_Sensitive 12 string END-TLV 3GPP2-Granted-QoS-Parameters -ATTRIBUTE 3GPP2-Maximum-Per-Flow-Priority 133 integer -ATTRIBUTE 3GPP2-MIP6-Authenticator 134 octets +ATTRIBUTE 3GPP2-Maximum-Per-Flow-Priority 133 integer +ATTRIBUTE 3GPP2-MIP6-Authenticator 134 octets -ATTRIBUTE 3GPP2-MIP6-MAC-Mobility-Data 138 octets -ATTRIBUTE 3GPP2-Inter-User-Priority 139 integer +ATTRIBUTE 3GPP2-MIP6-MAC-Mobility-Data 138 octets +ATTRIBUTE 3GPP2-Inter-User-Priority 139 integer ATTRIBUTE 3GPP2-MIP6-Home-Agent-Address-Attr-B 140 ipv6addr -ATTRIBUTE 3GPP2-MIP6-HOA-Received-From-BU 141 ipv6addr -ATTRIBUTE 3GPP2-Carrier-ID 142 octets -ATTRIBUTE 3GPP2-GMT-Time-Zone-Offset 143 integer +ATTRIBUTE 3GPP2-MIP6-HOA-Received-From-BU 141 ipv6addr +ATTRIBUTE 3GPP2-Carrier-ID 142 octets +ATTRIBUTE 3GPP2-GMT-Time-Zone-Offset 143 integer # contains subtypes -ATTRIBUTE 3GPP2-Flow-ID-Parameter 144 octets +ATTRIBUTE 3GPP2-Flow-ID-Parameter 144 octets -ATTRIBUTE 3GPP2-Flow-Status 145 integer +ATTRIBUTE 3GPP2-Flow-Status 145 integer ATTRIBUTE 3GPP2-Filtered-Octet-Count-Terminating 146 integer ATTRIBUTE 3GPP2-Filtered-Octet-Count-Originating 147 integer -ATTRIBUTE 3GPP2-RSVP-Inbound-Octet-Count 162 integer -ATTRIBUTE 3GPP2-RSVP-Outbound-Octet-Count 163 integer -ATTRIBUTE 3GPP2-RSVP-Inbound-Packet-Count 164 integer -ATTRIBUTE 3GPP2-RSVP-Outbound-Packet-Count 165 integer +ATTRIBUTE 3GPP2-RSVP-Inbound-Octet-Count 162 integer +ATTRIBUTE 3GPP2-RSVP-Outbound-Octet-Count 163 integer +ATTRIBUTE 3GPP2-RSVP-Inbound-Packet-Count 164 integer +ATTRIBUTE 3GPP2-RSVP-Outbound-Packet-Count 165 integer -ATTRIBUTE 3GPP2-HA-Request 168 integer -ATTRIBUTE 3GPP2-HA-Authorised 169 integer -ATTRIBUTE 3GPP2-IP-Ver-Authorised 172 integer -ATTRIBUTE 3GPP2-MIPv4-Mesg-Id 173 string +ATTRIBUTE 3GPP2-HA-Request 168 integer +ATTRIBUTE 3GPP2-HA-Authorised 169 integer +ATTRIBUTE 3GPP2-IP-Ver-Authorised 172 integer +ATTRIBUTE 3GPP2-MIPv4-Mesg-Id 173 string ATTRIBUTE 3GPP2-MIP6-HA-Local-Assignment-Capblty 179 integer -ATTRIBUTE 3GPP2-Network-PMIP-NAI 192 string +ATTRIBUTE 3GPP2-Network-PMIP-NAI 192 string ATTRIBUTE 3GPP2-PMIP-Based-Mobility-Capability 193 integer -ATTRIBUTE 3GPP2-Accounting-Mode 198 integer ## ?? +ATTRIBUTE 3GPP2-Accounting-Mode 198 integer ## ?? ATTRIBUTE 3GPP2-HAAA-MIP6-HA-Protocol-Capblty-Ind 203 integer -ATTRIBUTE 3GPP2-VAAA-Assigned-MIP6-HA 205 ipv6addr -ATTRIBUTE 3GPP2-VAAA-Assigned-MIP6-HL 206 octets +ATTRIBUTE 3GPP2-VAAA-Assigned-MIP6-HA 205 ipv6addr +ATTRIBUTE 3GPP2-VAAA-Assigned-MIP6-HL 206 octets ATTRIBUTE 3GPP2-VAAA-MIP6-HA-Protocol-Capblty-Ind 207 integer -ATTRIBUTE 3GPP2-DNS-Server-IPV6-Address 214 tlv +ATTRIBUTE 3GPP2-DNS-Server-IPV6-Address 214 tlv BEGIN-TLV 3GPP2-DNS-Server-IPV6-Address ATTRIBUTE Primary-DNS-Server-IPV6-ADDRESS 1 ipv6addr ATTRIBUTE Secondary-DNS-Server-IPV6-ADDRESS 2 ipv6addr - ATTRIBUTE Flag 3 string - ATTRIBUTE Entity-Type 4 string + ATTRIBUTE Flag 3 string + ATTRIBUTE Entity-Type 4 string END-TLV 3GPP2-DNS-Server-IPV6-Address VALUE 3GPP2-Airlink-Record-Type Connection-Setup 1 VALUE 3GPP2-Airlink-Record-Type Active-Start 2 -VALUE 3GPP2-Airlink-Record-Type Active-Stop 3 +VALUE 3GPP2-Airlink-Record-Type Active-Stop 3 VALUE 3GPP2-Airlink-Record-Type Short-Data-Burst 4 -VALUE Authorization-Required-Flag Authorization-is-not-required-for-this-flow 0 -VALUE Authorization-Required-Flag Authorization-is-required-for-this-flow 1 +VALUE Authorization-Required-Flag Authorization-is-not-required-for-this-flow 0 +VALUE Authorization-Required-Flag Authorization-is-required-for-this-flow 1 -VALUE Reason-Code Reserved 0 -VALUE Reason-Code Authorization-Only 1 -VALUE Reason-Code Session-Discovery-Only 2 -VALUE Reason-Code Authorization-and-Session-Discovery 3 +VALUE Reason-Code Reserved 0 +VALUE Reason-Code Authorization-Only 1 +VALUE Reason-Code Session-Discovery-Only 2 +VALUE Reason-Code Authorization-and-Session-Discovery 3 -VALUE Header-Compression-Algorithm No-Header-Compression 0 -VALUE Header-Compression-Algorithm ROHC-U-mode 1 +VALUE Header-Compression-Algorithm No-Header-Compression 0 +VALUE Header-Compression-Algorithm ROHC-U-mode 1 -VALUE CID Small-CID 0 -VALUE CID Large-CID 1 +VALUE CID Small-CID 0 +VALUE CID Large-CID 1 -VALUE Encryption-Mechanism High-layer-encryption-in-the-Content-Server 0 -VALUE Encryption-Mechanism Link-layer-encryption-in-the-RAN 1 +VALUE Encryption-Mechanism High-layer-encryption-in-the-Content-Server 0 +VALUE Encryption-Mechanism Link-layer-encryption-in-the-RAN 1 -VALUE 3GPP2-PMIP-Based-Mobility-Capability AGW-supports-the-Network-PMIP4-only 1 -VALUE 3GPP2-PMIP-Based-Mobility-Capability AGW-supports-the-Network-PMIP6-only 2 +VALUE 3GPP2-PMIP-Based-Mobility-Capability AGW-supports-the-Network-PMIP4-only 1 +VALUE 3GPP2-PMIP-Based-Mobility-Capability AGW-supports-the-Network-PMIP6-only 2 VALUE 3GPP2-PMIP-Based-Mobility-Capability AGW-supports-the-both-Network-PMIP4-and-PMIP6 3 -VALUE Update-Reason Pre-initializatio 1 -VALUE Update-Reason Initial-request 2 -VALUE Update-Reason Threshold-reached 3 -VALUE Update-Reason Quota-reached 4 -VALUE Update-Reason Remote-Forced-disconnect 5 -VALUE Update-Reason Client-Service-termination 6 -VALUE Update-Reason Main-SI-released 7 -VALUE Update-Reason Service-Instance-not-established 8 -VALUE Update-Reason Tariff-Switch-Update 9 - -VALUE AvailableInClient PrePaid-Accounting-for-Volume-supported 1 -VALUE AvailableInClient PrePaid-Accounting-for-Duration-supported 2 -VALUE AvailableInClient PrePaid-Accounting-for-Volume-and-Duration-supported 3 - -VALUE SelectedForSession PrePaid Accounting not used 0 -VALUE SelectedForSession Usage-of-PrePaid-Accounting-for-Volume 1 -VALUE SelectedForSession Usage-of-PrePaid-Accounting-for-Duration 2 -VALUE SelectedForSession Usage-of-PrePaid-Accounting-for-Volume-and-Duration 3 - -VALUE Flag DNS-IP-Addresses-Provided-By-HAAA-Forcibly 1 -VALUE Flag DNS-IP-Addresses-Provided-By-HAAA-Unobtrusively 0 +VALUE Update-Reason Pre-initializatio 1 +VALUE Update-Reason Initial-request 2 +VALUE Update-Reason Threshold-reached 3 +VALUE Update-Reason Quota-reached 4 +VALUE Update-Reason Remote-Forced-disconnect 5 +VALUE Update-Reason Client-Service-termination 6 +VALUE Update-Reason Main-SI-released 7 +VALUE Update-Reason Service-Instance-not-established 8 +VALUE Update-Reason Tariff-Switch-Update 9 + +VALUE AvailableInClient PrePaid-Accounting-for-Volume-supported 1 +VALUE AvailableInClient PrePaid-Accounting-for-Duration-supported 2 +VALUE AvailableInClient PrePaid-Accounting-for-Volume-and-Duration-supported 3 + +VALUE SelectedForSession PrePaid Accounting not used 0 +VALUE SelectedForSession Usage-of-PrePaid-Accounting-for-Volume 1 +VALUE SelectedForSession Usage-of-PrePaid-Accounting-for-Duration 2 +VALUE SelectedForSession Usage-of-PrePaid-Accounting-for-Volume-and-Duration 3 + +VALUE Flag DNS-IP-Addresses-Provided-By-HAAA-Forcibly 1 +VALUE Flag DNS-IP-Addresses-Provided-By-HAAA-Unobtrusively 0 VALUE Entity-Type HAAA 1 VALUE Entity-Type VAAA 2 diff --git a/resources/protocols/radius/dictionary.acc b/resources/protocols/radius/dictionary.acc index 2510c2e6..c296b141 100644 --- a/resources/protocols/radius/dictionary.acc +++ b/resources/protocols/radius/dictionary.acc @@ -1,7 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # -# dictionary.acc # Dictionary for Acc/Newbridge, models Tigris, Amazon, etc. # Written by Stephane Marzloff <smarzloff@carif-idf.org> # based on specifications available through ftp and the web. diff --git a/resources/protocols/radius/dictionary.acme b/resources/protocols/radius/dictionary.acme index e495bcd2..c783bb11 100644 --- a/resources/protocols/radius/dictionary.acme +++ b/resources/protocols/radius/dictionary.acme @@ -1,7 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # -# dictionary.acme # Acme Packet RADIUS Dictionary # # https://support.acmepacket.com @@ -224,6 +224,18 @@ ATTRIBUTE Acme-Custom-VSA-228 228 string ATTRIBUTE Acme-Custom-VSA-229 229 string ATTRIBUTE Acme-Custom-VSA-230 230 string +ATTRIBUTE Acme-Flow-Calling-Media-Stop-Time-FS1 231 string +ATTRIBUTE Acme-Flow-Called-Media-Stop-Time-FS1 232 string +ATTRIBUTE Acme-Flow-Calling-Media-Stop-Time-FS2 233 string +ATTRIBUTE Acme-Flow-Called-Media-Stop-Time-FS2 234 string +ATTRIBUTE Acme-SIP-Method-Type 235 string +ATTRIBUTE Acme-Domain-Name 236 string +ATTRIBUTE Acme-SIP-Contact 237 string +ATTRIBUTE Acme-SIP-Expires 238 integer +ATTRIBUTE Acme-Reason-Phrase 239 string + +ATTRIBUTE Acme-User-Privilege 253 string + ATTRIBUTE Acme-User-Class 254 string END-VENDOR Acme diff --git a/resources/protocols/radius/dictionary.actelis b/resources/protocols/radius/dictionary.actelis index 9021f62e..845db819 100644 --- a/resources/protocols/radius/dictionary.actelis +++ b/resources/protocols/radius/dictionary.actelis @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Actelis dictionary # -# $Id: 94b6e99842e6afacd3db78d957b350919de5bc66 $ +# $Id: e0710539f3a6a5df2fe8f47346ffab6900b5072b $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.adtran b/resources/protocols/radius/dictionary.adtran new file mode 100644 index 00000000..5abf63ee --- /dev/null +++ b/resources/protocols/radius/dictionary.adtran @@ -0,0 +1,18 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# + +VENDOR Adtran 664 + +BEGIN-VENDOR Adtran + +# Managed WiFi attributes + +ATTRIBUTE Adtran-AP-Name 100 string +ATTRIBUTE Adtran-AP-IP 101 ipaddr +ATTRIBUTE Adtran-AP-Template 102 string +ATTRIBUTE Adtran-SSID 103 string +ATTRIBUTE Adtran-Role 104 string + +END-VENDOR Adtran diff --git a/resources/protocols/radius/dictionary.adva b/resources/protocols/radius/dictionary.adva new file mode 100644 index 00000000..59415c39 --- /dev/null +++ b/resources/protocols/radius/dictionary.adva @@ -0,0 +1,41 @@ +# -*- text -*- +# Copyright (C) 2022 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# Dictionary for ADVA Optical Networking Fiber Service Platform +# +# $Id: b056a70ecdfe84c2b0cd0bd3926040e7846b74f7 $ +# +# http://www.advaoptical.com +# +############################################################################## + +VENDOR Adva 2544 + +BEGIN-VENDOR Adva + +ATTRIBUTE Adva-User-Level 100 integer + +VALUE Adva-User-Level Super 5 +VALUE Adva-User-Level Admin 4 +VALUE Adva-User-Level Provision 3 +VALUE Adva-User-Level Operate_Control 2 +VALUE Adva-User-Level Reserved 1 +VALUE Adva-User-Level Retrieve 0 + +ATTRIBUTE Adva-UUM-User-Level 102 integer + +VALUE Adva-UUM-User-Level Root 5 +VALUE Adva-UUM-User-Level Admin 4 +VALUE Adva-UUM-User-Level Provision 3 +VALUE Adva-UUM-User-Level Operator 2 +VALUE Adva-UUM-User-Level Reserved 1 +VALUE Adva-UUM-User-Level Monitor 0 + +# ADVA Network Manager settings +ATTRIBUTE Adva-Auth-Level-NM 101 string + +END-VENDOR Adva + diff --git a/resources/protocols/radius/dictionary.aerohive b/resources/protocols/radius/dictionary.aerohive index a9586289..162a1aed 100644 --- a/resources/protocols/radius/dictionary.aerohive +++ b/resources/protocols/radius/dictionary.aerohive @@ -1,28 +1,75 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # -# dictionary.aerohive +# Aerohive (now Extreme Networks, Inc.) # -# Aerohive -# -# $Id: 114e4cfda976c0d483c74b2c4785976d5fc6beae $ +# $Id: 53b4daec44ca4be34cea0b68d0ead5d88c25a310 $ # VENDOR Aerohive 26928 BEGIN-VENDOR Aerohive +#BEGIN-VENDOR Extreme + +# Source: http://docs.aerohive.com/330000/docs/help/english/ng/Content/reference/docs/radius-dictionary.htm +# Last-updated-date 25-October-2017 +# Extreme supports a small set of Vendor-Specific-Attributes for +# administrative access to HiveManager Classic, and a different set +# of Vendor-Specific-Attributes for HiveOS. Both are documented in +# this file. + +# Most customer will wish to import this file in it’s entirety into +# their local RADIUS data store. +# Beginning of HiveManager Classic VSAs # The following ATTRIBUTE and VALUE definitions are required. ATTRIBUTE AH-HM-Admin-Group-Id 1 integer VALUE AH-HM-Admin-Group-Id Read-Only-Admin 0 VALUE AH-HM-Admin-Group-Id Super-Admin 1 VALUE AH-HM-Admin-Group-Id Read-Write-Admin 2 -# Attr-26.26928.212 = 0x43382d36362d35442d32462d33432d3430 -# = 4338-3636-3544-3246-3343-3430 -# = C8-66-5D-2F-3C-40 -# = AP Mgt0 MAC Address - # The following is an example of an admin group that you can define. #VALUE AH-HM-Admin-Group-Id Admin-Group100 100 +# End of HiveManager Classic VSAs +# Beginning of HiveOS VSAs + +ATTRIBUTE Extreme-User-Vlan 1 integer +ATTRIBUTE Extreme-Libsip-Patron-Info 3 octets encrypt=2 +ATTRIBUTE Extreme-Libsip-Action 4 integer +ATTRIBUTE Extreme-Libsip-Additional-Message 5 octets +ATTRIBUTE Extreme-User-Profile-Attribute 6 integer +ATTRIBUTE Extreme-Data-Usage-Limit 7 octets +ATTRIBUTE Extreme-AVPair 8 string +ATTRIBUTE Extreme-Radius-Code 9 integer +ATTRIBUTE Extreme-PPSK-Request 201 octets +ATTRIBUTE Extreme-PPSK-PMK 202 octets +ATTRIBUTE Extreme-IDM-Message 203 integer +ATTRIBUTE Extreme-NT-Identity 204 integer +ATTRIBUTE Extreme-User-Language 205 string +ATTRIBUTE Extreme-Time-Zone-Offset 207 integer +ATTRIBUTE Extreme-Daylight-Saving-Offset 208 integer +ATTRIBUTE Extreme-Client-Monitor-Session 209 octets +ATTRIBUTE Extreme-Client-Monitor-Problem 210 integer +ATTRIBUTE Extreme-IDM-Redirect-URL 211 string +ATTRIBUTE Extreme-MGT-MAC-Address 212 string +ATTRIBUTE Extreme-Auth-Source 213 integer + +# +# Integer Translations +# + +# Extreme-Libsip-Action Values +VALUE Extreme-Libsip-Action Permit 0 +VALUE Extreme-Libsip-Action Restricted 1 +VALUE Extreme-Libsip-Action Deny 2 + +# Extreme-Radius-Code Values +VALUE Extreme-Radius-Code Disconnect-Request 1 +VALUE Extreme-Radius-Code COA-Request 2 + +# Extreme-Auth-Source +VALUE Extreme-Auth-Source Service 1 +VALUE Extreme-Auth-Source Non-Service 2 + END-VENDOR Aerohive diff --git a/resources/protocols/radius/dictionary.airespace b/resources/protocols/radius/dictionary.airespace index f5595e58..9fb0600c 100644 --- a/resources/protocols/radius/dictionary.airespace +++ b/resources/protocols/radius/dictionary.airespace @@ -1,16 +1,10 @@ # -*- text -*- -# -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # As found on the net. # -# $Id: 5d952f9bb26324e61f139aef9ae9e552ed36dcb9 $ -# -# See -# -# http://www.cisco.com/c/en/us/td/docs/wireless/controller/8-1/configuration-guide/b_cg81/b_cg81_chapter_01010.html -# http://www.cisco.com/c/en/us/support/docs/wireless/4100-series-wireless-lan-controllers/96103-wlc-attributes.html -# https://supportforums.cisco.com/discussion/12456936/radius-bandwidth-limit-guest-wlan +# $Id: 1a49ec651fac41bd3aa620d3a75b467d863ea071 $ # VENDOR Airespace 14179 diff --git a/resources/protocols/radius/dictionary.alcatel b/resources/protocols/radius/dictionary.alcatel index 959ba0e2..83df1a75 100644 --- a/resources/protocols/radius/dictionary.alcatel +++ b/resources/protocols/radius/dictionary.alcatel @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Alcatel Broadband Access Server dictionary. # -# $Id: d1952902b4e514456185dfcac4017e57a2d49dac $ +# $Id: 591424c7f2f14aa0d16e81cb8f7e0cddf3459b4c $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.alcatel-lucent.aaa b/resources/protocols/radius/dictionary.alcatel-lucent.aaa index 5ec0d0c7..7d422f61 100644 --- a/resources/protocols/radius/dictionary.alcatel-lucent.aaa +++ b/resources/protocols/radius/dictionary.alcatel-lucent.aaa @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # ALU-AAA AAA dictionary # -# $Id: 53980abe0eeaa5ce33283eff30d572dc620605e7 $ +# $Id: 710b4f10a38fb5fa94c0af0e4c0f8a6c4e3e4e71 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.alcatel.esam b/resources/protocols/radius/dictionary.alcatel.esam index 8a76a859..66f7193d 100644 --- a/resources/protocols/radius/dictionary.alcatel.esam +++ b/resources/protocols/radius/dictionary.alcatel.esam @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Alcatel ESAM's VSAs # diff --git a/resources/protocols/radius/dictionary.alcatel.sr b/resources/protocols/radius/dictionary.alcatel.sr index 726c6a81..09e68e3f 100644 --- a/resources/protocols/radius/dictionary.alcatel.sr +++ b/resources/protocols/radius/dictionary.alcatel.sr @@ -1,9 +1,17 @@ # -*- text -*- +# Copyright (C) 2022 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Alcatel-Lucent Service Router dictionary. # -# $Id$ +# $Id: 0445316a7129d45d851841263db89b2754dc3271 $ +# +# See "7750 Service Router - RADIUS Attributes Reference Guide". +# +# Latest edition may be found by searching "7750 RADIUS ATTRIBUTES REFERENCE +# GUIDE" here: https://documentation.nokia.com/cgi-bin/doc_list.pl # ############################################################################## @@ -13,67 +21,400 @@ BEGIN-VENDOR Alcatel-Lucent-Service-Router # Alcatel Timetra attributes ATTRIBUTE Timetra-Access 1 integer -ATTRIBUTE Timetra-Home-Directory 2 string -ATTRIBUTE Timetra-Restrict-To-Home 3 integer -ATTRIBUTE Timetra-Profile 4 string -ATTRIBUTE Timetra-Default-Action 5 integer -ATTRIBUTE Timetra-Cmd 6 string -ATTRIBUTE Timetra-Action 7 integer -ATTRIBUTE Timetra-Exec-File 8 string VALUE Timetra-Access ftp 1 VALUE Timetra-Access console 2 VALUE Timetra-Access both 3 +ATTRIBUTE Timetra-Home-Directory 2 string + +ATTRIBUTE Timetra-Restrict-To-Home 3 integer + VALUE Timetra-Restrict-To-Home true 1 VALUE Timetra-Restrict-To-Home false 2 +ATTRIBUTE Timetra-Profile 4 string + +ATTRIBUTE Timetra-Default-Action 5 integer + VALUE Timetra-Default-Action permit-all 1 VALUE Timetra-Default-Action deny-all 2 VALUE Timetra-Default-Action none 3 +ATTRIBUTE Timetra-Cmd 6 string + +ATTRIBUTE Timetra-Action 7 integer + VALUE Timetra-Action permit 1 VALUE Timetra-Action deny 2 -# Alcatel Timetra authorization and CoA VSA +ATTRIBUTE Timetra-Exec-File 8 string + +# RADIUS subscriber authorization and CoA VSAs ATTRIBUTE Alc-Primary-Dns 9 ipaddr ATTRIBUTE Alc-Secondary-Dns 10 ipaddr ATTRIBUTE Alc-Subsc-ID-Str 11 string ATTRIBUTE Alc-Subsc-Prof-Str 12 string ATTRIBUTE Alc-SLA-Prof-Str 13 string ATTRIBUTE Alc-Force-Renew 14 string -ATTRIBUTE Alc-Create-Host 15 string -ATTRIBUTE Alc-ANCP-Str 16 string -ATTRIBUTE Alc-Retail-Serv-Id 17 integer +ATTRIBUTE Alc-Create-Host 15 string # CoA +ATTRIBUTE Alc-ANCP-Str 16 string # CoA ATTRIBUTE Alc-Retail-Serv-Id 17 integer ATTRIBUTE Alc-Default-Router 18 ipaddr -ATTRIBUTE Alc-Client-Hardware-Addr 27 string # RADIUS subscriber accounting VSAs -ATTRIBUTE Alc-Acct-I-Inprof-Octets-64 19 integer -ATTRIBUTE Alc-Acct-I-Outprof-Octets-64 20 integer -ATTRIBUTE Alc-Acct-O-Inprof-Octets-64 21 integer -ATTRIBUTE Alc-Acct-O-Outprof-Octets-64 22 integer -ATTRIBUTE Alc-Acct-I-Inprof-Pkts-64 23 integer -ATTRIBUTE Alc-Acct-I-Outprof-Pkts-64 24 integer -ATTRIBUTE Alc-Acct-O-Inprof-Pkts-64 25 integer -ATTRIBUTE Alc-Acct-O-Outprof-Pkts-64 26 integer +ATTRIBUTE Alc-Acct-I-Inprof-Octets-64 19 octets +ATTRIBUTE Alc-Acct-I-Outprof-Octets-64 20 octets +ATTRIBUTE Alc-Acct-O-Inprof-Octets-64 21 octets +ATTRIBUTE Alc-Acct-O-Outprof-Octets-64 22 octets +ATTRIBUTE Alc-Acct-I-Inprof-Pkts-64 23 octets +ATTRIBUTE Alc-Acct-I-Outprof-Pkts-64 24 octets +ATTRIBUTE Alc-Acct-O-Inprof-Pkts-64 25 octets +ATTRIBUTE Alc-Acct-O-Outprof-Pkts-64 26 octets + +ATTRIBUTE Alc-Client-Hardware-Addr 27 string +ATTRIBUTE Alc-Int-Dest-Id-Str 28 string +ATTRIBUTE Alc-Primary-Nbns 29 ipaddr +ATTRIBUTE Alc-Secondary-Nbns 30 ipaddr +ATTRIBUTE Alc-MSAP-Serv-Id 31 integer +ATTRIBUTE Alc-MSAP-Policy 32 string +ATTRIBUTE Alc-MSAP-Interface 33 string +ATTRIBUTE Alc-PPPoE-PADO-Delay 34 integer +ATTRIBUTE Alc-PPPoE-Service-Name 35 string +ATTRIBUTE Alc-DHCP-Vendor-Class-Id 36 string + +# RADIUS subscriber accounting VSAs (HSMDA override counters) +# +# In a stupid format. These attributes are 10 octets long, in the +# following format: +# +# 2 octets - Queue ID +# 8 octets - 64-bit counter. +# +ATTRIBUTE Alc-Acct-OC-I-Inprof-Octets-64 37 octets +ATTRIBUTE Alc-Acct-OC-I-Outprof-Octets-64 38 octets +ATTRIBUTE Alc-Acct-OC-O-Inprof-Octets-64 39 octets +ATTRIBUTE Alc-Acct-OC-O-Outprof-Octets-64 40 octets +ATTRIBUTE Alc-Acct-OC-I-Inprof-Pkts-64 41 octets +ATTRIBUTE Alc-Acct-OC-I-Outprof-Pkts-64 42 octets +ATTRIBUTE Alc-Acct-OC-O-Inprof-Pkts-64 43 octets +ATTRIBUTE Alc-Acct-OC-O-Outprof-Pkts-64 44 octets + +ATTRIBUTE Alc-App-Prof-Str 45 string +ATTRIBUTE Alc-Tunnel-Group 46 string + +ATTRIBUTE Alc-Tunnel-Algorithm 47 integer + +VALUE Alc-Tunnel-Algorithm weighted-access 1 +VALUE Alc-Tunnel-Algorithm existing-first 2 + +ATTRIBUTE Alc-Tunnel-Max-Sessions 48 integer has_tag +ATTRIBUTE Alc-Tunnel-Idle-Timeout 49 integer has_tag +ATTRIBUTE Alc-Tunnel-Hello-Interval 50 integer has_tag +ATTRIBUTE Alc-Tunnel-Destruct-Timeout 51 integer has_tag +ATTRIBUTE Alc-Tunnel-Max-Retries-Estab 52 integer has_tag +ATTRIBUTE Alc-Tunnel-Max-Retries-Not-Estab 53 integer has_tag + +ATTRIBUTE Alc-Tunnel-AVP-Hiding 54 integer has_tag + +VALUE Alc-Tunnel-AVP-Hiding nothing 1 +VALUE Alc-Tunnel-AVP-Hiding sensitive-only 2 +VALUE Alc-Tunnel-AVP-Hiding all 3 + +ATTRIBUTE Alc-BGP-Policy 55 string +ATTRIBUTE Alc-BGP-Auth-Keychain 56 string +ATTRIBUTE Alc-BGP-Auth-Key 57 octets +ATTRIBUTE Alc-BGP-Export-Policy 58 string +ATTRIBUTE Alc-BGP-Import-Policy 59 string +ATTRIBUTE Alc-BGP-PeerAS 60 integer +ATTRIBUTE Alc-IPsec-Serv-Id 61 integer +ATTRIBUTE Alc-IPsec-Interface 62 string +ATTRIBUTE Alc-IPsec-Tunnel-Template-Id 63 integer +ATTRIBUTE Alc-IPsec-SA-Lifetime 64 integer + +# Match TC TmnxIkePolicyDHGroup in TIMETRA-IPSEC-MIB +ATTRIBUTE Alc-IPsec-SA-PFS-Group 65 integer + +VALUE Alc-IPsec-SA-PFS-Group group1 1 +VALUE Alc-IPsec-SA-PFS-Group group2 2 +VALUE Alc-IPsec-SA-PFS-Group group5 5 + +# Match TC TmnxEncrAlgorithm in TIMETRA-IPSEC-MIB +ATTRIBUTE Alc-IPsec-SA-Encr-Algorithm 66 integer + +VALUE Alc-IPsec-SA-Encr-Algorithm null 1 +VALUE Alc-IPsec-SA-Encr-Algorithm des 2 +VALUE Alc-IPsec-SA-Encr-Algorithm des3 3 +VALUE Alc-IPsec-SA-Encr-Algorithm aes128 4 +VALUE Alc-IPsec-SA-Encr-Algorithm aes192 5 +VALUE Alc-IPsec-SA-Encr-Algorithm aes256 6 + +# Match TC TmnxAuthAlgorithm in TIMETRA-IPSEC-MIB +ATTRIBUTE Alc-IPsec-SA-Auth-Algorithm 67 integer + +VALUE Alc-IPsec-SA-Auth-Algorithm null 1 +VALUE Alc-IPsec-SA-Auth-Algorithm md5 2 +VALUE Alc-IPsec-SA-Auth-Algorithm sha1 3 + +ATTRIBUTE Alc-IPsec-SA-Replay-Window 68 integer + +# RADIUS subscriber accounting VSAs (custom records) +ATTRIBUTE Alc-Acct-I-High-Octets-Drop_64 69 octets +ATTRIBUTE Alc-Acct-I-Low-Octets-Drop_64 70 octets +ATTRIBUTE Alc-Acct-I-High-Pack-Drop_64 71 octets +ATTRIBUTE Alc-Acct-I-Low-Pack-Drop_64 72 octets +ATTRIBUTE Alc-Acct-I-High-Octets-Offer_64 73 octets +ATTRIBUTE Alc-Acct-I-Low-Octets-Offer_64 74 octets +ATTRIBUTE Alc-Acct-I-High-Pack-Offer_64 75 octets +ATTRIBUTE Alc-Acct-I-Low-Pack-Offer_64 76 octets +ATTRIBUTE Alc-Acct-I-Unc-Octets-Offer_64 77 octets +ATTRIBUTE Alc-Acct-I-Unc-Pack-Offer_64 78 octets +ATTRIBUTE Alc-Acct-I-All-Octets-Offer_64 79 octets +ATTRIBUTE Alc-Acct-I-All-Pack-Offer_64 80 octets +ATTRIBUTE Alc-Acct-O-Inprof-Pack-Drop_64 81 octets +ATTRIBUTE Alc-Acct-O-Outprof-Pack-Drop_64 82 octets +ATTRIBUTE Alc-Acct-O-Inprof-Octs-Drop_64 83 octets +ATTRIBUTE Alc-Acct-O-Outprof-Octs-Drop_64 84 octets + +# RADIUS subscriber accounting VSAs (custom records, HSMDA) +ATTRIBUTE Alc-Acct-OC-I-All-Octs-Offer_64 85 octets +ATTRIBUTE Alc-Acct-OC-I-All-Pack-Offer_64 86 octets +ATTRIBUTE Alc-Acct-OC-I-Inpr-Octs-Drop_64 87 octets +ATTRIBUTE Alc-Acct-OC-I-Outpr-Octs-Drop_64 88 octets +ATTRIBUTE Alc-Acct-OC-I-Inpr-Pack-Drop_64 89 octets +ATTRIBUTE Alc-Acct-OC-I-Outpr-Pack-Drop_64 90 octets +ATTRIBUTE Alc-Acct-OC-O-Inpr-Pack-Drop_64 91 octets +ATTRIBUTE Alc-Acct-OC-O-Outpr-Pack-Drop_64 92 octets +ATTRIBUTE Alc-Acct-OC-O-Inpr-Octs-Drop_64 93 octets +ATTRIBUTE Alc-Acct-OC-O-Outpr-Octs-Drop_64 94 octets + +# Credit control VSAs +ATTRIBUTE Alc-Credit-Control-CategoryMap 95 string +ATTRIBUTE Alc-Credit-Control-Quota 96 string + +ATTRIBUTE Alc-Tunnel-Challenge 97 integer has_tag + +VALUE Alc-Tunnel-Challenge never 1 +VALUE Alc-Tunnel-Challenge always 2 + +ATTRIBUTE Alc-Force-Nak 98 string # CoA + +ATTRIBUTE Alc-Ipv6-Address 99 ipv6addr +ATTRIBUTE Alc-Serv-Id 100 integer +ATTRIBUTE Alc-Interface 101 string +ATTRIBUTE Alc-ToServer-Dhcp-Options 102 octets +ATTRIBUTE Alc-ToClient-Dhcp-Options 103 octets +ATTRIBUTE Alc-Tunnel-Serv-Id 104 integer +ATTRIBUTE Alc-Ipv6-Primary-Dns 105 ipv6addr +ATTRIBUTE Alc-Ipv6-Secondary-Dns 106 ipv6addr + +# RADIUS subscriber accounting VSAs (Policers) +ATTRIBUTE Alc-Acct-I-statmode 107 string +ATTRIBUTE Alc-Acct-I-Hiprio-Octets_64 108 octets +ATTRIBUTE Alc-Acct-I-Lowprio-Octets_64 109 octets +ATTRIBUTE Alc-Acct-O-Hiprio-Octets_64 110 octets +ATTRIBUTE Alc-Acct-O-Lowprio-Octets_64 111 octets +ATTRIBUTE Alc-Acct-I-Hiprio-Packets_64 112 octets +ATTRIBUTE Alc-Acct-I-Lowprio-Packets_64 113 octets +ATTRIBUTE Alc-Acct-O-Hiprio-Packets_64 114 octets +ATTRIBUTE Alc-Acct-O-Lowprio-Packets_64 115 octets +ATTRIBUTE Alc-Acct-I-All-Octets_64 116 octets +ATTRIBUTE Alc-Acct-O-All-Octets_64 117 octets +ATTRIBUTE Alc-Acct-I-All-Packets_64 118 octets +ATTRIBUTE Alc-Acct-O-All-Packets_64 119 octets + +ATTRIBUTE Alc-Tunnel-Rx-Window-Size 120 integer has_tag + +# NAT Subscriber +ATTRIBUTE Alc-Nat-Port-Range 121 string + +# Lawful intercept VSAs +ATTRIBUTE Alc-LI-Action 122 integer encrypt=2 + +VALUE Alc-LI-Action no-action 1 +VALUE Alc-LI-Action enable 2 +VALUE Alc-LI-Action disable 3 + +ATTRIBUTE Alc-LI-Destination 123 string encrypt=2 + +# This VSA can occur multiple times (for each FC that must be intercepted) +# If this VSA is not present, all FCs will be intercepted. +ATTRIBUTE Alc-LI-FC 124 integer encrypt=2 + +VALUE Alc-LI-FC be 0 +VALUE Alc-LI-FC l2 1 +VALUE Alc-LI-FC af 2 +VALUE Alc-LI-FC l1 3 +VALUE Alc-LI-FC h2 4 +VALUE Alc-LI-FC ef 5 +VALUE Alc-LI-FC h1 6 +VALUE Alc-LI-FC nc 7 + +# If this VSA is not present, both directions will be intercepted. +ATTRIBUTE Alc-LI-Direction 125 integer encrypt=2 + +VALUE Alc-LI-Direction ingress 1 +VALUE Alc-LI-Direction egress 2 + +# Subscriber QoS overrides +ATTRIBUTE Alc-Subscriber-QoS-Override 126 string + +# RADIUS subscriber accounting VSAs (Policers) +ATTRIBUTE Alc-Acct-O-statmode 127 string + +# ATM Traffic Descriptor Profiles +ATTRIBUTE Alc-ATM-Ingress-TD-Profile 128 integer +ATTRIBUTE Alc-ATM-Egress-TD-Profile 129 integer + +# Application-assurance transit ip (CoA) +ATTRIBUTE Alc-AA-Transit-IP 130 integer # CoA + +VALUE Alc-AA-Transit-IP host 1 +VALUE Alc-AA-Transit-IP audit-start 2 +VALUE Alc-AA-Transit-IP audit-end 3 + +# DHCPv6 Relay pool selection attributes +ATTRIBUTE Alc-Delegated-IPv6-Pool 131 string + +ATTRIBUTE Alc-Access-Loop-Rate-Down 132 integer +ATTRIBUTE Alc-Access-Loop-Encap-Offset 133 octets + +# Submgt SLA-profile filter overrrule +ATTRIBUTE Alc-Subscriber-Filter 134 string + +ATTRIBUTE Alc-PPP-Force-IPv6CP 135 integer + +# One-Time HTTP Redirection +ATTRIBUTE Alc-Onetime-Http-Redirection-Filter-Id 136 string + +# Used when clearing all radius li triggered sources from a mirror destination +# via CoA. The value of this attribute is used to authenticate the coa. +ATTRIBUTE Alc-Authentication-Policy-Name 137 string # CoA + +# Lawful intercept VSAs continued +ATTRIBUTE Alc-LI-Intercept-Id 138 integer encrypt=2 +ATTRIBUTE Alc-LI-Session-Id 139 integer encrypt=2 + +# NAT +ATTRIBUTE Alc-Nat-Outside-Serv-Id 140 integer +ATTRIBUTE Alc-Nat-Outside-Ip-Addr 141 ipaddr + +# Mobile-Gateway APN-Password VSA (password used for the next APN AccessReq) +ATTRIBUTE Alc-APN-Password 142 string encrypt=2 + +# Mobile-Gateway Next-APN-Name VSA (PGW-APN to be used for the session) +ATTRIBUTE Alc-APN-Name 143 string + +ATTRIBUTE Alc-Tunnel-Acct-Policy 144 string has_tag + +# Wlan-Gateway +ATTRIBUTE Alc-Mgw-Interface-Type 145 integer + +VALUE Alc-Mgw-Interface-Type gn 1 +VALUE Alc-Mgw-Interface-Type s2a 2 +VALUE Alc-Mgw-Interface-Type s2b 3 + +ATTRIBUTE Alc-Wlan-APN-Name 146 string +ATTRIBUTE Alc-MsIsdn 147 string + +# WIFI Received Signal Strength Indication +ATTRIBUTE Alc-RSSI 148 integer + +# Number of attached WIFI UEs +ATTRIBUTE Alc-Num-Attached-UEs 149 integer + +# Mobile-Gateway Charging-profile-ID VSA +ATTRIBUTE Alc-Charging-Prof-ID 150 integer + +# 151-155 are currently unused + +# Application-Assurance Radius Accounting Attributes +ATTRIBUTE Alc-AA-Group-Partition-Isa-Id 156 string + +# Application-Assurance Radius Peer Information +ATTRIBUTE Alc-AA-Peer-Identifier 157 string + +# A local configured filter policy can be extended with shared dynamic filter entries +ATTRIBUTE Alc-Nas-Filter-Rule-Shared 158 string + +# They represent a per host customization of a generic filter policy: only +# traffic to/from the subscriber host will match against these entries +ATTRIBUTE Alc-Ascend-Data-Filter-Host-Spec 159 abinary + +# Relative Session-Timeout +ATTRIBUTE Alc-Relative-Session-Timeout 160 integer + +# 161-162 are currently unused + +# Accounting interim update trigger reason +ATTRIBUTE Alc-Acct-Triggered-Reason 163 integer + +VALUE Alc-Acct-Triggered-Reason regular 1 +VALUE Alc-Acct-Triggered-Reason sla-start 2 +VALUE Alc-Acct-Triggered-Reason sla-stop 3 +VALUE Alc-Acct-Triggered-Reason Framed-IP-Address-up 4 +VALUE Alc-Acct-Triggered-Reason Framed-IP-Address-down 5 +VALUE Alc-Acct-Triggered-Reason Alc-Ipv6-Address-up 6 +VALUE Alc-Acct-Triggered-Reason Alc-Ipv6-Address-down 7 +VALUE Alc-Acct-Triggered-Reason Delegated-IPv6-Prefix-up 8 +VALUE Alc-Acct-Triggered-Reason Delegated-IPv6-Prefix-down 9 +VALUE Alc-Acct-Triggered-Reason Framed-IPv6-Prefix-up 10 +VALUE Alc-Acct-Triggered-Reason Framed-IPv6-Prefix-down 11 # Used when authenticating migrant hosts -ATTRIBUTE Alc-Wlan-Portal-Redirect 172 string +ATTRIBUTE Alc-Wlan-Portal-Redirect 172 string # If a migrant host is redirected, specifies the URL -ATTRIBUTE Alc-Wlan-Portal-Url 173 string +ATTRIBUTE Alc-Wlan-Portal-Url 173 string # Defines the lease-time in seconds for RADIUS proxy and create-host-CoA # scenarios only. -ATTRIBUTE Alc-Lease-Time 174 integer +ATTRIBUTE Alc-Lease-Time 174 integer + +ATTRIBUTE Alc-DSL-Line-State 175 integer +ATTRIBUTE Alc-DSL-Type 176 integer # The URL to which traffic matching the host IPv4 filter entry with http-redirect # action is redirected to -ATTRIBUTE Alc-Portal-Url 177 string +ATTRIBUTE Alc-Portal-Url 177 string + +ATTRIBUTE Alc-Ipv6-Portal-Url 178 string +ATTRIBUTE Alc-SAP-Session-Index 180 integer # names longer than the allowed maximum are treated as host setup failures -ATTRIBUTE Alc-SLAAC-IPv6-Pool 181 string +ATTRIBUTE Alc-SLAAC-IPv6-Pool 181 string + +ATTRIBUTE Alc-WPP-ErrorCode 183 integer +ATTRIBUTE Alc-Onetime-Http-Redirect-Reactivate 185 string + +# DHCP6 attributes +ATTRIBUTE Alc-ToServer-Dhcp6-Options 191 octets +ATTRIBUTE Alc-ToClient-Dhcp6-Options 192 octets + +# +# MUST have renew time <= rebind time <= preferred lifetime <= valid lifetime +# +ATTRIBUTE Alc-v6-Preferred-Lifetime 200 integer +ATTRIBUTE Alc-v6-Valid-Lifetime 201 integer +ATTRIBUTE Alc-Dhcp6-Renew-Time 202 integer +ATTRIBUTE Alc-Dhcp6-Rebind-Time 203 integer + +# The VLAN is transparently taken from the UE’s Ethernet layer and can be reflected +# in both authentication and accounting +ATTRIBUTE Alc-Wlan-SSID-VLAN 206 string + +ATTRIBUTE Alc-UPnP-Sub-Override-Policy 217 string + +ATTRIBUTE Alc-Trigger-Acct-Interim 228 string + +ATTRIBUTE Alc-Acct-Interim-Level 232 integer has_tag + +ATTRIBUTE Alc-DNAT-Override 234 string + +ATTRIBUTE Alc-Remove-Override 238 string + +ATTRIBUTE Alc-Radius-Py 242 octets + +ATTRIBUTE Alc-Force-DHCP-Relay 244 string END-VENDOR Alcatel-Lucent-Service-Router diff --git a/resources/protocols/radius/dictionary.alphion b/resources/protocols/radius/dictionary.alphion new file mode 100644 index 00000000..f21435fc --- /dev/null +++ b/resources/protocols/radius/dictionary.alphion @@ -0,0 +1,74 @@ +# -*- text -*- +# Copyright (C) 2024 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# $Id: fe9403aac12641fa10dfa8b34bc31c218da6369d $ +# +############################################################################## + +VENDOR Alphion 8742 +BEGIN-VENDOR Alphion + +ATTRIBUTE Alphion-User-Role 1 string +ATTRIBUTE Alphion-User-Vlan 2 integer +ATTRIBUTE Alphion-Priv-Admin-User 3 integer +ATTRIBUTE Alphion-Admin-Role 4 string +ATTRIBUTE Alphion-Essid-Name 5 string +ATTRIBUTE Alphion-Location-Id 6 string +ATTRIBUTE Alphion-Port-Identifier 7 string +ATTRIBUTE Alphion-MMS-User-Template 8 string +ATTRIBUTE Alphion-Named-User-Vlan 9 string +ATTRIBUTE Alphion-AP-Group 10 string + +ATTRIBUTE Alphion-Framed-IPv6-Address 11 string +ATTRIBUTE Alphion-Device-Type 12 string +ATTRIBUTE Alphion-No-DHCP-Fingerprint 14 integer +ATTRIBUTE Alphion-Mdps-Device-Udid 15 string +ATTRIBUTE Alphion-Mdps-Device-Imei 16 string +ATTRIBUTE Alphion-Mdps-Device-Iccid 17 string +ATTRIBUTE Alphion-Mdps-Max-Devices 18 integer +ATTRIBUTE Alphion-Mdps-Device-Name 19 string +ATTRIBUTE Alphion-Mdps-Device-Product 20 string + +ATTRIBUTE Alphion-Mdps-Device-Version 21 string +ATTRIBUTE Alphion-Mdps-Device-Serial 22 string +ATTRIBUTE Alphion-CPPM-Role 23 string +ATTRIBUTE Alphion-AirGroup-User-Name 24 string +ATTRIBUTE Alphion-AirGroup-Shared-User 25 string +ATTRIBUTE Alphion-AirGroup-Shared-Role 26 string +ATTRIBUTE Alphion-AirGroup-Device-Type 27 integer +ATTRIBUTE Alphion-Auth-Survivability 28 string +ATTRIBUTE Alphion-AS-User-Name 29 string +ATTRIBUTE Alphion-AS-Credential-Hash 30 string + +ATTRIBUTE Alphion-WorkSpace-App-Name 31 string +ATTRIBUTE Alphion-Mdps-Provisioning-Settings 32 string +ATTRIBUTE Alphion-Mdps-Device-Profile 33 string + +ATTRIBUTE Alphion-AP-IP-Address 34 ipaddr + +ATTRIBUTE Alphion-AirGroup-Shared-Group 35 string +ATTRIBUTE Alphion-User-Group 36 string +ATTRIBUTE Alphion-Network-SSO-Token 37 string +ATTRIBUTE Alphion-AirGroup-Version 38 integer + +ATTRIBUTE Alphion-Port-Bounce-Host 40 integer + +ATTRIBUTE Alphion-Calea-Server-Ip 41 ipaddr +ATTRIBUTE Alphion-Admin-Path 42 string +ATTRIBUTE Alphion-Captive-Portal-URL 43 string +ATTRIBUTE Alphion-MPSK-Passphrase 44 octets encrypt=2 +ATTRIBUTE Alphion-ACL-Server-Query-Info 45 string +ATTRIBUTE Alphion-Command-String 46 string + +VALUE Alphion-AirGroup-Device-Type Personal-Device 1 +VALUE Alphion-AirGroup-Device-Type Shared-Device 2 +VALUE Alphion-AirGroup-Device-Type Deleted-Device 3 + +VALUE Alphion-AirGroup-Version AirGroup-v1 1 +VALUE Alphion-AirGroup-Version AirGroup-v2 2 + +END-VENDOR Alphion + diff --git a/resources/protocols/radius/dictionary.alteon b/resources/protocols/radius/dictionary.alteon index 6184a9b3..9dec4e04 100644 --- a/resources/protocols/radius/dictionary.alteon +++ b/resources/protocols/radius/dictionary.alteon @@ -1,11 +1,10 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -# -# dictionary.alteon +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Alteon Webswitch # -# $Id: ff540379922b9551f8a4c63dc82cd1b2ed926ac4 $ +# $Id: 96f0b8690f7bca485151548c213981396ee5c9ca $ # VENDOR Alteon 1872 diff --git a/resources/protocols/radius/dictionary.altiga b/resources/protocols/radius/dictionary.altiga index 0661204c..dec7e7af 100644 --- a/resources/protocols/radius/dictionary.altiga +++ b/resources/protocols/radius/dictionary.altiga @@ -1,11 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Altiga vendor attributes # # Altiga networks was acquired by Cisco in 2000. # -# $Id: 66c75d2dd2b8f5f439a6ddca7513db17b9eeff0d $ +# $Id: 7a42e77906a64ddabd7a5a8cec25799e6df7e72d $ # VENDOR Altiga 3076 diff --git a/resources/protocols/radius/dictionary.alvarion b/resources/protocols/radius/dictionary.alvarion index c359d348..f9fd76a8 100644 --- a/resources/protocols/radius/dictionary.alvarion +++ b/resources/protocols/radius/dictionary.alvarion @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Alvarion VSAs, also known as Breezecom / Breezenet. @@ -28,7 +30,7 @@ # Why anyone thought this was a good idea is beyond rational # understanding. # -# $Id: 2d9c38b154a66fc2d61112708252d9f4da2ccba0 $ +# $Id: 91589ec882bb2bc15d7439e2e6a22c03e29f9a39 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.alvarion.wimax.v2_2 b/resources/protocols/radius/dictionary.alvarion.wimax.v2_2 index c0d040c0..9e85580d 100644 --- a/resources/protocols/radius/dictionary.alvarion.wimax.v2_2 +++ b/resources/protocols/radius/dictionary.alvarion.wimax.v2_2 @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Alvarion VSAs for use with Alvarion WiMAX ASN-GW @@ -9,7 +11,7 @@ # dictionaries are used to support an existing Alvarion Breezecom or # Breezenet installation. # -# $Id: 38345003413ca31bf86d4059a3f30f977125c472 $ +# $Id: 9431766abddfc23c8a9a1e5b28bc796ebaf2c159 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.apc b/resources/protocols/radius/dictionary.apc index 6bcb9557..debee37b 100644 --- a/resources/protocols/radius/dictionary.apc +++ b/resources/protocols/radius/dictionary.apc @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -############################################################################## +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################# # # http://nam-en.apc.com/cgi-bin/nam_en.cfg/php/enduser/std_adp.php?p_faqid=8012 # -# $Id: 85927c4d69650236df456c97156172e4221cd5d7 $ +# $Id: 00efbab7aed13d28c546d5ac813e894bf85be943 $ # ############################################################################## @@ -32,5 +34,6 @@ VALUE APC-Service-Type Device 2 VALUE APC-Service-Type ReadOnly 3 VALUE APC-Service-Type Outlet 4 VALUE APC-Service-Type Card 5 +VALUE APC-Service-Type NetworkOnly 6 END-VENDOR APC diff --git a/resources/protocols/radius/dictionary.aptilo b/resources/protocols/radius/dictionary.aptilo index ca973a37..017f1074 100644 --- a/resources/protocols/radius/dictionary.aptilo +++ b/resources/protocols/radius/dictionary.aptilo @@ -1,4 +1,7 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # Aptilo Access Controllers - https://www.aptilo.com/aptilo-access-controller # diff --git a/resources/protocols/radius/dictionary.aptis b/resources/protocols/radius/dictionary.aptis index 6478b875..a672d27e 100644 --- a/resources/protocols/radius/dictionary.aptis +++ b/resources/protocols/radius/dictionary.aptis @@ -1,7 +1,8 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # -# $Id: 9dcc25f87309aea44c8bd06b5755cd3db4811c76 $ +# $Id: 26023bd97d2ac703f6e953a6f0945bde2e99e336 $ # VENDOR Aptis 2637 diff --git a/resources/protocols/radius/dictionary.arbor b/resources/protocols/radius/dictionary.arbor index 69853498..85ddb7d4 100644 --- a/resources/protocols/radius/dictionary.arbor +++ b/resources/protocols/radius/dictionary.arbor @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Arbor networks. # -# $Id: 2013fbd8a8359eda87b72c408b5e6b426fd3985c $ +# $Id: 8ac3a0716ec0bb3b645eeb87699d911a9cfe9c22 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.arista b/resources/protocols/radius/dictionary.arista new file mode 100644 index 00000000..366da00a --- /dev/null +++ b/resources/protocols/radius/dictionary.arista @@ -0,0 +1,29 @@ +# -*- text -*- +# Copyright (C) 2020 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# Version $Id: 8dbea47ebb49cca2aa5b525d95e74ee832be2ff4 $ +############################################################################## +# +# Arista VSAs +# https://eos.arista.com/common-aaa-requirements/ +# +############################################################################## + +VENDOR Arista 30065 +BEGIN-VENDOR Arista + +ATTRIBUTE Arista-AVPair 1 string +ATTRIBUTE Arista-User-Priv-Level 2 integer +ATTRIBUTE Arista-User-Role 3 string +ATTRIBUTE Arista-CVP-Role 4 string +ATTRIBUTE Arista-Command 5 string +ATTRIBUTE Arista-WebAuth 6 integer +ATTRIBUTE Arista-BlockMac 7 string +ATTRIBUTE Arista-UnblockMac 8 string +ATTRIBUTE Arista-PortFlap 9 integer +ATTRIBUTE Arista-Captive-Portal 10 string + +VALUE Arista-WebAuth start 1 +VALUE Arista-WebAuth complete 2 + +END-VENDOR Arista diff --git a/resources/protocols/radius/dictionary.aruba b/resources/protocols/radius/dictionary.aruba index 929f111c..8e128d0d 100644 --- a/resources/protocols/radius/dictionary.aruba +++ b/resources/protocols/radius/dictionary.aruba @@ -1,7 +1,9 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2020 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# Version $Id: 26bd82a50f15e7aeee1b3545ccaa8c1256ab19b0 $ # -# Version: $Id: 816b5b15dba8cf77b9b7ffab200b3716e09f8d62 $ +# Version: $Id: 26bd82a50f15e7aeee1b3545ccaa8c1256ab19b0 $ # VENDOR Aruba 14823 BEGIN-VENDOR Aruba @@ -68,13 +70,78 @@ ATTRIBUTE Aruba-Auth-SurvMethod 39 integer ATTRIBUTE Aruba-Port-Bounce-Host 40 integer ATTRIBUTE Aruba-Calea-Server-Ip 41 ipaddr - ATTRIBUTE Aruba-Admin-Path 42 string +ATTRIBUTE Aruba-Captive-Portal-URL 43 string +ATTRIBUTE Aruba-MPSK-Passphrase 44 octets encrypt=2 +ATTRIBUTE Aruba-ACL-Server-Query-Info 45 string +ATTRIBUTE Aruba-Command-String 46 string +ATTRIBUTE Aruba-Network-Profile 47 string +ATTRIBUTE Aruba-Admin-Device-Group 48 string +ATTRIBUTE Aruba-PoE-Priority 49 integer +ATTRIBUTE Aruba-Port-Auth-Mode 50 integer + +ATTRIBUTE Aruba-NAS-Filter-Rule 51 string +ATTRIBUTE Aruba-QoS-Trust-Mode 52 integer +ATTRIBUTE Aruba-UBT-Gateway-Role 53 string +ATTRIBUTE Aruba-Gateway-Zone 54 string + +ATTRIBUTE Aruba-DPP-Bootstrapping-Key-SHA256 55 string +ATTRIBUTE Aruba-DPP-Bootstrapping-Net-Access-Key-SHA256 56 string +ATTRIBUTE Aruba-DPP-Bootstrapping-Key-B64 57 string + +ATTRIBUTE Aruba-STP-Admin-Edge-Port 58 integer + +ATTRIBUTE Aruba-UBT-Gateway-CPPM-Role 59 string + +ATTRIBUTE Aruba-AP-MAC-Address 60 string +ATTRIBUTE Aruba-Device-MAC-Address 61 string +ATTRIBUTE Aruba-MPSK-Key-Name 62 string +ATTRIBUTE Aruba-Device-Traffic-Class 63 integer + +ATTRIBUTE Aruba-PVLAN-Port-Type 64 integer +ATTRIBUTE Aruba-Network-Test 65 integer +ATTRIBUTE Aruba-MPSK-Lookup-Info 66 string encrypt=1 +ATTRIBUTE Aruba-AVPair 67 string +ATTRIBUTE Aruba-DPP-Service-Type 68 integer + +ATTRIBUTE Aruba-User-Mgmt-Interface 69 string + +ATTRIBUTE Aruba-PoE-Allocate-By-Method 70 integer + +ATTRIBUTE Aruba-DPP-AKMs 71 string +ATTRIBUTE Aruba-DPP-Passphrase 72 string encrypt=2 VALUE Aruba-AirGroup-Device-Type Personal-Device 1 VALUE Aruba-AirGroup-Device-Type Shared-Device 2 +VALUE Aruba-AirGroup-Device-Type Deleted-Device 3 VALUE Aruba-AirGroup-Version AirGroup-v1 1 VALUE Aruba-AirGroup-Version AirGroup-v2 2 +VALUE Aruba-PoE-Priority Critical 0 +VALUE Aruba-PoE-Priority High 1 +VALUE Aruba-PoE-Priority Low 2 + +VALUE Aruba-Port-Auth-Mode Infrastructure-Mode 1 +VALUE Aruba-Port-Auth-Mode Client-Mode 2 +VALUE Aruba-Port-Auth-Mode Multi-Domain-Mode 3 + +VALUE Aruba-QoS-Trust-Mode DSCP 0 +VALUE Aruba-QoS-Trust-Mode QoS 1 +VALUE Aruba-QoS-Trust-Mode None 2 + +VALUE Aruba-STP-Admin-Edge-Port Disable 0 +VALUE Aruba-STP-Admin-Edge-Port Enable 1 + +VALUE Aruba-PVLAN-Port-Type None 0 +VALUE Aruba-PVLAN-Port-Type Promiscuous 1 +VALUE Aruba-PVLAN-Port-Type Secondary 2 + +VALUE Aruba-DPP-Service-Type DDP-Boostrap-Authorization 1 +VALUE Aruba-DPP-Service-Type DDP-Identity-Update 2 +VALUE Aruba-DPP-Service-Type DDP-Net-Access 3 + +VALUE Aruba-PoE-Allocate-By-Method Class 1 +VALUE Aruba-PoE-Allocate-By-Method Usage 2 + END-VENDOR Aruba diff --git a/resources/protocols/radius/dictionary.ascend b/resources/protocols/radius/dictionary.ascend index 3f5b3c28..b0f285e0 100644 --- a/resources/protocols/radius/dictionary.ascend +++ b/resources/protocols/radius/dictionary.ascend @@ -1,9 +1,12 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Ascend dictionary. # -# $Id$ +# $Id: b34e884e174874a0b16ff32cefc39b5af0326143 $ # ############################################################################## @@ -377,7 +380,6 @@ ATTRIBUTE Ascend-MPP-Idle-Percent 254 integer ATTRIBUTE Ascend-Xmit-Rate 255 integer # Ascend protocols -VALUE Service-Type Dialout-Framed-User 5 VALUE Framed-Protocol Ascend-ARA 255 VALUE Framed-Protocol Ascend-MPP 256 VALUE Framed-Protocol Ascend-EURAW 257 @@ -895,428 +897,3 @@ VALUE Ascend-X25-Pad-X3-Profile SHARK 8 VALUE Ascend-X25-Reverse-Charging Reverse-Charging-No 0 VALUE Ascend-X25-Reverse-Charging Reverse-Charging-Yes 1 END-VENDOR Ascend - -# Uncomment these attributes if you need them (2010-12-01) -# They collide with IANA registered VSA:s -# Ascend specific extensions -# Used by ASCEND MAX/Pipeline products -# -# This next block is renamed because they share the same -# names as the vendor-specific attributes, BUT they occur -# in the lower (1-255) RADIUS attribute space. -# -# Older Ascend software will send these, rather than the -# vendor specific attributes. -# -#ATTRIBUTE X-Ascend-FCP-Parameter 119 string -#ATTRIBUTE X-Ascend-Modem-PortNo 120 integer -#ATTRIBUTE X-Ascend-Modem-SlotNo 121 integer -#ATTRIBUTE X-Ascend-Modem-ShelfNo 122 integer -#ATTRIBUTE X-Ascend-Call-Attempt-Limit 123 integer -#ATTRIBUTE X-Ascend-Call-Block-Duration 124 integer -#ATTRIBUTE X-Ascend-Maximum-Call-Duration 125 integer -## The following conflicts with dictionary.usr attribute Multi-Link-Flag [wireshark] -#ATTRIBUTE X-Ascend-Temporary-Rtes 126 integer -#ATTRIBUTE X-Ascend-Tunneling-Protocol 127 integer -#ATTRIBUTE X-Ascend-Shared-Profile-Enable 128 integer -#ATTRIBUTE X-Ascend-Primary-Home-Agent 129 string -#ATTRIBUTE X-Ascend-Secondary-Home-Agent 130 string -#ATTRIBUTE X-Ascend-Dialout-Allowed 131 integer -#ATTRIBUTE X-Ascend-Client-Gateway 132 ipaddr -#ATTRIBUTE X-Ascend-BACP-Enable 133 integer -#ATTRIBUTE X-Ascend-DHCP-Maximum-Leases 134 integer -#ATTRIBUTE X-Ascend-Client-Primary-DNS 135 ipaddr -#ATTRIBUTE X-Ascend-Client-Secondary-DNS 136 ipaddr -#ATTRIBUTE X-Ascend-Client-Assign-DNS 137 integer -#ATTRIBUTE X-Ascend-User-Acct-Type 138 integer -#ATTRIBUTE X-Ascend-User-Acct-Host 139 ipaddr -#ATTRIBUTE X-Ascend-User-Acct-Port 140 integer -#ATTRIBUTE X-Ascend-User-Acct-Key 141 string -#ATTRIBUTE X-Ascend-User-Acct-Base 142 integer -#ATTRIBUTE X-Ascend-User-Acct-Time 143 integer -#ATTRIBUTE X-Ascend-Assign-IP-Client 144 ipaddr -#ATTRIBUTE X-Ascend-Assign-IP-Server 145 ipaddr -#ATTRIBUTE X-Ascend-Assign-IP-Global-Pool 146 string -#ATTRIBUTE X-Ascend-DHCP-Reply 147 integer -#ATTRIBUTE X-Ascend-DHCP-Pool-Number 148 integer -#ATTRIBUTE X-Ascend-Expect-Callback 149 integer -#ATTRIBUTE X-Ascend-Event-Type 150 integer -#ATTRIBUTE X-Ascend-Session-Svr-Key 151 string -#ATTRIBUTE X-Ascend-Multicast-Rate-Limit 152 integer -#ATTRIBUTE X-Ascend-IF-Netmask 153 ipaddr -#ATTRIBUTE X-Ascend-Remote-Addr 154 ipaddr -#ATTRIBUTE X-Ascend-Multicast-Client 155 integer -#ATTRIBUTE X-Ascend-FR-Circuit-Name 156 string -#ATTRIBUTE X-Ascend-FR-LinkUp 157 integer -#ATTRIBUTE X-Ascend-FR-Nailed-Grp 158 integer -#ATTRIBUTE X-Ascend-FR-Type 159 integer -#ATTRIBUTE X-Ascend-FR-Link-Mgt 160 integer -#ATTRIBUTE X-Ascend-FR-N391 161 integer -#ATTRIBUTE X-Ascend-FR-DCE-N392 162 integer -#ATTRIBUTE X-Ascend-FR-DTE-N392 163 integer -#ATTRIBUTE X-Ascend-FR-DCE-N393 164 integer -#ATTRIBUTE X-Ascend-FR-DTE-N393 165 integer -#ATTRIBUTE X-Ascend-FR-T391 166 integer -#ATTRIBUTE X-Ascend-FR-T392 167 integer -#ATTRIBUTE X-Ascend-Bridge-Address 168 string -#ATTRIBUTE X-Ascend-TS-Idle-Limit 169 integer -#ATTRIBUTE X-Ascend-TS-Idle-Mode 170 integer -#ATTRIBUTE X-Ascend-DBA-Monitor 171 integer -#ATTRIBUTE X-Ascend-Base-Channel-Count 172 integer -#ATTRIBUTE X-Ascend-Minimum-Channels 173 integer -#ATTRIBUTE X-Ascend-IPX-Route 174 string -#ATTRIBUTE X-Ascend-FT1-Caller 175 integer -#ATTRIBUTE X-Ascend-Backup 176 string -#ATTRIBUTE X-Ascend-Call-Type 177 integer -#ATTRIBUTE X-Ascend-Group 178 string -#ATTRIBUTE X-Ascend-FR-DLCI 179 integer -#ATTRIBUTE X-Ascend-FR-Profile-Name 180 string -#ATTRIBUTE X-Ascend-Ara-PW 181 string -#ATTRIBUTE X-Ascend-IPX-Node-Addr 182 string -#ATTRIBUTE X-Ascend-Home-Agent-IP-Addr 183 ipaddr -#ATTRIBUTE X-Ascend-Home-Agent-Password 184 string -#ATTRIBUTE X-Ascend-Home-Network-Name 185 string -#ATTRIBUTE X-Ascend-Home-Agent-UDP-Port 186 integer -#ATTRIBUTE X-Ascend-Multilink-ID 187 integer -#ATTRIBUTE X-Ascend-Num-In-Multilink 188 integer -#ATTRIBUTE X-Ascend-First-Dest 189 ipaddr -#ATTRIBUTE X-Ascend-Pre-Input-Octets 190 integer -#ATTRIBUTE X-Ascend-Pre-Output-Octets 191 integer -#ATTRIBUTE X-Ascend-Pre-Input-Packets 192 integer -#ATTRIBUTE X-Ascend-Pre-Output-Packets 193 integer -#ATTRIBUTE X-Ascend-Maximum-Time 194 integer -#ATTRIBUTE X-Ascend-Disconnect-Cause 195 integer -#ATTRIBUTE X-Ascend-Connect-Progress 196 integer -#ATTRIBUTE X-Ascend-Data-Rate 197 integer -#ATTRIBUTE X-Ascend-PreSession-Time 198 integer -#ATTRIBUTE X-Ascend-Token-Idle 199 integer -#ATTRIBUTE X-Ascend-Token-Immediate 200 integer -#ATTRIBUTE X-Ascend-Require-Auth 201 integer -#ATTRIBUTE X-Ascend-Number-Sessions 202 string -#ATTRIBUTE X-Ascend-Authen-Alias 203 string -#ATTRIBUTE X-Ascend-Token-Expiry 204 integer -#ATTRIBUTE X-Ascend-Menu-Selector 205 string - -# -# These next two attributes conflict with the Digest attributes! -# and with dictionary.usr attribute Char-Noecho ## [wireshark] -# -#ATTRIBUTE X-Ascend-Menu-Item 206 string -#ATTRIBUTE X-Ascend-PW-Warntime 207 integer - -#ATTRIBUTE X-Ascend-PW-Lifetime 208 integer -#ATTRIBUTE X-Ascend-IP-Direct 209 ipaddr -#ATTRIBUTE X-Ascend-PPP-VJ-Slot-Comp 210 integer -#ATTRIBUTE X-Ascend-PPP-VJ-1172 211 integer -#ATTRIBUTE X-Ascend-PPP-Async-Map 212 integer -#ATTRIBUTE X-Ascend-Third-Prompt 213 string -#ATTRIBUTE X-Ascend-Send-Secret 214 string encrypt=3 -#ATTRIBUTE X-Ascend-Receive-Secret 215 string encrypt=3 -#ATTRIBUTE X-Ascend-IPX-Peer-Mode 216 integer -#ATTRIBUTE X-Ascend-IP-Pool-Definition 217 string -#ATTRIBUTE X-Ascend-Assign-IP-Pool 218 integer -#ATTRIBUTE X-Ascend-FR-Direct 219 integer -#ATTRIBUTE X-Ascend-FR-Direct-Profile 220 string -#ATTRIBUTE X-Ascend-FR-Direct-DLCI 221 integer -#ATTRIBUTE X-Ascend-Handle-IPX 222 integer -#ATTRIBUTE X-Ascend-Netware-timeout 223 integer -#ATTRIBUTE X-Ascend-IPX-Alias 224 integer -#ATTRIBUTE X-Ascend-Metric 225 integer -#ATTRIBUTE X-Ascend-PRI-Number-Type 226 integer -#ATTRIBUTE X-Ascend-Dial-Number 227 string -#ATTRIBUTE X-Ascend-Route-IP 228 integer -#ATTRIBUTE X-Ascend-Route-IPX 229 integer -#ATTRIBUTE X-Ascend-Bridge 230 integer -#ATTRIBUTE X-Ascend-Send-Auth 231 integer -#ATTRIBUTE X-Ascend-Send-Passwd 232 string -#ATTRIBUTE X-Ascend-Link-Compression 233 integer -#ATTRIBUTE X-Ascend-Target-Util 234 integer -#ATTRIBUTE X-Ascend-Maximum-Channels 235 integer -#ATTRIBUTE X-Ascend-Inc-Channel-Count 236 integer -#ATTRIBUTE X-Ascend-Dec-Channel-Count 237 integer -#ATTRIBUTE X-Ascend-Seconds-Of-History 238 integer -#ATTRIBUTE X-Ascend-History-Weigh-Type 239 integer -#ATTRIBUTE X-Ascend-Add-Seconds 240 integer -#ATTRIBUTE X-Ascend-Remove-Seconds 241 integer -#ATTRIBUTE X-Ascend-Data-Filter 242 abinary -#ATTRIBUTE X-Ascend-Call-Filter 243 abinary -#ATTRIBUTE X-Ascend-Idle-Limit 244 integer -#ATTRIBUTE X-Ascend-Preempt-Limit 245 integer -#ATTRIBUTE X-Ascend-Callback 246 integer -#ATTRIBUTE X-Ascend-Data-Svc 247 integer -#ATTRIBUTE X-Ascend-Force-56 248 integer -#ATTRIBUTE X-Ascend-Billing-Number 249 string -#ATTRIBUTE X-Ascend-Call-By-Call 250 integer -#ATTRIBUTE X-Ascend-Transit-Number 251 string -#ATTRIBUTE X-Ascend-Host-Info 252 string -#ATTRIBUTE X-Ascend-PPP-Address 253 ipaddr -#ATTRIBUTE X-Ascend-MPP-Idle-Percent 254 integer -#ATTRIBUTE X-Ascend-Xmit-Rate 255 integer - -# -# VALUEs for X-Ascend-* attributes, copied verbatim from the -# VALUEs above, for the VSA versions of Ascend-*. -# -# Do NOT edit the following VALUEs! Instead, re-generate them via: -# -# (for x in `egrep ^ATTRIBUTE dictionary.ascend | egrep 'X-Ascend-' | awk '{print $2}' | uniq`;do y=`echo $x | sed 's/X-//'`;egrep VALUE dictionary.ascend | egrep $y[^-] | sed "s/$y/X-$y/" ; done) > new-value -# -# -#VALUE X-Ascend-Temporary-Rtes Temp-Rtes-No 0 -#VALUE X-Ascend-Temporary-Rtes Temp-Rtes-Yes 1 -#VALUE X-Ascend-Tunneling-Protocol ATMP-Tunnel 0 -#VALUE X-Ascend-Tunneling-Protocol VTP-Tunnel 1 -#VALUE X-Ascend-Shared-Profile-Enable Shared-Profile-No 0 -#VALUE X-Ascend-Shared-Profile-Enable Shared-Profile-Yes 1 -#VALUE X-Ascend-Dialout-Allowed Dialout-Not-Allowed 0 -#VALUE X-Ascend-Dialout-Allowed Dialout-Allowed 1 -#VALUE X-Ascend-BACP-Enable BACP-No 0 -#VALUE X-Ascend-BACP-Enable BACP-Yes 1 -#VALUE X-Ascend-Client-Assign-DNS DNS-Assign-No 0 -#VALUE X-Ascend-Client-Assign-DNS DNS-Assign-Yes 1 -#VALUE X-Ascend-User-Acct-Type Ascend-User-Acct-None 0 -#VALUE X-Ascend-User-Acct-Type Ascend-User-Acct-User 1 -#VALUE X-Ascend-User-Acct-Type Ascend-User-Acct-User-Default 2 -#VALUE X-Ascend-User-Acct-Base Base-10 0 -#VALUE X-Ascend-User-Acct-Base Base-16 1 -#VALUE X-Ascend-DHCP-Reply DHCP-Reply-No 0 -#VALUE X-Ascend-DHCP-Reply DHCP-Reply-Yes 1 -#VALUE X-Ascend-Expect-Callback Expect-Callback-No 0 -#VALUE X-Ascend-Expect-Callback Expect-Callback-Yes 1 -#VALUE X-Ascend-Event-Type Ascend-ColdStart 1 -#VALUE X-Ascend-Event-Type Ascend-Session-Event 2 -#VALUE X-Ascend-Multicast-Client Multicast-No 0 -#VALUE X-Ascend-Multicast-Client Multicast-Yes 1 -#VALUE X-Ascend-FR-LinkUp Ascend-LinkUp-Default 0 -#VALUE X-Ascend-FR-LinkUp Ascend-LinkUp-AlwaysUp 1 -#VALUE X-Ascend-FR-Type Ascend-FR-DTE 0 -#VALUE X-Ascend-FR-Type Ascend-FR-DCE 1 -#VALUE X-Ascend-FR-Type Ascend-FR-NNI 2 -#VALUE X-Ascend-FR-Link-Mgt Ascend-FR-No-Link-Mgt 0 -#VALUE X-Ascend-FR-Link-Mgt Ascend-FR-T1-617D 1 -#VALUE X-Ascend-FR-Link-Mgt Ascend-FR-Q-933A 2 -#VALUE X-Ascend-TS-Idle-Mode TS-Idle-None 0 -#VALUE X-Ascend-TS-Idle-Mode TS-Idle-Input 1 -#VALUE X-Ascend-TS-Idle-Mode TS-Idle-Input-Output 2 -#VALUE X-Ascend-DBA-Monitor DBA-Transmit 0 -#VALUE X-Ascend-DBA-Monitor DBA-Transmit-Recv 1 -#VALUE X-Ascend-DBA-Monitor DBA-None 2 -#VALUE X-Ascend-FT1-Caller FT1-No 0 -#VALUE X-Ascend-FT1-Caller FT1-Yes 1 -#VALUE X-Ascend-Call-Type Switched 0 -#VALUE X-Ascend-Call-Type Nailed 1 -#VALUE X-Ascend-Call-Type Nailed/Mpp 2 -#VALUE X-Ascend-Call-Type Perm/Switched 3 -#VALUE X-Ascend-Call-Type AO/DI 6 -#VALUE X-Ascend-Call-Type MegaMax 7 -#VALUE X-Ascend-Disconnect-Cause No-Reason 0 -#VALUE X-Ascend-Disconnect-Cause Not-Applicable 1 -#VALUE X-Ascend-Disconnect-Cause Unknown 2 -#VALUE X-Ascend-Disconnect-Cause Call-Disconnected 3 -#VALUE X-Ascend-Disconnect-Cause CLID-Authentication-Failed 4 -#VALUE X-Ascend-Disconnect-Cause CLID-RADIUS-Timeout 5 -#VALUE X-Ascend-Disconnect-Cause Modem-No-DCD 10 -#VALUE X-Ascend-Disconnect-Cause DCD-Detected-Then-Inactive 11 -#VALUE X-Ascend-Disconnect-Cause Modem-Invalid-Result-Codes 12 -#VALUE X-Ascend-Disconnect-Cause TermSrv-User-Quit 20 -#VALUE X-Ascend-Disconnect-Cause TermSrv-Idle-Timeout 21 -#VALUE X-Ascend-Disconnect-Cause TermSrv-Exit-Telnet 22 -#VALUE X-Ascend-Disconnect-Cause TermSrv-No-IPaddr 23 -#VALUE X-Ascend-Disconnect-Cause TermSrv-Exit-Raw-TCP 24 -#VALUE X-Ascend-Disconnect-Cause TermSrv-Exit-Login-Failed 25 -#VALUE X-Ascend-Disconnect-Cause TermSrv-Exit-Raw-TCP-Disabled 26 -#VALUE X-Ascend-Disconnect-Cause TermSrv-CTRL-C-In-Login 27 -#VALUE X-Ascend-Disconnect-Cause TermSrv-Destroyed 28 -#VALUE X-Ascend-Disconnect-Cause TermSrv-User-Closed-VCon 29 -#VALUE X-Ascend-Disconnect-Cause TermSrv-VCon-Destroyed 30 -#VALUE X-Ascend-Disconnect-Cause TermSrv-Exit-Rlogin 31 -#VALUE X-Ascend-Disconnect-Cause TermSrv-Bad-Rlogin-Option 32 -#VALUE X-Ascend-Disconnect-Cause TermSrv-Not-Enough-Resources 33 -#VALUE X-Ascend-Disconnect-Cause MPP-No-NULL-Msg-Timeout 35 -#VALUE X-Ascend-Disconnect-Cause PPP-LCP-Timeout 40 -#VALUE X-Ascend-Disconnect-Cause PPP-LCP-Negotion-Failed 41 -#VALUE X-Ascend-Disconnect-Cause PPP-PAP-Auth-Failed 42 -#VALUE X-Ascend-Disconnect-Cause PPP-CHAP-Auth-Failed 43 -#VALUE X-Ascend-Disconnect-Cause PPP-Rmt-Auth-Failed 44 -#VALUE X-Ascend-Disconnect-Cause PPP-Rcv-Terminate-Req 45 -#VALUE X-Ascend-Disconnect-Cause PPP-Rcv-Close-Event 46 -#VALUE X-Ascend-Disconnect-Cause PPP-No-NCPs-Open 47 -#VALUE X-Ascend-Disconnect-Cause PPP-MP-Bundle-Unknown 48 -#VALUE X-Ascend-Disconnect-Cause PPP-LCP-Close-MP-Add-Fail 49 -#VALUE X-Ascend-Disconnect-Cause Session-Table-Full 50 -#VALUE X-Ascend-Disconnect-Cause Out-Of-Resources 51 -#VALUE X-Ascend-Disconnect-Cause Invalid-IP-Address 52 -#VALUE X-Ascend-Disconnect-Cause Hostname-Resolution-Failed 53 -#VALUE X-Ascend-Disconnect-Cause Bad-Or-Missing-Port-Number 54 -#VALUE X-Ascend-Disconnect-Cause Host-Reset 60 -#VALUE X-Ascend-Disconnect-Cause Connection-Refused 61 -#VALUE X-Ascend-Disconnect-Cause Connection-Timeout 62 -#VALUE X-Ascend-Disconnect-Cause Connection-Closed 63 -#VALUE X-Ascend-Disconnect-Cause Network-Unreachable 64 -#VALUE X-Ascend-Disconnect-Cause Host-Unreachable 65 -#VALUE X-Ascend-Disconnect-Cause Network-Unreachable-Admin 66 -#VALUE X-Ascend-Disconnect-Cause Host-Unreachable-Admin 67 -#VALUE X-Ascend-Disconnect-Cause Port-Unreachable 68 -#VALUE X-Ascend-Disconnect-Cause Session-Timeout 100 -#VALUE X-Ascend-Disconnect-Cause Invalid-Incoming-User 101 -#VALUE X-Ascend-Disconnect-Cause Disconnect-Due-To-Callback 102 -#VALUE X-Ascend-Disconnect-Cause Proto-Disabled-Or-Unsupported 120 -#VALUE X-Ascend-Disconnect-Cause Disconnect-Req-By-RADIUS 150 -#VALUE X-Ascend-Disconnect-Cause Disconnect-Req-By-Local-Admin 151 -#VALUE X-Ascend-Disconnect-Cause V110-Timeout-Sync-Retry-Exceed 160 -#VALUE X-Ascend-Disconnect-Cause PPP-Auth-Timeout-Exceeded 170 -#VALUE X-Ascend-Disconnect-Cause User-Executed-Do-Hangup 180 -#VALUE X-Ascend-Disconnect-Cause Remote-End-Hung-Up 185 -#VALUE X-Ascend-Disconnect-Cause Resource-Has-Been-Quiesced 190 -#VALUE X-Ascend-Disconnect-Cause Max-Call-Duration-Reached 195 -#VALUE X-Ascend-Connect-Progress No-Progress 0 -#VALUE X-Ascend-Connect-Progress Call-Up 10 -#VALUE X-Ascend-Connect-Progress Modem-Up 30 -#VALUE X-Ascend-Connect-Progress Modem-Awaiting-DCD 31 -#VALUE X-Ascend-Connect-Progress Modem-Awaiting-Codes 32 -#VALUE X-Ascend-Connect-Progress TermSrv-Started 40 -#VALUE X-Ascend-Connect-Progress TermSrv-Raw-TCP-Started 41 -#VALUE X-Ascend-Connect-Progress TermSrv-Telnet-Started 42 -#VALUE X-Ascend-Connect-Progress TermSrv-Raw-TCP-Connected 43 -#VALUE X-Ascend-Connect-Progress TermSrv-Telnet-Connected 44 -#VALUE X-Ascend-Connect-Progress TermSrv-Rlogin-Started 45 -#VALUE X-Ascend-Connect-Progress TermSrv-Rlogin-Connected 46 -#VALUE X-Ascend-Connect-Progress Modem-Outdial-Call-Up 50 -#VALUE X-Ascend-Connect-Progress LAN-Session-Up 60 -#VALUE X-Ascend-Connect-Progress LCP-Opening 61 -#VALUE X-Ascend-Connect-Progress CCP-Opening 62 -#VALUE X-Ascend-Connect-Progress IPNCP-Opening 63 -#VALUE X-Ascend-Connect-Progress BNCP-Opening 64 -#VALUE X-Ascend-Connect-Progress LCP-Opened 65 -#VALUE X-Ascend-Connect-Progress CCP-Opened 66 -#VALUE X-Ascend-Connect-Progress IPNCP-Opened 67 -#VALUE X-Ascend-Connect-Progress BNCP-Opened 68 -#VALUE X-Ascend-Connect-Progress LCP-State-Initial 69 -#VALUE X-Ascend-Connect-Progress LCP-State-Starting 70 -#VALUE X-Ascend-Connect-Progress LCP-State-Closed 71 -#VALUE X-Ascend-Connect-Progress LCP-State-Stopped 72 -#VALUE X-Ascend-Connect-Progress LCP-State-Closing 73 -#VALUE X-Ascend-Connect-Progress LCP-State-Stopping 74 -#VALUE X-Ascend-Connect-Progress LCP-State-Request-Sent 75 -#VALUE X-Ascend-Connect-Progress LCP-State-Ack-Received 76 -#VALUE X-Ascend-Connect-Progress LCP-State-Ack-Sent 77 -#VALUE X-Ascend-Connect-Progress IPXNCP-Opened 80 -#VALUE X-Ascend-Connect-Progress ATNCP-Opened 81 -#VALUE X-Ascend-Connect-Progress BACP-Opening 82 -#VALUE X-Ascend-Connect-Progress BACP-Opened 83 -#VALUE X-Ascend-Connect-Progress V110-Up 90 -#VALUE X-Ascend-Connect-Progress V110-State-Opened 91 -#VALUE X-Ascend-Connect-Progress V110-State-Carrier 92 -#VALUE X-Ascend-Connect-Progress V110-State-Reset 93 -#VALUE X-Ascend-Connect-Progress V110-State-Closed 94 -#VALUE X-Ascend-Token-Immediate Tok-Imm-No 0 -#VALUE X-Ascend-Token-Immediate Tok-Imm-Yes 1 -#VALUE X-Ascend-Require-Auth Not-Require-Auth 0 -#VALUE X-Ascend-Require-Auth Require-Auth 1 -#VALUE X-Ascend-PW-Warntime Days-Of-Warning 0 -#VALUE X-Ascend-PW-Lifetime Lifetime-In-Days 0 -#VALUE X-Ascend-PPP-VJ-Slot-Comp VJ-Slot-Comp-No 1 -#VALUE X-Ascend-PPP-VJ-1172 PPP-VJ-1172 1 -#VALUE X-Ascend-IPX-Peer-Mode IPX-Peer-Router 0 -#VALUE X-Ascend-IPX-Peer-Mode IPX-Peer-Dialin 1 -#VALUE X-Ascend-FR-Direct FR-Direct-No 0 -#VALUE X-Ascend-FR-Direct FR-Direct-Yes 1 -#VALUE X-Ascend-Handle-IPX Handle-IPX-None 0 -#VALUE X-Ascend-Handle-IPX Handle-IPX-Client 1 -#VALUE X-Ascend-Handle-IPX Handle-IPX-Server 2 -#VALUE X-Ascend-PRI-Number-Type Unknown-Number 0 -#VALUE X-Ascend-PRI-Number-Type Intl-Number 1 -#VALUE X-Ascend-PRI-Number-Type National-Number 2 -#VALUE X-Ascend-PRI-Number-Type Net-Specific-Number 3 -#VALUE X-Ascend-PRI-Number-Type Local-Number 4 -#VALUE X-Ascend-PRI-Number-Type Abbrev-Number 5 -#VALUE X-Ascend-Route-IP Route-IP-No 0 -#VALUE X-Ascend-Route-IP Route-IP-Yes 1 -#VALUE X-Ascend-Route-IPX Route-IPX-No 0 -#VALUE X-Ascend-Route-IPX Route-IPX-Yes 1 -#VALUE X-Ascend-Route-IPX Route-IPX-No 0 -#VALUE X-Ascend-Route-IPX Route-IPX-Yes 1 -#VALUE X-Ascend-Bridge Bridge-No 0 -#VALUE X-Ascend-Bridge Bridge-Yes 1 -#VALUE X-Ascend-Send-Auth Send-Auth-None 0 -#VALUE X-Ascend-Send-Auth Send-Auth-PAP 1 -#VALUE X-Ascend-Send-Auth Send-Auth-CHAP 2 -#VALUE X-Ascend-Send-Auth Send-Auth-MS-CHAP 3 -#VALUE X-Ascend-Link-Compression Link-Comp-None 0 -#VALUE X-Ascend-Link-Compression Link-Comp-Stac 1 -#VALUE X-Ascend-Link-Compression Link-Comp-Stac-Draft-9 2 -#VALUE X-Ascend-Link-Compression Link-Comp-MS-Stac 3 -#VALUE X-Ascend-History-Weigh-Type History-Constant 0 -#VALUE X-Ascend-History-Weigh-Type History-Linear 1 -#VALUE X-Ascend-History-Weigh-Type History-Quadratic 2 -#VALUE X-Ascend-Callback Callback-No 0 -#VALUE X-Ascend-Callback Callback-Yes 1 -#VALUE X-Ascend-Data-Svc Switched-Voice-Bearer 0 -#VALUE X-Ascend-Data-Svc Nailed-56KR 1 -#VALUE X-Ascend-Data-Svc Nailed-64K 2 -#VALUE X-Ascend-Data-Svc Switched-64KR 3 -#VALUE X-Ascend-Data-Svc Switched-56K 4 -#VALUE X-Ascend-Data-Svc Switched-384KR 5 -#VALUE X-Ascend-Data-Svc Switched-384K 6 -#VALUE X-Ascend-Data-Svc Switched-1536K 7 -#VALUE X-Ascend-Data-Svc Switched-1536KR 8 -#VALUE X-Ascend-Data-Svc Switched-128K 9 -#VALUE X-Ascend-Data-Svc Switched-192K 10 -#VALUE X-Ascend-Data-Svc Switched-256K 11 -#VALUE X-Ascend-Data-Svc Switched-320K 12 -#VALUE X-Ascend-Data-Svc Switched-384K-MR 13 -#VALUE X-Ascend-Data-Svc Switched-448K 14 -#VALUE X-Ascend-Data-Svc Switched-512K 15 -#VALUE X-Ascend-Data-Svc Switched-576K 16 -#VALUE X-Ascend-Data-Svc Switched-640K 17 -#VALUE X-Ascend-Data-Svc Switched-704K 18 -#VALUE X-Ascend-Data-Svc Switched-768K 19 -#VALUE X-Ascend-Data-Svc Switched-832K 20 -#VALUE X-Ascend-Data-Svc Switched-896K 21 -#VALUE X-Ascend-Data-Svc Switched-960K 22 -#VALUE X-Ascend-Data-Svc Switched-1024K 23 -#VALUE X-Ascend-Data-Svc Switched-1088K 24 -#VALUE X-Ascend-Data-Svc Switched-1152K 25 -#VALUE X-Ascend-Data-Svc Switched-1216K 26 -#VALUE X-Ascend-Data-Svc Switched-1280K 27 -#VALUE X-Ascend-Data-Svc Switched-1344K 28 -#VALUE X-Ascend-Data-Svc Switched-1408K 29 -#VALUE X-Ascend-Data-Svc Switched-1472K 30 -#VALUE X-Ascend-Data-Svc Switched-1600K 31 -#VALUE X-Ascend-Data-Svc Switched-1664K 32 -#VALUE X-Ascend-Data-Svc Switched-1728K 33 -#VALUE X-Ascend-Data-Svc Switched-1792K 34 -#VALUE X-Ascend-Data-Svc Switched-1856K 35 -#VALUE X-Ascend-Data-Svc Switched-1920K 36 -#VALUE X-Ascend-Data-Svc Switched-inherited 37 -#VALUE X-Ascend-Data-Svc Switched-restricted-bearer-x30 38 -#VALUE X-Ascend-Data-Svc Switched-clear-bearer-v110 39 -#VALUE X-Ascend-Data-Svc Switched-restricted-64-x30 40 -#VALUE X-Ascend-Data-Svc Switched-clear-56-v110 41 -#VALUE X-Ascend-Data-Svc Switched-modem 42 -#VALUE X-Ascend-Data-Svc Switched-atmodem 43 -#VALUE X-Ascend-Data-Svc Switched-V110-24-56 45 -#VALUE X-Ascend-Data-Svc Switched-V110-48-56 46 -#VALUE X-Ascend-Data-Svc Switched-V110-96-56 47 -#VALUE X-Ascend-Data-Svc Switched-V110-192-56 48 -#VALUE X-Ascend-Data-Svc Switched-V110-384-56 49 -#VALUE X-Ascend-Data-Svc Switched-V110-24-56R 50 -#VALUE X-Ascend-Data-Svc Switched-V110-48-56R 51 -#VALUE X-Ascend-Data-Svc Switched-V110-96-56R 52 -#VALUE X-Ascend-Data-Svc Switched-V110-192-56R 53 -#VALUE X-Ascend-Data-Svc Switched-V110-384-56R 54 -#VALUE X-Ascend-Data-Svc Switched-V110-24-64 55 -#VALUE X-Ascend-Data-Svc Switched-V110-48-64 56 -#VALUE X-Ascend-Data-Svc Switched-V110-96-64 57 -#VALUE X-Ascend-Data-Svc Switched-V110-192-64 58 -#VALUE X-Ascend-Data-Svc Switched-V110-384-64 59 -#VALUE X-Ascend-Data-Svc Switched-V110-24-64R 60 -#VALUE X-Ascend-Data-Svc Switched-V110-48-64R 61 -#VALUE X-Ascend-Data-Svc Switched-V110-96-64R 62 -#VALUE X-Ascend-Data-Svc Switched-V110-384-64R 64 -#VALUE X-Ascend-Data-Svc Switched-V110-192-64R 63 -#VALUE X-Ascend-Data-Svc Switched-Pots 68 -#VALUE X-Ascend-Data-Svc Switched-ATM 69 -#VALUE X-Ascend-Data-Svc Switched-FR 70 -#VALUE X-Ascend-Force-56 Force-56-No 0 -#VALUE X-Ascend-Force-56 Force-56-Yes 1 diff --git a/resources/protocols/radius/dictionary.ascend.illegal b/resources/protocols/radius/dictionary.ascend.illegal new file mode 100644 index 00000000..89f80b09 --- /dev/null +++ b/resources/protocols/radius/dictionary.ascend.illegal @@ -0,0 +1,432 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# Ascend dictionary that illegally uses the RFC space. +# +# $Id: b741c1f9d48d42dee068dd18e17932ab4aa8bc5d $ +# +############################################################################## +# +# Ascend specific extensions +# Used by ASCEND MAX/Pipeline products +# +# This next block is renamed because they share the same +# names as the vendor-specific attributes, BUT they occur +# in the lower (1-255) RADIUS attribute space. +# +# Older Ascend software will send these, rather than the +# vendor specific attributes. +# +ATTRIBUTE X-Ascend-FCP-Parameter 119 string +ATTRIBUTE X-Ascend-Modem-PortNo 120 integer +ATTRIBUTE X-Ascend-Modem-SlotNo 121 integer +ATTRIBUTE X-Ascend-Modem-ShelfNo 122 integer +ATTRIBUTE X-Ascend-Call-Attempt-Limit 123 integer +ATTRIBUTE X-Ascend-Call-Block-Duration 124 integer +ATTRIBUTE X-Ascend-Maximum-Call-Duration 125 integer +ATTRIBUTE X-Ascend-Temporary-Rtes 126 integer +ATTRIBUTE X-Ascend-Tunneling-Protocol 127 integer +ATTRIBUTE X-Ascend-Shared-Profile-Enable 128 integer +ATTRIBUTE X-Ascend-Primary-Home-Agent 129 string +ATTRIBUTE X-Ascend-Secondary-Home-Agent 130 string +ATTRIBUTE X-Ascend-Dialout-Allowed 131 integer +ATTRIBUTE X-Ascend-Client-Gateway 132 ipaddr +ATTRIBUTE X-Ascend-BACP-Enable 133 integer +ATTRIBUTE X-Ascend-DHCP-Maximum-Leases 134 integer +ATTRIBUTE X-Ascend-Client-Primary-DNS 135 ipaddr +ATTRIBUTE X-Ascend-Client-Secondary-DNS 136 ipaddr +ATTRIBUTE X-Ascend-Client-Assign-DNS 137 integer +ATTRIBUTE X-Ascend-User-Acct-Type 138 integer +ATTRIBUTE X-Ascend-User-Acct-Host 139 ipaddr +ATTRIBUTE X-Ascend-User-Acct-Port 140 integer +ATTRIBUTE X-Ascend-User-Acct-Key 141 string +ATTRIBUTE X-Ascend-User-Acct-Base 142 integer +ATTRIBUTE X-Ascend-User-Acct-Time 143 integer +ATTRIBUTE X-Ascend-Assign-IP-Client 144 ipaddr +ATTRIBUTE X-Ascend-Assign-IP-Server 145 ipaddr +ATTRIBUTE X-Ascend-Assign-IP-Global-Pool 146 string +ATTRIBUTE X-Ascend-DHCP-Reply 147 integer +ATTRIBUTE X-Ascend-DHCP-Pool-Number 148 integer +ATTRIBUTE X-Ascend-Expect-Callback 149 integer +ATTRIBUTE X-Ascend-Event-Type 150 integer +ATTRIBUTE X-Ascend-Session-Svr-Key 151 string +ATTRIBUTE X-Ascend-Multicast-Rate-Limit 152 integer +ATTRIBUTE X-Ascend-IF-Netmask 153 ipaddr +ATTRIBUTE X-Ascend-Remote-Addr 154 ipaddr +ATTRIBUTE X-Ascend-Multicast-Client 155 integer +ATTRIBUTE X-Ascend-FR-Circuit-Name 156 string +ATTRIBUTE X-Ascend-FR-LinkUp 157 integer +ATTRIBUTE X-Ascend-FR-Nailed-Grp 158 integer +ATTRIBUTE X-Ascend-FR-Type 159 integer +ATTRIBUTE X-Ascend-FR-Link-Mgt 160 integer +ATTRIBUTE X-Ascend-FR-N391 161 integer +ATTRIBUTE X-Ascend-FR-DCE-N392 162 integer +ATTRIBUTE X-Ascend-FR-DTE-N392 163 integer +ATTRIBUTE X-Ascend-FR-DCE-N393 164 integer +ATTRIBUTE X-Ascend-FR-DTE-N393 165 integer +ATTRIBUTE X-Ascend-FR-T391 166 integer +ATTRIBUTE X-Ascend-FR-T392 167 integer +ATTRIBUTE X-Ascend-Bridge-Address 168 string +ATTRIBUTE X-Ascend-TS-Idle-Limit 169 integer +ATTRIBUTE X-Ascend-TS-Idle-Mode 170 integer +ATTRIBUTE X-Ascend-DBA-Monitor 171 integer +ATTRIBUTE X-Ascend-Base-Channel-Count 172 integer +ATTRIBUTE X-Ascend-Minimum-Channels 173 integer +ATTRIBUTE X-Ascend-IPX-Route 174 string +ATTRIBUTE X-Ascend-FT1-Caller 175 integer +ATTRIBUTE X-Ascend-Backup 176 string +ATTRIBUTE X-Ascend-Call-Type 177 integer +ATTRIBUTE X-Ascend-Group 178 string +ATTRIBUTE X-Ascend-FR-DLCI 179 integer +ATTRIBUTE X-Ascend-FR-Profile-Name 180 string +ATTRIBUTE X-Ascend-Ara-PW 181 string +ATTRIBUTE X-Ascend-IPX-Node-Addr 182 string +ATTRIBUTE X-Ascend-Home-Agent-IP-Addr 183 ipaddr +ATTRIBUTE X-Ascend-Home-Agent-Password 184 string +ATTRIBUTE X-Ascend-Home-Network-Name 185 string +ATTRIBUTE X-Ascend-Home-Agent-UDP-Port 186 integer +ATTRIBUTE X-Ascend-Multilink-ID 187 integer +ATTRIBUTE X-Ascend-Num-In-Multilink 188 integer +ATTRIBUTE X-Ascend-First-Dest 189 ipaddr +ATTRIBUTE X-Ascend-Pre-Input-Octets 190 integer +ATTRIBUTE X-Ascend-Pre-Output-Octets 191 integer +ATTRIBUTE X-Ascend-Pre-Input-Packets 192 integer +ATTRIBUTE X-Ascend-Pre-Output-Packets 193 integer +ATTRIBUTE X-Ascend-Maximum-Time 194 integer +ATTRIBUTE X-Ascend-Disconnect-Cause 195 integer +ATTRIBUTE X-Ascend-Connect-Progress 196 integer +ATTRIBUTE X-Ascend-Data-Rate 197 integer +ATTRIBUTE X-Ascend-PreSession-Time 198 integer +ATTRIBUTE X-Ascend-Token-Idle 199 integer +ATTRIBUTE X-Ascend-Token-Immediate 200 integer +ATTRIBUTE X-Ascend-Require-Auth 201 integer +ATTRIBUTE X-Ascend-Number-Sessions 202 string +ATTRIBUTE X-Ascend-Authen-Alias 203 string +ATTRIBUTE X-Ascend-Token-Expiry 204 integer +ATTRIBUTE X-Ascend-Menu-Selector 205 string + +# +# These next two attributes conflict with the Digest attributes! +# +ATTRIBUTE X-Ascend-Menu-Item 206 string +ATTRIBUTE X-Ascend-PW-Warntime 207 integer + +ATTRIBUTE X-Ascend-PW-Lifetime 208 integer +ATTRIBUTE X-Ascend-IP-Direct 209 ipaddr +ATTRIBUTE X-Ascend-PPP-VJ-Slot-Comp 210 integer +ATTRIBUTE X-Ascend-PPP-VJ-1172 211 integer +ATTRIBUTE X-Ascend-PPP-Async-Map 212 integer +ATTRIBUTE X-Ascend-Third-Prompt 213 string +ATTRIBUTE X-Ascend-Send-Secret 214 string encrypt=3 +ATTRIBUTE X-Ascend-Receive-Secret 215 string encrypt=3 +ATTRIBUTE X-Ascend-IPX-Peer-Mode 216 integer +ATTRIBUTE X-Ascend-IP-Pool-Definition 217 string +ATTRIBUTE X-Ascend-Assign-IP-Pool 218 integer +ATTRIBUTE X-Ascend-FR-Direct 219 integer +ATTRIBUTE X-Ascend-FR-Direct-Profile 220 string +ATTRIBUTE X-Ascend-FR-Direct-DLCI 221 integer +ATTRIBUTE X-Ascend-Handle-IPX 222 integer +ATTRIBUTE X-Ascend-Netware-timeout 223 integer +ATTRIBUTE X-Ascend-IPX-Alias 224 integer +ATTRIBUTE X-Ascend-Metric 225 integer +ATTRIBUTE X-Ascend-PRI-Number-Type 226 integer +ATTRIBUTE X-Ascend-Dial-Number 227 string +ATTRIBUTE X-Ascend-Route-IP 228 integer +ATTRIBUTE X-Ascend-Route-IPX 229 integer +ATTRIBUTE X-Ascend-Bridge 230 integer +ATTRIBUTE X-Ascend-Send-Auth 231 integer +ATTRIBUTE X-Ascend-Send-Passwd 232 string +ATTRIBUTE X-Ascend-Link-Compression 233 integer +ATTRIBUTE X-Ascend-Target-Util 234 integer +ATTRIBUTE X-Ascend-Maximum-Channels 235 integer +ATTRIBUTE X-Ascend-Inc-Channel-Count 236 integer +ATTRIBUTE X-Ascend-Dec-Channel-Count 237 integer +ATTRIBUTE X-Ascend-Seconds-Of-History 238 integer +ATTRIBUTE X-Ascend-History-Weigh-Type 239 integer +ATTRIBUTE X-Ascend-Add-Seconds 240 integer +ATTRIBUTE X-Ascend-Remove-Seconds 241 integer +ATTRIBUTE X-Ascend-Data-Filter 242 abinary +ATTRIBUTE X-Ascend-Call-Filter 243 abinary +ATTRIBUTE X-Ascend-Idle-Limit 244 integer +ATTRIBUTE X-Ascend-Preempt-Limit 245 integer +ATTRIBUTE X-Ascend-Callback 246 integer +ATTRIBUTE X-Ascend-Data-Svc 247 integer +ATTRIBUTE X-Ascend-Force-56 248 integer +ATTRIBUTE X-Ascend-Billing-Number 249 string +ATTRIBUTE X-Ascend-Call-By-Call 250 integer +ATTRIBUTE X-Ascend-Transit-Number 251 string +ATTRIBUTE X-Ascend-Host-Info 252 string +ATTRIBUTE X-Ascend-PPP-Address 253 ipaddr +ATTRIBUTE X-Ascend-MPP-Idle-Percent 254 integer +ATTRIBUTE X-Ascend-Xmit-Rate 255 integer + +# +# VALUEs for X-Ascend-* attributes, copied verbatim from the +# VALUEs above, for the VSA versions of Ascend-*. +# +# Do NOT edit the following VALUEs! Instead, re-generate them via: +# +# (for x in `egrep ^ATTRIBUTE dictionary.ascend | egrep 'X-Ascend-' | awk '{print $2}' | uniq`;do y=`echo $x | sed 's/X-//'`;egrep VALUE dictionary.ascend | egrep $y[^-] | sed "s/$y/X-$y/" ; done) > new-value +# +# +VALUE X-Ascend-Temporary-Rtes Temp-Rtes-No 0 +VALUE X-Ascend-Temporary-Rtes Temp-Rtes-Yes 1 +VALUE X-Ascend-Tunneling-Protocol ATMP-Tunnel 0 +VALUE X-Ascend-Tunneling-Protocol VTP-Tunnel 1 +VALUE X-Ascend-Shared-Profile-Enable Shared-Profile-No 0 +VALUE X-Ascend-Shared-Profile-Enable Shared-Profile-Yes 1 +VALUE X-Ascend-Dialout-Allowed Dialout-Not-Allowed 0 +VALUE X-Ascend-Dialout-Allowed Dialout-Allowed 1 +VALUE X-Ascend-BACP-Enable BACP-No 0 +VALUE X-Ascend-BACP-Enable BACP-Yes 1 +VALUE X-Ascend-Client-Assign-DNS DNS-Assign-No 0 +VALUE X-Ascend-Client-Assign-DNS DNS-Assign-Yes 1 +VALUE X-Ascend-User-Acct-Type Ascend-User-Acct-None 0 +VALUE X-Ascend-User-Acct-Type Ascend-User-Acct-User 1 +VALUE X-Ascend-User-Acct-Type Ascend-User-Acct-User-Default 2 +VALUE X-Ascend-User-Acct-Base Base-10 0 +VALUE X-Ascend-User-Acct-Base Base-16 1 +VALUE X-Ascend-DHCP-Reply DHCP-Reply-No 0 +VALUE X-Ascend-DHCP-Reply DHCP-Reply-Yes 1 +VALUE X-Ascend-Expect-Callback Expect-Callback-No 0 +VALUE X-Ascend-Expect-Callback Expect-Callback-Yes 1 +VALUE X-Ascend-Event-Type Ascend-ColdStart 1 +VALUE X-Ascend-Event-Type Ascend-Session-Event 2 +VALUE X-Ascend-Multicast-Client Multicast-No 0 +VALUE X-Ascend-Multicast-Client Multicast-Yes 1 +VALUE X-Ascend-FR-LinkUp Ascend-LinkUp-Default 0 +VALUE X-Ascend-FR-LinkUp Ascend-LinkUp-AlwaysUp 1 +VALUE X-Ascend-FR-Type Ascend-FR-DTE 0 +VALUE X-Ascend-FR-Type Ascend-FR-DCE 1 +VALUE X-Ascend-FR-Type Ascend-FR-NNI 2 +VALUE X-Ascend-FR-Link-Mgt Ascend-FR-No-Link-Mgt 0 +VALUE X-Ascend-FR-Link-Mgt Ascend-FR-T1-617D 1 +VALUE X-Ascend-FR-Link-Mgt Ascend-FR-Q-933A 2 +VALUE X-Ascend-TS-Idle-Mode TS-Idle-None 0 +VALUE X-Ascend-TS-Idle-Mode TS-Idle-Input 1 +VALUE X-Ascend-TS-Idle-Mode TS-Idle-Input-Output 2 +VALUE X-Ascend-DBA-Monitor DBA-Transmit 0 +VALUE X-Ascend-DBA-Monitor DBA-Transmit-Recv 1 +VALUE X-Ascend-DBA-Monitor DBA-None 2 +VALUE X-Ascend-FT1-Caller FT1-No 0 +VALUE X-Ascend-FT1-Caller FT1-Yes 1 +VALUE X-Ascend-Call-Type Switched 0 +VALUE X-Ascend-Call-Type Nailed 1 +VALUE X-Ascend-Call-Type Nailed/Mpp 2 +VALUE X-Ascend-Call-Type Perm/Switched 3 +VALUE X-Ascend-Call-Type AO/DI 6 +VALUE X-Ascend-Call-Type MegaMax 7 +VALUE X-Ascend-Disconnect-Cause No-Reason 0 +VALUE X-Ascend-Disconnect-Cause Not-Applicable 1 +VALUE X-Ascend-Disconnect-Cause Unknown 2 +VALUE X-Ascend-Disconnect-Cause Call-Disconnected 3 +VALUE X-Ascend-Disconnect-Cause CLID-Authentication-Failed 4 +VALUE X-Ascend-Disconnect-Cause CLID-RADIUS-Timeout 5 +VALUE X-Ascend-Disconnect-Cause Modem-No-DCD 10 +VALUE X-Ascend-Disconnect-Cause DCD-Detected-Then-Inactive 11 +VALUE X-Ascend-Disconnect-Cause Modem-Invalid-Result-Codes 12 +VALUE X-Ascend-Disconnect-Cause TermSrv-User-Quit 20 +VALUE X-Ascend-Disconnect-Cause TermSrv-Idle-Timeout 21 +VALUE X-Ascend-Disconnect-Cause TermSrv-Exit-Telnet 22 +VALUE X-Ascend-Disconnect-Cause TermSrv-No-IPaddr 23 +VALUE X-Ascend-Disconnect-Cause TermSrv-Exit-Raw-TCP 24 +VALUE X-Ascend-Disconnect-Cause TermSrv-Exit-Login-Failed 25 +VALUE X-Ascend-Disconnect-Cause TermSrv-Exit-Raw-TCP-Disabled 26 +VALUE X-Ascend-Disconnect-Cause TermSrv-CTRL-C-In-Login 27 +VALUE X-Ascend-Disconnect-Cause TermSrv-Destroyed 28 +VALUE X-Ascend-Disconnect-Cause TermSrv-User-Closed-VCon 29 +VALUE X-Ascend-Disconnect-Cause TermSrv-VCon-Destroyed 30 +VALUE X-Ascend-Disconnect-Cause TermSrv-Exit-Rlogin 31 +VALUE X-Ascend-Disconnect-Cause TermSrv-Bad-Rlogin-Option 32 +VALUE X-Ascend-Disconnect-Cause TermSrv-Not-Enough-Resources 33 +VALUE X-Ascend-Disconnect-Cause MPP-No-NULL-Msg-Timeout 35 +VALUE X-Ascend-Disconnect-Cause PPP-LCP-Timeout 40 +VALUE X-Ascend-Disconnect-Cause PPP-LCP-Negotion-Failed 41 +VALUE X-Ascend-Disconnect-Cause PPP-PAP-Auth-Failed 42 +VALUE X-Ascend-Disconnect-Cause PPP-CHAP-Auth-Failed 43 +VALUE X-Ascend-Disconnect-Cause PPP-Rmt-Auth-Failed 44 +VALUE X-Ascend-Disconnect-Cause PPP-Rcv-Terminate-Req 45 +VALUE X-Ascend-Disconnect-Cause PPP-Rcv-Close-Event 46 +VALUE X-Ascend-Disconnect-Cause PPP-No-NCPs-Open 47 +VALUE X-Ascend-Disconnect-Cause PPP-MP-Bundle-Unknown 48 +VALUE X-Ascend-Disconnect-Cause PPP-LCP-Close-MP-Add-Fail 49 +VALUE X-Ascend-Disconnect-Cause Session-Table-Full 50 +VALUE X-Ascend-Disconnect-Cause Out-Of-Resources 51 +VALUE X-Ascend-Disconnect-Cause Invalid-IP-Address 52 +VALUE X-Ascend-Disconnect-Cause Hostname-Resolution-Failed 53 +VALUE X-Ascend-Disconnect-Cause Bad-Or-Missing-Port-Number 54 +VALUE X-Ascend-Disconnect-Cause Host-Reset 60 +VALUE X-Ascend-Disconnect-Cause Connection-Refused 61 +VALUE X-Ascend-Disconnect-Cause Connection-Timeout 62 +VALUE X-Ascend-Disconnect-Cause Connection-Closed 63 +VALUE X-Ascend-Disconnect-Cause Network-Unreachable 64 +VALUE X-Ascend-Disconnect-Cause Host-Unreachable 65 +VALUE X-Ascend-Disconnect-Cause Network-Unreachable-Admin 66 +VALUE X-Ascend-Disconnect-Cause Host-Unreachable-Admin 67 +VALUE X-Ascend-Disconnect-Cause Port-Unreachable 68 +VALUE X-Ascend-Disconnect-Cause Session-Timeout 100 +VALUE X-Ascend-Disconnect-Cause Invalid-Incoming-User 101 +VALUE X-Ascend-Disconnect-Cause Disconnect-Due-To-Callback 102 +VALUE X-Ascend-Disconnect-Cause Proto-Disabled-Or-Unsupported 120 +VALUE X-Ascend-Disconnect-Cause Disconnect-Req-By-RADIUS 150 +VALUE X-Ascend-Disconnect-Cause Disconnect-Req-By-Local-Admin 151 +VALUE X-Ascend-Disconnect-Cause V110-Timeout-Sync-Retry-Exceed 160 +VALUE X-Ascend-Disconnect-Cause PPP-Auth-Timeout-Exceeded 170 +VALUE X-Ascend-Disconnect-Cause User-Executed-Do-Hangup 180 +VALUE X-Ascend-Disconnect-Cause Remote-End-Hung-Up 185 +VALUE X-Ascend-Disconnect-Cause Resource-Has-Been-Quiesced 190 +VALUE X-Ascend-Disconnect-Cause Max-Call-Duration-Reached 195 +VALUE X-Ascend-Connect-Progress No-Progress 0 +VALUE X-Ascend-Connect-Progress Call-Up 10 +VALUE X-Ascend-Connect-Progress Modem-Up 30 +VALUE X-Ascend-Connect-Progress Modem-Awaiting-DCD 31 +VALUE X-Ascend-Connect-Progress Modem-Awaiting-Codes 32 +VALUE X-Ascend-Connect-Progress TermSrv-Started 40 +VALUE X-Ascend-Connect-Progress TermSrv-Raw-TCP-Started 41 +VALUE X-Ascend-Connect-Progress TermSrv-Telnet-Started 42 +VALUE X-Ascend-Connect-Progress TermSrv-Raw-TCP-Connected 43 +VALUE X-Ascend-Connect-Progress TermSrv-Telnet-Connected 44 +VALUE X-Ascend-Connect-Progress TermSrv-Rlogin-Started 45 +VALUE X-Ascend-Connect-Progress TermSrv-Rlogin-Connected 46 +VALUE X-Ascend-Connect-Progress Modem-Outdial-Call-Up 50 +VALUE X-Ascend-Connect-Progress LAN-Session-Up 60 +VALUE X-Ascend-Connect-Progress LCP-Opening 61 +VALUE X-Ascend-Connect-Progress CCP-Opening 62 +VALUE X-Ascend-Connect-Progress IPNCP-Opening 63 +VALUE X-Ascend-Connect-Progress BNCP-Opening 64 +VALUE X-Ascend-Connect-Progress LCP-Opened 65 +VALUE X-Ascend-Connect-Progress CCP-Opened 66 +VALUE X-Ascend-Connect-Progress IPNCP-Opened 67 +VALUE X-Ascend-Connect-Progress BNCP-Opened 68 +VALUE X-Ascend-Connect-Progress LCP-State-Initial 69 +VALUE X-Ascend-Connect-Progress LCP-State-Starting 70 +VALUE X-Ascend-Connect-Progress LCP-State-Closed 71 +VALUE X-Ascend-Connect-Progress LCP-State-Stopped 72 +VALUE X-Ascend-Connect-Progress LCP-State-Closing 73 +VALUE X-Ascend-Connect-Progress LCP-State-Stopping 74 +VALUE X-Ascend-Connect-Progress LCP-State-Request-Sent 75 +VALUE X-Ascend-Connect-Progress LCP-State-Ack-Received 76 +VALUE X-Ascend-Connect-Progress LCP-State-Ack-Sent 77 +VALUE X-Ascend-Connect-Progress IPXNCP-Opened 80 +VALUE X-Ascend-Connect-Progress ATNCP-Opened 81 +VALUE X-Ascend-Connect-Progress BACP-Opening 82 +VALUE X-Ascend-Connect-Progress BACP-Opened 83 +VALUE X-Ascend-Connect-Progress V110-Up 90 +VALUE X-Ascend-Connect-Progress V110-State-Opened 91 +VALUE X-Ascend-Connect-Progress V110-State-Carrier 92 +VALUE X-Ascend-Connect-Progress V110-State-Reset 93 +VALUE X-Ascend-Connect-Progress V110-State-Closed 94 +VALUE X-Ascend-Token-Immediate Tok-Imm-No 0 +VALUE X-Ascend-Token-Immediate Tok-Imm-Yes 1 +VALUE X-Ascend-Require-Auth Not-Require-Auth 0 +VALUE X-Ascend-Require-Auth Require-Auth 1 +VALUE X-Ascend-PW-Warntime Days-Of-Warning 0 +VALUE X-Ascend-PW-Lifetime Lifetime-In-Days 0 +VALUE X-Ascend-PPP-VJ-Slot-Comp VJ-Slot-Comp-No 1 +VALUE X-Ascend-PPP-VJ-1172 PPP-VJ-1172 1 +VALUE X-Ascend-IPX-Peer-Mode IPX-Peer-Router 0 +VALUE X-Ascend-IPX-Peer-Mode IPX-Peer-Dialin 1 +VALUE X-Ascend-FR-Direct FR-Direct-No 0 +VALUE X-Ascend-FR-Direct FR-Direct-Yes 1 +VALUE X-Ascend-Handle-IPX Handle-IPX-None 0 +VALUE X-Ascend-Handle-IPX Handle-IPX-Client 1 +VALUE X-Ascend-Handle-IPX Handle-IPX-Server 2 +VALUE X-Ascend-PRI-Number-Type Unknown-Number 0 +VALUE X-Ascend-PRI-Number-Type Intl-Number 1 +VALUE X-Ascend-PRI-Number-Type National-Number 2 +VALUE X-Ascend-PRI-Number-Type Net-Specific-Number 3 +VALUE X-Ascend-PRI-Number-Type Local-Number 4 +VALUE X-Ascend-PRI-Number-Type Abbrev-Number 5 +VALUE X-Ascend-Route-IP Route-IP-No 0 +VALUE X-Ascend-Route-IP Route-IP-Yes 1 +VALUE X-Ascend-Route-IPX Route-IPX-No 0 +VALUE X-Ascend-Route-IPX Route-IPX-Yes 1 +VALUE X-Ascend-Route-IPX Route-IPX-No 0 +VALUE X-Ascend-Route-IPX Route-IPX-Yes 1 +VALUE X-Ascend-Bridge Bridge-No 0 +VALUE X-Ascend-Bridge Bridge-Yes 1 +VALUE X-Ascend-Send-Auth Send-Auth-None 0 +VALUE X-Ascend-Send-Auth Send-Auth-PAP 1 +VALUE X-Ascend-Send-Auth Send-Auth-CHAP 2 +VALUE X-Ascend-Send-Auth Send-Auth-MS-CHAP 3 +VALUE X-Ascend-Link-Compression Link-Comp-None 0 +VALUE X-Ascend-Link-Compression Link-Comp-Stac 1 +VALUE X-Ascend-Link-Compression Link-Comp-Stac-Draft-9 2 +VALUE X-Ascend-Link-Compression Link-Comp-MS-Stac 3 +VALUE X-Ascend-History-Weigh-Type History-Constant 0 +VALUE X-Ascend-History-Weigh-Type History-Linear 1 +VALUE X-Ascend-History-Weigh-Type History-Quadratic 2 +VALUE X-Ascend-Callback Callback-No 0 +VALUE X-Ascend-Callback Callback-Yes 1 +VALUE X-Ascend-Data-Svc Switched-Voice-Bearer 0 +VALUE X-Ascend-Data-Svc Nailed-56KR 1 +VALUE X-Ascend-Data-Svc Nailed-64K 2 +VALUE X-Ascend-Data-Svc Switched-64KR 3 +VALUE X-Ascend-Data-Svc Switched-56K 4 +VALUE X-Ascend-Data-Svc Switched-384KR 5 +VALUE X-Ascend-Data-Svc Switched-384K 6 +VALUE X-Ascend-Data-Svc Switched-1536K 7 +VALUE X-Ascend-Data-Svc Switched-1536KR 8 +VALUE X-Ascend-Data-Svc Switched-128K 9 +VALUE X-Ascend-Data-Svc Switched-192K 10 +VALUE X-Ascend-Data-Svc Switched-256K 11 +VALUE X-Ascend-Data-Svc Switched-320K 12 +VALUE X-Ascend-Data-Svc Switched-384K-MR 13 +VALUE X-Ascend-Data-Svc Switched-448K 14 +VALUE X-Ascend-Data-Svc Switched-512K 15 +VALUE X-Ascend-Data-Svc Switched-576K 16 +VALUE X-Ascend-Data-Svc Switched-640K 17 +VALUE X-Ascend-Data-Svc Switched-704K 18 +VALUE X-Ascend-Data-Svc Switched-768K 19 +VALUE X-Ascend-Data-Svc Switched-832K 20 +VALUE X-Ascend-Data-Svc Switched-896K 21 +VALUE X-Ascend-Data-Svc Switched-960K 22 +VALUE X-Ascend-Data-Svc Switched-1024K 23 +VALUE X-Ascend-Data-Svc Switched-1088K 24 +VALUE X-Ascend-Data-Svc Switched-1152K 25 +VALUE X-Ascend-Data-Svc Switched-1216K 26 +VALUE X-Ascend-Data-Svc Switched-1280K 27 +VALUE X-Ascend-Data-Svc Switched-1344K 28 +VALUE X-Ascend-Data-Svc Switched-1408K 29 +VALUE X-Ascend-Data-Svc Switched-1472K 30 +VALUE X-Ascend-Data-Svc Switched-1600K 31 +VALUE X-Ascend-Data-Svc Switched-1664K 32 +VALUE X-Ascend-Data-Svc Switched-1728K 33 +VALUE X-Ascend-Data-Svc Switched-1792K 34 +VALUE X-Ascend-Data-Svc Switched-1856K 35 +VALUE X-Ascend-Data-Svc Switched-1920K 36 +VALUE X-Ascend-Data-Svc Switched-inherited 37 +VALUE X-Ascend-Data-Svc Switched-restricted-bearer-x30 38 +VALUE X-Ascend-Data-Svc Switched-clear-bearer-v110 39 +VALUE X-Ascend-Data-Svc Switched-restricted-64-x30 40 +VALUE X-Ascend-Data-Svc Switched-clear-56-v110 41 +VALUE X-Ascend-Data-Svc Switched-modem 42 +VALUE X-Ascend-Data-Svc Switched-atmodem 43 +VALUE X-Ascend-Data-Svc Switched-V110-24-56 45 +VALUE X-Ascend-Data-Svc Switched-V110-48-56 46 +VALUE X-Ascend-Data-Svc Switched-V110-96-56 47 +VALUE X-Ascend-Data-Svc Switched-V110-192-56 48 +VALUE X-Ascend-Data-Svc Switched-V110-384-56 49 +VALUE X-Ascend-Data-Svc Switched-V110-24-56R 50 +VALUE X-Ascend-Data-Svc Switched-V110-48-56R 51 +VALUE X-Ascend-Data-Svc Switched-V110-96-56R 52 +VALUE X-Ascend-Data-Svc Switched-V110-192-56R 53 +VALUE X-Ascend-Data-Svc Switched-V110-384-56R 54 +VALUE X-Ascend-Data-Svc Switched-V110-24-64 55 +VALUE X-Ascend-Data-Svc Switched-V110-48-64 56 +VALUE X-Ascend-Data-Svc Switched-V110-96-64 57 +VALUE X-Ascend-Data-Svc Switched-V110-192-64 58 +VALUE X-Ascend-Data-Svc Switched-V110-384-64 59 +VALUE X-Ascend-Data-Svc Switched-V110-24-64R 60 +VALUE X-Ascend-Data-Svc Switched-V110-48-64R 61 +VALUE X-Ascend-Data-Svc Switched-V110-96-64R 62 +VALUE X-Ascend-Data-Svc Switched-V110-384-64R 64 +VALUE X-Ascend-Data-Svc Switched-V110-192-64R 63 +VALUE X-Ascend-Data-Svc Switched-Pots 68 +VALUE X-Ascend-Data-Svc Switched-ATM 69 +VALUE X-Ascend-Data-Svc Switched-FR 70 +VALUE X-Ascend-Force-56 Force-56-No 0 +VALUE X-Ascend-Force-56 Force-56-Yes 1 diff --git a/resources/protocols/radius/dictionary.asn b/resources/protocols/radius/dictionary.asn index 33d0319d..62133f1b 100644 --- a/resources/protocols/radius/dictionary.asn +++ b/resources/protocols/radius/dictionary.asn @@ -1,12 +1,14 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # ASN Attributes. # # Taken from http://svn.asn.pl/misc/freeradius/dictionary.asn # -# $Id: 97fc9f140da31dd0d6958c5133979dadc12815fd $ +# $Id: cebb30a31db5456cf120179aec43d41db692cda2 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.audiocodes b/resources/protocols/radius/dictionary.audiocodes index ec1c232d..931df293 100644 --- a/resources/protocols/radius/dictionary.audiocodes +++ b/resources/protocols/radius/dictionary.audiocodes @@ -1,12 +1,14 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Audiocodes # # http://www.audiocodes.com/filehandler.ashx?fileid=36358 # -# $Id: 1a651576ff0e71c020ff1deb19b14a01f51f88b8 $ +# $Id: 1ce23b3d4a281658fcb3c68598b0105fcd717d5f $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.avaya b/resources/protocols/radius/dictionary.avaya index 65eaa643..16f3030e 100644 --- a/resources/protocols/radius/dictionary.avaya +++ b/resources/protocols/radius/dictionary.avaya @@ -1,8 +1,9 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Avaya P330 dictionary file -# $Id: 48927946b2a5e41ee154c9f8c801217dfbd11df6 $ +# $Id: f51664b3afbf2de8d9785566f12281cb6b7b8f40 $ # # http://support.avaya.com/elmodocs2/p330/P330/Configuring%20FreeRadius.pdf # diff --git a/resources/protocols/radius/dictionary.azaire b/resources/protocols/radius/dictionary.azaire index 662a41b4..f4e877f6 100644 --- a/resources/protocols/radius/dictionary.azaire +++ b/resources/protocols/radius/dictionary.azaire @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Azaire VSAs # -# $Id: f68589e325ff9d7eff3cd486caabfb2d238ba5f4 $ +# $Id: 304797f9f90d0d46bc862a17fe5482bc2f95e63a $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.bay b/resources/protocols/radius/dictionary.bay index f3fbb3d1..30c854dd 100644 --- a/resources/protocols/radius/dictionary.bay +++ b/resources/protocols/radius/dictionary.bay @@ -1,11 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Bay Networks # http://www.baynetworks.com/ # # From MegaZone <megazone@megazone.org>, as posted to the bay-isp list. -# Modified for libradius by Alan DeKok <aland@ox.org> +# Modified for Freeradius by Alan DeKok <aland@freeradius.org> # # Bay Networks was acquired by Nortel in 1998. Some Avaya products continue # to use attributes from this dictionary as result of the Nortel acquisitions. diff --git a/resources/protocols/radius/dictionary.bigswitch b/resources/protocols/radius/dictionary.bigswitch new file mode 100644 index 00000000..b44143d3 --- /dev/null +++ b/resources/protocols/radius/dictionary.bigswitch @@ -0,0 +1,17 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +###################################################################### +# Big Switch Networks (BSN) Dictionary +# Author: Nitin Madhok <nmadhok@g.clemson.edu> +# Version: $Id: e6c4ccd3761a65d00466ec5f9462520a65c25383 $ +###################################################################### + +VENDOR Big-Switch-Networks 37538 +BEGIN-VENDOR Big-Switch-Networks + +ATTRIBUTE BSN-User-Role 1 string +ATTRIBUTE BSN-AVPair 2 string + +END-VENDOR Big-Switch-Networks diff --git a/resources/protocols/radius/dictionary.bintec b/resources/protocols/radius/dictionary.bintec index f745ac3b..cd0cd287 100644 --- a/resources/protocols/radius/dictionary.bintec +++ b/resources/protocols/radius/dictionary.bintec @@ -1,8 +1,9 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Bintec dictionary -# $Id: 1263c31096accc65ffc28c66ae755b2f8980bbbe $ +# $Id: 20c34993f3ae7ac7dc8f8153bceabcfa1554dba4 $ # # # diff --git a/resources/protocols/radius/dictionary.bluecoat b/resources/protocols/radius/dictionary.bluecoat index 4db91da3..3b11a5c7 100644 --- a/resources/protocols/radius/dictionary.bluecoat +++ b/resources/protocols/radius/dictionary.bluecoat @@ -1,12 +1,14 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # BlueCoat VSAs # # See also dictionary.packeteer for former Packeteer products. # -# $Id: 1568f4bbc16b7e83b8894ec6088b9931451bb726 $ +# $Id: 0af3c51c3b88dc7ed375311582d0c34fb1ec6b33 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.boingo b/resources/protocols/radius/dictionary.boingo new file mode 100644 index 00000000..420e8589 --- /dev/null +++ b/resources/protocols/radius/dictionary.boingo @@ -0,0 +1,48 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# Boingo Wi-Fi - http://www.boingo.com/ +# +# Version: $Id: +# +# Jorge Pereira <jpereiran@gmail.com> +# +############################################################################## + +VENDOR Boingo 22472 + +BEGIN-VENDOR Boingo + +ATTRIBUTE BW-Venue-Id 7 string +ATTRIBUTE BW-Venue-TZ 8 string +ATTRIBUTE BW-Service-Type 9 string +ATTRIBUTE BW-Class 10 string +ATTRIBUTE BW-Venue-Description 11 string +ATTRIBUTE BW-Venue-Price-Type 12 string +ATTRIBUTE BW-Venue-Port-Type 13 string +ATTRIBUTE BW-ISO-Country-Code 14 string +ATTRIBUTE BW-e164-Country-Code 15 string +ATTRIBUTE BW-State-Name 16 string +ATTRIBUTE BW-City-Name 17 string +ATTRIBUTE BW-Area-Code 18 integer +ATTRIBUTE CL-Brand 19 string +ATTRIBUTE CL-Software-Version 20 string +ATTRIBUTE CL-Reg-Number 21 string +ATTRIBUTE CL-Method-Version 22 string +ATTRIBUTE CL-Token-Version 23 string +ATTRIBUTE CL-APDB-Version 24 string +ATTRIBUTE CL-User-Agent 25 string +ATTRIBUTE CL-SSC 26 string +ATTRIBUTE BW-User-Group 27 string +ATTRIBUTE BW-Venue-Name 29 string +ATTRIBUTE BW-Category 30 string +ATTRIBUTE BW-User-Role 32 string +ATTRIBUTE BW-User-Name 33 string +ATTRIBUTE BW-User-Password 34 string +ATTRIBUTE BW-User-Prefix 35 string +ATTRIBUTE BW-User-Realm 36 string +ATTRIBUTE BW-Operator-Name 37 string + +END-VENDOR Boingo diff --git a/resources/protocols/radius/dictionary.bristol b/resources/protocols/radius/dictionary.bristol index e80b4caf..693c2f7b 100644 --- a/resources/protocols/radius/dictionary.bristol +++ b/resources/protocols/radius/dictionary.bristol @@ -1,11 +1,10 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -# -# dictionary.bristol +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # RoamNode VSA's # -# Version: $Id: 6537b7c577988c6741cbcb2b7214536c6be9f7d6 $ +# Version: $Id: d2fe1f1199d369f960a2a3da36ebd77ae062dcd3 $ # VENDOR Bristol 4363 diff --git a/resources/protocols/radius/dictionary.broadsoft b/resources/protocols/radius/dictionary.broadsoft index 6ad55046..40520c4e 100644 --- a/resources/protocols/radius/dictionary.broadsoft +++ b/resources/protocols/radius/dictionary.broadsoft @@ -1,11 +1,9 @@ -# -# dictionary.broadsoft -# -# +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # VENDOR BroadSoft 6431 -# + BEGIN-VENDOR BroadSoft #ATTRIBUTE BWAS-Call-Detail-Record-Version 0 string diff --git a/resources/protocols/radius/dictionary.brocade b/resources/protocols/radius/dictionary.brocade index 7d7e9c0e..cf5ae94b 100644 --- a/resources/protocols/radius/dictionary.brocade +++ b/resources/protocols/radius/dictionary.brocade @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # VENDOR Brocade 1588 BEGIN-VENDOR Brocade diff --git a/resources/protocols/radius/dictionary.bskyb b/resources/protocols/radius/dictionary.bskyb index c239f6bd..02107d33 100644 --- a/resources/protocols/radius/dictionary.bskyb +++ b/resources/protocols/radius/dictionary.bskyb @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # British Sky Broadcasting Group plc VSA's # -# $Id: 665c7a5125f513ca180c6b2cee08d6f566d33e8c $ +# $Id: af575a071e6219df76e6ac34a2424eee07551345 $ # ############################################################################## @@ -18,5 +20,7 @@ ATTRIBUTE Sky-Wifi-Filter-Profile 3 string ATTRIBUTE Sky-Wifi-Billing-Class 4 octets ATTRIBUTE Sky-Wifi-Provider-ID 5 integer ATTRIBUTE Sky-Wifi-Credentials 6 string +ATTRIBUTE Sky-Wifi-Replicated-Packet 7 string +ATTRIBUTE Sky-Wifi-Protocol-Restriction 8 integer END-VENDOR BSkyB diff --git a/resources/protocols/radius/dictionary.bt b/resources/protocols/radius/dictionary.bt index ea147be5..1acf454c 100644 --- a/resources/protocols/radius/dictionary.bt +++ b/resources/protocols/radius/dictionary.bt @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # British Telecom VSA's # -# $Id: d68427f3f8643879425fea275bfd6843034a4980 $ +# $Id: 61c2ddec252e6ae3392bb72ff42f754ee1f83867 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.cablelabs b/resources/protocols/radius/dictionary.cablelabs index 21fa03a6..0012bc11 100644 --- a/resources/protocols/radius/dictionary.cablelabs +++ b/resources/protocols/radius/dictionary.cablelabs @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 ############################################################################## # # CableLabs # -# $Id: 62bac6d3b84783b55c4350487377d72a0d1daf69 $ +# $Id: 26f78189b2f853d85f8507bcdd01287037b4c0aa $ # ############################################################################## @@ -123,7 +124,7 @@ ATTRIBUTE Related_ICID 98 string # # Commented out because they cannot be used. -# [wireshark: The following values are actualy handled by +# [wireshark: The following values are actually handled by # packet-radius_packetcable.c] # #VALUE CableLabs-Event-Message Reserved 0 diff --git a/resources/protocols/radius/dictionary.cabletron b/resources/protocols/radius/dictionary.cabletron index 2154fef3..c4417ad6 100644 --- a/resources/protocols/radius/dictionary.cabletron +++ b/resources/protocols/radius/dictionary.cabletron @@ -1,8 +1,9 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # http://www.cabletron.com (now http://www.enterasys.com) -# $Id: 8acb8109cd1fb4bd0da4cbc075160c1470c66046 $ +# $Id: 5bd6f4daebe46e0f6c9b023044600788d880e52d $ # VENDOR Cabletron 52 diff --git a/resources/protocols/radius/dictionary.calix b/resources/protocols/radius/dictionary.calix new file mode 100644 index 00000000..8058e59c --- /dev/null +++ b/resources/protocols/radius/dictionary.calix @@ -0,0 +1,34 @@ +# -*- text -*- +# Copyright (C) 2021 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# Based on https://www.calix.com/content/dam/calix/mycalix-misc/lib/tp/cms/ug/r15-x/index.htm?toc136037.htm?5793.htm +# +# $Id: 4bcd1bf407894f53beb774926dec0e12a08a37c1 $ +# +############################################################################## + +VENDOR Calix 6321 + +BEGIN-VENDOR Calix + +ATTRIBUTE Calix-Role 1 string +ATTRIBUTE Calix-CMS-User-Group 220 string +ATTRIBUTE Calix-CMS-Alarm-Filter 221 integer + +VALUE Calix-CMS-Alarm-Filter Disabled 0 +VALUE Calix-CMS-Alarm-Filter Enabled 1 + +ATTRIBUTE Calix-CMS-Event-Filter 222 integer + +VALUE Calix-CMS-Event-Filter Disabled 0 +VALUE Calix-CMS-Event-Filter Enabled 1 + +ATTRIBUTE Calix-CMS-Threshold-Event-Filter 223 integer + +VALUE Calix-CMS-Threshold-Event-Filter Disabled 0 +VALUE Calix-CMS-Threshold-Event-Filter Enabled 1 + +END-VENDOR Calix
\ No newline at end of file diff --git a/resources/protocols/radius/dictionary.cambium b/resources/protocols/radius/dictionary.cambium new file mode 100644 index 00000000..a531b328 --- /dev/null +++ b/resources/protocols/radius/dictionary.cambium @@ -0,0 +1,82 @@ +# -*- text -*- +# Copyright (C) 2021 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# Cambium VSA's +# +# $Id: 5c136ec2523c44b30b40ae606389a94f96c22589 $ +# +# Derived from: +# https://community.cambiumnetworks.com/t/40501 +# https://community.cambiumnetworks.com/t/40752 +# https://community.cambiumnetworks.com/t/50024 +# +############################################################################## + +VENDOR Cambium 17713 + +BEGIN-VENDOR Cambium + +ATTRIBUTE Cambium-Auth-Role 1 integer + +VALUE Cambium-Auth-Role Invalid 0 +VALUE Cambium-Auth-Role Read-Only 1 +VALUE Cambium-Auth-Role System-Admin 2 +VALUE Cambium-Auth-Role Security-Officer 3 +VALUE Cambium-Auth-Role Deliberately-Bad 4 + +ATTRIBUTE Cambium-ePMP-Data-VLAN-Id 21 integer +ATTRIBUTE Cambium-ePMP-Management-VLAN-Id 22 integer + +ATTRIBUTE Cambium-ePMP-Max-Burst-Uplink-Rate 26 integer +ATTRIBUTE Cambium-ePMP-Max-Burst-Downlink-Rate 27 integer + +ATTRIBUTE Cambium-ePMP-UserLevel 50 integer + +VALUE Cambium-ePMP-UserLevel Install 2 +VALUE Cambium-ePMP-UserLevel Admin 3 +VALUE Cambium-ePMP-UserLevel User 4 +VALUE Cambium-ePMP-UserLevel Read-Only 5 + +ATTRIBUTE Cambium-ePMP-SM-Priority 51 integer + +VALUE Cambium-ePMP-SM-Priority Normal 0 +VALUE Cambium-ePMP-SM-Priority High 1 +VALUE Cambium-ePMP-SM-Priority Low 2 + +ATTRIBUTE Cambium-ePMP-VLAN-Membersip-Set 52 integer +ATTRIBUTE Cambium-ePMP-Management-VLAN-Priority 53 integer +ATTRIBUTE Cambium-ePMP-Data-VLAN-Priority 54 integer +ATTRIBUTE Cambium-ePMP-Separate-Management-VLAN-Id 55 integer +ATTRIBUTE Cambium-ePMP-Separate-Management-VLAN-Priority 56 integer +ATTRIBUTE Cambium-ePMP-Multicast-VLAN-Id 57 integer +ATTRIBUTE Cambium-ePMP-VLAN-Mapping 58 integer + +ATTRIBUTE Cambium-Traffic-Quota-Limit-Up 151 integer +ATTRIBUTE Cambium-Traffic-Quota-Limit-Down 152 integer +ATTRIBUTE Cambium-Traffic-Quota-Limit-Up-Gigwords 153 integer +ATTRIBUTE Cambium-Traffic-Quota-Limit-Down-Gigwords 154 integer +ATTRIBUTE Cambium-Traffic-Quota-Limit-Total 155 integer +ATTRIBUTE Cambium-Traffic-Quota-Limit-Total-Gigwords 156 integer +ATTRIBUTE Cambium-VLAN-Pool-Id 157 string + +ATTRIBUTE Cambium-Authorize-Classes 158 tlv +BEGIN-TLV Cambium-Authorize-Classes + ATTRIBUTE Cambium-Authorize-Class-Name 1 string + ATTRIBUTE Cambium-Authorize-Bytes-Left 2 integer64 +END-TLV Cambium-Authorize-Classes + +ATTRIBUTE Cambium-Traffic-Classes-Acct 159 tlv +BEGIN-TLV Cambium-Traffic-Classes-Acct + ATTRIBUTE Cambium-Acct-Class-Name 1 string + ATTRIBUTE Cambium-Acct-Input-Octets 2 integer + ATTRIBUTE Cambium-Acct-Output-Octets 3 integer + ATTRIBUTE Cambium-Acct-Input-Packets 4 integer + ATTRIBUTE Cambium-Acct-Output-Packets 5 integer +END-TLV Cambium-Traffic-Classes-Acct + +ATTRIBUTE Cambium-Walled-Garden-State 160 integer + +END-VENDOR Cambium diff --git a/resources/protocols/radius/dictionary.camiant b/resources/protocols/radius/dictionary.camiant index 47a884d0..b8a4a2bb 100644 --- a/resources/protocols/radius/dictionary.camiant +++ b/resources/protocols/radius/dictionary.camiant @@ -1,4 +1,7 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Tekelec (Formerly Camiant) MSR dictionary diff --git a/resources/protocols/radius/dictionary.centec b/resources/protocols/radius/dictionary.centec new file mode 100644 index 00000000..2772a34f --- /dev/null +++ b/resources/protocols/radius/dictionary.centec @@ -0,0 +1,18 @@ +# Copyright (C) 2021 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +## Centec Packet RADIUS Dictionary +# +# http://www.centecnetworks.com +# +# + +VENDOR Centec 27975 +BEGIN-VENDOR Centec + +# +# Centec Privilege Attributes +# +ATTRIBUTE Centec-Exec-Privilege 1 integer + +END-VENDOR Centec diff --git a/resources/protocols/radius/dictionary.checkpoint b/resources/protocols/radius/dictionary.checkpoint new file mode 100644 index 00000000..7382a6ee --- /dev/null +++ b/resources/protocols/radius/dictionary.checkpoint @@ -0,0 +1,13 @@ +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +# Check Point dictionary file for freeradius AAA server +# +VENDOR CheckPoint 2620 + +BEGIN-VENDOR CheckPoint + +ATTRIBUTE CP-Gaia-User-Role 229 string +ATTRIBUTE CP-Gaia-SuperUser-Access 230 integer + +END-VENDOR CheckPoint diff --git a/resources/protocols/radius/dictionary.chillispot b/resources/protocols/radius/dictionary.chillispot index 4d7fb472..b4504980 100644 --- a/resources/protocols/radius/dictionary.chillispot +++ b/resources/protocols/radius/dictionary.chillispot @@ -1,12 +1,14 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # ChilliSpot (and CoovaChilli) captive portal # http://www.chillispot.org # http://coova.org/wiki/index.php/CoovaChilli # -# $Id: e1e96effc16f678bd939dca7d779285fdc3cd126 $ +# $Id: c086a0790f2151b24f0d64c3e466eba18643891e $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.ciena b/resources/protocols/radius/dictionary.ciena new file mode 100644 index 00000000..b07c8e7c --- /dev/null +++ b/resources/protocols/radius/dictionary.ciena @@ -0,0 +1,41 @@ +# -*- text -*- +# Copyright (C) 2022 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# Dictionary for Ciena +# +# $Id: 28e090a20d18ccb972403120131ca5b6d43bf193 $ +# +############################################################################## + +VENDOR Ciena 1271 + +BEGIN-VENDOR Ciena + +ATTRIBUTE Ciena-CN4200-Priv-Level 1 integer + +VALUE Ciena-CN4200-Priv-Level limited 1 +VALUE Ciena-CN4200-Priv-Level admin 2 +VALUE Ciena-CN4200-Priv-Level super-user 3 +VALUE Ciena-CN4200-Priv-Level diag 4 + +ATTRIBUTE Ciena-CES-Priv-Level 10 integer + +VALUE Ciena-CES-Priv-Level limited 1 +VALUE Ciena-CES-Priv-Level admin 2 +VALUE Ciena-CES-Priv-Level super-user 3 +VALUE Ciena-CES-Priv-Level diag 4 + +ATTRIBUTE Ciena-CES-NACM-Groups 11 string + +ATTRIBUTE Ciena-BP-Role 220 string +ATTRIBUTE Ciena-NCS-Role 240 integer +ATTRIBUTE Ciena-OC-Role 250 string +ATTRIBUTE Ciena-CS-Client-IP 253 ipaddr +ATTRIBUTE Ciena-CS-Acc-Level 254 integer +ATTRIBUTE Ciena-CS-Priv-Level 255 integer + +END-VENDOR Ciena + diff --git a/resources/protocols/radius/dictionary.cisco b/resources/protocols/radius/dictionary.cisco index e030178a..7998bdf1 100644 --- a/resources/protocols/radius/dictionary.cisco +++ b/resources/protocols/radius/dictionary.cisco @@ -1,19 +1,15 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -# -# dictionary.cisco +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Accounting VSAs originally by # "Marcelo M. Sosa Lugones" <marcelo@sosa.com.ar> # -# Version: $Id: 52cbe9c8f9d24d17eaf91faae5084ac832a509d1 $ +# Version: $Id: c62922820c592c5f60be01a34b845c2242cb50ab $ # # For documentation on Cisco RADIUS attributes, see: # -# http://wayback.archive.org/web/20090614232619/http://www.cisco.com/en/US/docs/net_mgmt/cisco_secure_access_control_server_for_windows/4.1/user/A_RADAtr.html -# http://www.cisco.com/c/en/us/td/docs/ios/12_2/security/configuration/guide/fsecur_c/scfrdat3.html#wpxref30314 -# http://www.cisco.com/c/en/us/td/docs/ios-xml/ios/sec_usr_radatt/configuration/xe-16/sec-usr-radatt-xe-16-book.html -# http://www.cisco.com/en/US/docs/net_mgmt/cisco_secure_access_control_server_for_windows/4.1/user/A_RADAtr.html +# http://www.cisco.com/univercd/cc/td/doc/product/access/acs_serv/vapp_dev/vsaig3.htm # # For general documentation on Cisco RADIUS configuration, see: # @@ -71,6 +67,27 @@ ATTRIBUTE h323-incoming-conf-id 35 string ATTRIBUTE Cisco-Policy-Up 37 string ATTRIBUTE Cisco-Policy-Down 38 string +ATTRIBUTE Cisco-Relay-Information-Option 46 string +ATTRIBUTE Cisco-DHCP-User-Class 47 string +ATTRIBUTE Cisco-DHCP-Vendor-Class 48 string + +ATTRIBUTE Cisco-DHCP-Relay-GiAddr 50 string +ATTRIBUTE Cisco-Service-Name 51 string +ATTRIBUTE Cisco-Parent-Session-Id 52 string + +ATTRIBUTE Cisco-Sub-QoS-Pol-In 55 string +ATTRIBUTE Cisco-Sub-QoS-Pol-Out 56 string +ATTRIBUTE Cisco-In-ACL 57 string +ATTRIBUTE Cisco-Out-ACL 58 string +ATTRIBUTE Cisco-Sub-PBR-Policy-In 59 string +ATTRIBUTE Cisco-Sub-Activate-Service 60 string +ATTRIBUTE Cisco-IPv6-In-ACL 61 string +ATTRIBUTE Cisco-IPv6-Out-ACL 62 string +ATTRIBUTE Cisco-Sub-Deactivate-Service 63 string + +ATTRIBUTE Cisco-DHCP-Subscriber-Id 65 string +ATTRIBUTE Cisco-DHCPv6-Link-Address 66 string + ATTRIBUTE sip-conf-id 100 string ATTRIBUTE h323-credit-amount 101 string ATTRIBUTE h323-credit-time 102 string @@ -107,25 +124,6 @@ ATTRIBUTE dsp-id 151 string # Extra attributes sent by the Cisco, if you configure # "radius-server vsa accounting" (requires IOS11.2+). # -# According to -# -# http://wayback.archive.org/web/20021219025345/http://www.cisco.com/en/US/products/hw/iad/ps4349/products_installation_guide_chapter09186a008007e511.html -# -# the first byte Command-Code value is a binary command code -# and the other bytes after it are an string argument to the -# command: -# -# Command code Command Argument -# -# \001 Account Logon Account name -# \002 Account Logoff Account name -# \004 Account PING Service name -# \013 Service Logon Service name -# \014 Service Logoff Service name -# \016 Service Access Order DNS server search order -# separated by semicolons -# \017 Service Message Message text -# ATTRIBUTE Cisco-Multilink-ID 187 integer ATTRIBUTE Cisco-Num-In-Multilink 188 integer ATTRIBUTE Cisco-Pre-Input-Octets 190 integer diff --git a/resources/protocols/radius/dictionary.cisco.asa b/resources/protocols/radius/dictionary.cisco.asa index e0a609e6..8aa8c58e 100644 --- a/resources/protocols/radius/dictionary.cisco.asa +++ b/resources/protocols/radius/dictionary.cisco.asa @@ -1,11 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Cisco Adaptative Security Appliance (ASA) Dictionary # # http://www.cisco.com/en/US/docs/security/asa/asa90/configuration/guide/ref_extserver.html#wp1802187 # -# $Id: bd5b425d6d8aef0a47ff06ae3110ff1b5a1e307d $ +# $Id: e1738fe7e20d1076d4a1818650f4f424d10d0e04 $ # VENDOR Cisco-ASA 3076 diff --git a/resources/protocols/radius/dictionary.cisco.bbsm b/resources/protocols/radius/dictionary.cisco.bbsm index 2cf8f9a5..26a2e571 100644 --- a/resources/protocols/radius/dictionary.cisco.bbsm +++ b/resources/protocols/radius/dictionary.cisco.bbsm @@ -1,11 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Cisco Building Broadband Service Manager Dictionary # # http://www.cisco.com/univercd/cc/td/doc/product/access/acs_soft/csacs4nt/csnt30/user/ad.htm # -# $Id: 307973f6fe763ddb04490b81d00c005720e4aa83 $ +# $Id: 4efbca65cde4a2c37ed69eb1380befe087cb909f $ # VENDOR Cisco-BBSM 5263 diff --git a/resources/protocols/radius/dictionary.cisco.vpn3000 b/resources/protocols/radius/dictionary.cisco.vpn3000 index 41bc0e9b..5b8baff3 100644 --- a/resources/protocols/radius/dictionary.cisco.vpn3000 +++ b/resources/protocols/radius/dictionary.cisco.vpn3000 @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2017 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Cisco VPN 3000 Concentrator Dictionary # @@ -19,7 +20,7 @@ # http://wayback.archive.org/web/20071011133320/http://www.cisco.com/en/US/docs/security/asa/asa80/configuration/guide/extsvr.html#wp1583736 # https://communities.cisco.com/docs/DOC-67894#jive_content_id_Cisco # -# $Id: 1d9dfbf0dcbe08d7eedf07ff3663b86343f2f4a2 $ +# $Id: cc9d09f53e08ad60e40382e3bfe9b50d2d87a1d4 $ # VENDOR Cisco-VPN3000 3076 diff --git a/resources/protocols/radius/dictionary.cisco.vpn5000 b/resources/protocols/radius/dictionary.cisco.vpn5000 index 2a0b8a65..1b18a741 100644 --- a/resources/protocols/radius/dictionary.cisco.vpn5000 +++ b/resources/protocols/radius/dictionary.cisco.vpn5000 @@ -1,11 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Cisco VPN 5000 Concentrator Dictionary # # http://www.cisco.com/univercd/cc/td/doc/product/access/acs_soft/csacs4nt/csnt30/user/ad.htm # -# $Id: ab66f89ac217483352d144d69885c7383c4e9b89 $ +# $Id: 70906eda6473a2ec193aaa8243564193ab759480 $ # VENDOR Cisco-VPN5000 255 diff --git a/resources/protocols/radius/dictionary.citrix b/resources/protocols/radius/dictionary.citrix index ed6d63bf..3ec698ac 100644 --- a/resources/protocols/radius/dictionary.citrix +++ b/resources/protocols/radius/dictionary.citrix @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Citrix VSAs # -# $Id: 868b203ab45b47533d9b53862cfc271251aa7f17 $ +# $Id: 3cba3d6ee6372273b7b84a36a4e419b8803e8f8b $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.ckey b/resources/protocols/radius/dictionary.ckey new file mode 100644 index 00000000..fa561727 --- /dev/null +++ b/resources/protocols/radius/dictionary.ckey @@ -0,0 +1,39 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# $Id: 5ff85332c1748d534f315003972dcc381f5f3eab $ +# +############################################################################## + +VENDOR Ckey 61349 + +BEGIN-VENDOR Ckey + +ATTRIBUTE CKey-Auth-Info 10 integer + +VALUE CKey-Auth-Info Role-Reject 2 +VALUE CKey-Auth-Info Static-Reject 3 +VALUE CKey-Auth-Info Challenge-Dyna-Reject 7 +VALUE CKey-Auth-Info RADIUS-Key-Parse-Error 8 +VALUE CKey-Auth-Info Account-Does-Not-Exist 9 +VALUE CKey-Auth-Info Token-Expired 16 +VALUE CKey-Auth-Info Push-Check-Code-Error 20 +VALUE CKey-Auth-Info Push-Code-Error 21 +VALUE CKey-Auth-Info Single-Only-Dyna-Reject 22 +VALUE CKey-Auth-Info Static-PWD-Error 23 +VALUE CKey-Auth-Info PIN-Word-Error 24 +VALUE CKey-Auth-Info Source-IP-Error 25 +VALUE CKey-Auth-Info Msg-PWD-Reject 28 +VALUE CKey-Auth-Info Static-PWD-Expired 28 +VALUE CKey-Auth-Info Strategy-Config-Error 30 +VALUE CKey-Auth-Info EQP-Expiration-Error 31 +VALUE CKey-Auth-Info Account-EQP-Token-Mismatch 32 +VALUE CKey-Auth-Info Cannot-Login-Time 33 +VALUE CKey-Auth-Info Org-Reject 34 +VALUE CKey-Auth-Info Static-PWD-Or-PIN-Error 2324 +VALUE CKey-Auth-Info Unknown-Error 0xffffffff + +END-VENDOR Ckey diff --git a/resources/protocols/radius/dictionary.clavister b/resources/protocols/radius/dictionary.clavister index 302ee4bc..6e5759f2 100644 --- a/resources/protocols/radius/dictionary.clavister +++ b/resources/protocols/radius/dictionary.clavister @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Clavister VSAs # -# $Id: 0b06be9ce73341d98df0a102b4dabbd748efd6e7 $ +# $Id: bc59c64e5cbf0804a15c3d4fdbb95375fab633de $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.cnergee b/resources/protocols/radius/dictionary.cnergee index 0c67eb9c..99555d75 100644 --- a/resources/protocols/radius/dictionary.cnergee +++ b/resources/protocols/radius/dictionary.cnergee @@ -1,7 +1,6 @@ # -*- text -*- -# Copyright (C) 2017 The Cnergee Access Server project -# -# dictionary.cnergee +# Copyright (C) 2019 The Cnergee Access Server project +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # VENDOR Cnergee 49426 @@ -31,6 +30,14 @@ ATTRIBUTE BELRAS-REDIFF-Speed 20 integer ATTRIBUTE BELRAS-TORRENT-Speed 21 integer ATTRIBUTE BELRAS-BELCACHE-Speed 22 integer ATTRIBUTE BELRAS-DHCP-Lease-Time 23 integer +ATTRIBUTE BELRAS-Group 24 integer +ATTRIBUTE BELRAS-LIMIT 25 string +ATTRIBUTE BELRAS-Auth 26 string +ATTRIBUTE BELRAS-Acct 27 string +ATTRIBUTE BELRAS-Framed-IP-Address 28 string +ATTRIBUTE BELRAS-BL 29 string +ATTRIBUTE BELRAS-IN 30 string +ATTRIBUTE BELRAS-CO 31 string VALUE BELRAS-redirect-Pool Deleted 1 VALUE BELRAS-redirect-Pool Disabled 2 diff --git a/resources/protocols/radius/dictionary.colubris b/resources/protocols/radius/dictionary.colubris index b2027dad..65ce4ea4 100644 --- a/resources/protocols/radius/dictionary.colubris +++ b/resources/protocols/radius/dictionary.colubris @@ -1,11 +1,10 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -# Colubris dictionary - dictionary.colubris +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # + VENDOR Colubris 8744 -# -# Vendor-specific attributes -# + BEGIN-VENDOR Colubris ATTRIBUTE Colubris-AVPair 0 string diff --git a/resources/protocols/radius/dictionary.columbia_university b/resources/protocols/radius/dictionary.columbia_university index 82a9e126..3ccc1e35 100644 --- a/resources/protocols/radius/dictionary.columbia_university +++ b/resources/protocols/radius/dictionary.columbia_university @@ -1,12 +1,16 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# + +# A duplicate name that they use VALUE Service-Type Sip-session 12 # Columbia University VSAs, from: # # http://www.cs.columbia.edu/IRT/cinema/release/radius_notes.html # -# $Id: 1770562b9013b980b1efd56458387daa564207cd $ +# $Id: 0015d7febfad7df240ebb7502ef9e3028470a0e5 $ # VENDOR Columbia-University 11862 diff --git a/resources/protocols/radius/dictionary.compat b/resources/protocols/radius/dictionary.compat index 24c754aa..80379040 100644 --- a/resources/protocols/radius/dictionary.compat +++ b/resources/protocols/radius/dictionary.compat @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Obsolete names for backwards compatibility with older users files. # Move the $INCLUDE in the main dictionary file to the end if you want @@ -20,7 +21,7 @@ ATTRIBUTE Old-Password 17 string ATTRIBUTE Port-Message 18 string ATTRIBUTE Dialback-No 19 string ATTRIBUTE Dialback-Name 20 string -ATTRIBUTE Challenge-State 24 string +ATTRIBUTE Challenge-State 24 octets VALUE Framed-Compression Van-Jacobsen-TCP-IP 1 VALUE Framed-Compression VJ-TCP-IP 1 VALUE Service-Type Shell-User 6 diff --git a/resources/protocols/radius/dictionary.compatible b/resources/protocols/radius/dictionary.compatible index e4ba998f..3b56dc67 100644 --- a/resources/protocols/radius/dictionary.compatible +++ b/resources/protocols/radius/dictionary.compatible @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Compatible Systems Corporation dictionary # diff --git a/resources/protocols/radius/dictionary.cosine b/resources/protocols/radius/dictionary.cosine index 209755e2..06ce4832 100644 --- a/resources/protocols/radius/dictionary.cosine +++ b/resources/protocols/radius/dictionary.cosine @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Cosine IPSX Dictionary # -# $Id: 1843c5b3061c56a36420cdffeba2d0a8aa1e2e73 $ +# $Id: 1682e8dcc92ea565f5e0a9dae1ac2c646dcefc8a $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.covaro b/resources/protocols/radius/dictionary.covaro new file mode 100644 index 00000000..244bf324 --- /dev/null +++ b/resources/protocols/radius/dictionary.covaro @@ -0,0 +1,43 @@ +# -*- text -*- +# Copyright (C) 2022 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# Dictionary for Covaro Networks +# +# $Id: 7959a0bc6d964e2142f581581e9a80ab7e0c2d5c $ +# +############################################################################## + +VENDOR Covaro 18022 + +BEGIN-VENDOR Covaro + +ATTRIBUTE Covaro-User-Privilege 1 integer + +VALUE Covaro-User-Privilege SUPERUSER 1 +VALUE Covaro-User-Privilege PROVISIONING 2 +VALUE Covaro-User-Privilege MAINTENANCE 3 +VALUE Covaro-User-Privilege RETRIEVE 4 + +ATTRIBUTE Covaro-Max-Sessions 2 integer +ATTRIBUTE Covaro-Session-Timeout 3 integer + +ATTRIBUTE Covaro-Inhibit-Message 4 integer + +VALUE Covaro-Inhibit-Message N 0 +VALUE Covaro-Inhibit-Message Y 1 + +ATTRIBUTE Covaro-Inhibit-Dbchg 5 integer + +VALUE Covaro-Inhibit-Dbchg N 0 +VALUE Covaro-Inhibit-Dbchg Y 1 + +ATTRIBUTE Covaro-Inhibit-Pmrept 6 integer + +VALUE Covaro-Inhibit-Pmrept N 0 +VALUE Covaro-Inhibit-Pmrept Y 1 + +END-VENDOR Covaro + diff --git a/resources/protocols/radius/dictionary.dante b/resources/protocols/radius/dictionary.dante index d9746e17..fc7b6267 100644 --- a/resources/protocols/radius/dictionary.dante +++ b/resources/protocols/radius/dictionary.dante @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # DANTE Vendor Specific Attributes Dictionary diff --git a/resources/protocols/radius/dictionary.dellemc b/resources/protocols/radius/dictionary.dellemc index 68c2758a..4a6d0af5 100644 --- a/resources/protocols/radius/dictionary.dellemc +++ b/resources/protocols/radius/dictionary.dellemc @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2017 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Dell Inc. # diff --git a/resources/protocols/radius/dictionary.dhcp b/resources/protocols/radius/dictionary.dhcp deleted file mode 100644 index 966379ea..00000000 --- a/resources/protocols/radius/dictionary.dhcp +++ /dev/null @@ -1,419 +0,0 @@ -# -*- text -*- -############################################################################## -# -# DHCP to RADUS gateway dictionary. -# -# http://www.iana.org/assignments/bootp-dhcp-parameters -# -# Also http://www.networksorcery.com/enp/protocol/bootp/options.htm -# -# http://www.bind9.net/rfc-dhcp -# -# $Id$ -# -############################################################################## - -# - -# This is really Apollo's number, but since they're out of business, -# I don't think they'll be needing this. -# -# HP owns the Apollo assets, but let's not worry about that. -# -# The vendor codes are 2 octets, because we need 256 numbers -# for the base DHCP options, PLUS a few for the DHCP headers, -# which aren't in option format. -# -# On top of that, a number of options are really TLV's. -# We need to be able to understand them, too. -# -VENDOR DHCP 54 format=2,1 - -BEGIN-VENDOR DHCP - -ATTRIBUTE DHCP-Opcode 256 byte -ATTRIBUTE DHCP-Hardware-Type 257 byte -ATTRIBUTE DHCP-Hardware-Address-Length 258 byte -ATTRIBUTE DHCP-Hop-Count 259 byte -ATTRIBUTE DHCP-Transaction-Id 260 integer -ATTRIBUTE DHCP-Number-of-Seconds 261 short -ATTRIBUTE DHCP-Flags 262 short -ATTRIBUTE DHCP-Client-IP-Address 263 ipaddr -ATTRIBUTE DHCP-Your-IP-Address 264 ipaddr -ATTRIBUTE DHCP-Server-IP-Address 265 ipaddr -ATTRIBUTE DHCP-Gateway-IP-Address 266 ipaddr -ATTRIBUTE DHCP-Client-Hardware-Address 267 ether # 16 octets -ATTRIBUTE DHCP-Server-Host-Name 268 string # 64 octets -ATTRIBUTE DHCP-Boot-Filename 269 string # 128 octets - -VALUE DHCP-Flags Broadcast 0x8000 - - -VALUE DHCP-Hardware-Type Ethernet 1 -VALUE DHCP-Hardware-Type Experiemental-Ethernet 2 -VALUE DHCP-Hardware-Type AX.25 3 -VALUE DHCP-Hardware-Type Proteon-Token-Ring 4 -VALUE DHCP-Hardware-Type Chaos 5 -VALUE DHCP-Hardware-Type IEEE-802 6 -VALUE DHCP-Hardware-Type Arcnet 7 -VALUE DHCP-Hardware-Type Hyperchannel 8 -VALUE DHCP-Hardware-Type Lanstar 9 -VALUE DHCP-Hardware-Type Autonet-Short-Address 10 -VALUE DHCP-Hardware-Type LocalTalk 11 -VALUE DHCP-Hardware-Type LocalNet 12 -VALUE DHCP-Hardware-Type Ultra-Link 13 -VALUE DHCP-Hardware-Type SMDS 14 -VALUE DHCP-Hardware-Type Frame-Relay 15 -VALUE DHCP-Hardware-Type ATM-16 16 -VALUE DHCP-Hardware-Type HDLC 17 -VALUE DHCP-Hardware-Type Fibre-Channel 18 -VALUE DHCP-Hardware-Type ATM-19 19 -VALUE DHCP-Hardware-Type Serial-Line 20 -VALUE DHCP-Hardware-Type ATM-21 21 -VALUE DHCP-Hardware-Type MIL-STD-188-220 22 -VALUE DHCP-Hardware-Type Metricom 23 -VALUE DHCP-Hardware-Type IEEE-1394 24 -VALUE DHCP-Hardware-Type MAPOS 25 -VALUE DHCP-Hardware-Type Twinaxial 26 -VALUE DHCP-Hardware-Type EUI-64 27 -VALUE DHCP-Hardware-Type HIPARP 28 -VALUE DHCP-Hardware-Type IP-Over-ISO-7816-3 29 -VALUE DHCP-Hardware-Type ARPSec 30 -VALUE DHCP-Hardware-Type IPSec-Tunnel 31 -VALUE DHCP-Hardware-Type Infiniband 32 -VALUE DHCP-Hardware-Type CAI-TIA-102 33 - -############################################################################## -# -# DHCP Options, with comments. For now, many are as FreeRADIUS -# doesn't handle MAC addresses natively. -# -############################################################################## - -#ATTRIBUTE DHCP-Pad 0 octets -ATTRIBUTE DHCP-Subnet-Mask 1 ipaddr -# Time Offset in -ATTRIBUTE DHCP-Time-Offset 2 octets -ATTRIBUTE DHCP-Router-Address 3 ipaddr array -ATTRIBUTE DHCP-Time-Server 4 ipaddr array -ATTRIBUTE DHCP-IEN-116-Name-Server 5 ipaddr array -ATTRIBUTE DHCP-Domain-Name-Server 6 ipaddr array -# Logging-Server addresses -ATTRIBUTE DHCP-Log-Server 7 ipaddr array -ATTRIBUTE DHCP-Quotes-Server 8 ipaddr array -ATTRIBUTE DHCP-LPR-Server 9 ipaddr array -ATTRIBUTE DHCP-Impress-Server 10 ipaddr array -ATTRIBUTE DHCP-RLP-Server 11 ipaddr array -# Hostname string -ATTRIBUTE DHCP-Hostname 12 string -# Size of boot file in 512 byte -ATTRIBUTE DHCP-Boot-File-Size 13 short -# Client to dump and name -ATTRIBUTE DHCP-Merit-Dump-File 14 octets -ATTRIBUTE DHCP-Domain-Name 15 string -ATTRIBUTE DHCP-Swap-Server 16 ipaddr -# Path name for root disk -ATTRIBUTE DHCP-Root-Path 17 string -ATTRIBUTE DHCP-Bootp-Extensions-Path 18 string -ATTRIBUTE DHCP-IP-Forward-Enable 19 byte -ATTRIBUTE DHCP-Source-Route-Enable 20 byte -# Routing Policy Filters -ATTRIBUTE DHCP-Policy-Filter 21 octets -ATTRIBUTE DHCP-Max-Datagram-Reassembly-Sz 22 short -ATTRIBUTE DHCP-Default-IP-TTL 23 octets -ATTRIBUTE DHCP-Path-MTU-Aging-Timeout 24 integer -ATTRIBUTE DHCP-Path-MTU-Plateau-Table 25 short array -ATTRIBUTE DHCP-Interface-MTU-Size 26 short -ATTRIBUTE DHCP-All-Subnets-Are-Local 27 byte -ATTRIBUTE DHCP-Broadcast-Address 28 ipaddr -ATTRIBUTE DHCP-Perform-Mask-Discovery 29 byte -ATTRIBUTE DHCP-Provide-Mask-To-Others 30 byte -ATTRIBUTE DHCP-Perform-Router-Discovery 31 byte -ATTRIBUTE DHCP-Router-Solicitation-Address 32 ipaddr -# first is destination address, second is router. -ATTRIBUTE DHCP-Static-Routes 33 ipaddr array -ATTRIBUTE DHCP-Trailer-Encapsulation 34 byte -ATTRIBUTE DHCP-ARP-Cache-Timeout 35 integer -ATTRIBUTE DHCP-Ethernet-Encapsulation 36 byte -ATTRIBUTE DHCP-Default-TCP-TTL 37 byte -ATTRIBUTE DHCP-Keep-Alive-Interval 38 integer -ATTRIBUTE DHCP-Keep-Alive-Garbage 39 byte -ATTRIBUTE DHCP-NIS-Domain-Name 40 string -ATTRIBUTE DHCP-NIS-Servers 41 ipaddr array -ATTRIBUTE DHCP-NTP-Servers 42 ipaddr array -# N Vendor Specific Information -ATTRIBUTE DHCP-Vendor 43 octets # tlv -ATTRIBUTE DHCP-NETBIOS-Name-Servers 44 ipaddr array -ATTRIBUTE DHCP-NETBIOS-Dgm-Dist-Servers 45 ipaddr array -ATTRIBUTE DHCP-NETBIOS-Node-Type 46 byte -# N NETBIOS Scope -ATTRIBUTE DHCP-NETBIOS 47 octets -ATTRIBUTE DHCP-X-Window-Font-Server 48 ipaddr array -ATTRIBUTE DHCP-X-Window-Display-Mgr 49 ipaddr array -ATTRIBUTE DHCP-Requested-IP-Address 50 ipaddr -ATTRIBUTE DHCP-IP-Address-Lease-Time 51 integer -# Overload "sname" or "file" -ATTRIBUTE DHCP-Overload 52 byte -ATTRIBUTE DHCP-Message-Type 53 byte -ATTRIBUTE DHCP-DHCP-Server-Identifier 54 ipaddr - -# Array of 1-byte numbers indicating which options the client -# would like to see in the response. -ATTRIBUTE DHCP-Parameter-Request-List 55 byte array -ATTRIBUTE DHCP-DHCP-Error-Message 56 octets -ATTRIBUTE DHCP-DHCP-Maximum-Msg-Size 57 short -ATTRIBUTE DHCP-Renewal-Time 58 integer -ATTRIBUTE DHCP-Rebinding-Time 59 integer -ATTRIBUTE DHCP-Vendor-Class-Identifier 60 string - -# Client Identifier -# First octets is DHCP-Hardware-Type, rest are type-specific data, -# e.g. MAC address. -ATTRIBUTE DHCP-Client-Identifier 61 octets -ATTRIBUTE DHCP-Netware-Domain-Name 62 octets -ATTRIBUTE DHCP-Netware-Sub-Options 63 octets -ATTRIBUTE DHCP-NIS-Client-Domain-Name 64 octets -ATTRIBUTE DHCP-NIS-Server-Address 65 ipaddr -ATTRIBUTE DHCP-TFTP-Server-Name 66 string -ATTRIBUTE DHCP-Boot-File-Name 67 string -# Home Agent Addresses -ATTRIBUTE DHCP-Home-Agent-Address 68 octets -ATTRIBUTE DHCP-SMTP-Server-Address 69 ipaddr array -ATTRIBUTE DHCP-POP3-Server-Address 70 ipaddr array -ATTRIBUTE DHCP-NNTP-Server-Address 71 ipaddr array -ATTRIBUTE DHCP-WWW-Server-Address 72 ipaddr array -ATTRIBUTE DHCP-Finger-Server-Address 73 ipaddr array -ATTRIBUTE DHCP-IRC-Server-Address 74 ipaddr array -ATTRIBUTE DHCP-StreetTalk-Server-Address 75 ipaddr array -ATTRIBUTE DHCP-STDA-Server-Address 76 ipaddr array -# User Class Information -ATTRIBUTE DHCP-User-Class 77 octets -# directory agent information -ATTRIBUTE DHCP-Directory-Agent 78 octets -# service location agent scope -ATTRIBUTE DHCP-Service-Scope 79 octets -# Rapid Commit -ATTRIBUTE DHCP-Rapid-Commit 80 octets -# Fully Qualified Domain Name -ATTRIBUTE DHCP-Client-FQDN 81 string -# Relay Agent Information -ATTRIBUTE DHCP-Relay-Agent-Information 82 octets # tlv -# Internet Storage Name Service -ATTRIBUTE DHCP-iSNS 83 octets -# Novell Directory Services -ATTRIBUTE DHCP-NDS-Servers 85 octets -# Novell Directory Services -ATTRIBUTE DHCP-NDS-Tree-Name 86 octets -# Novell Directory Services -ATTRIBUTE DHCP-NDS-Context 87 octets -# Authentication -ATTRIBUTE DHCP-Authentication 90 octets - -ATTRIBUTE DHCP-Client-Last-Txn-Time 91 octets - -ATTRIBUTE DHCP-associated-ip 92 octets -# Client System Architecture -ATTRIBUTE DHCP-Client-System 93 octets -# Client Network Device Interface -ATTRIBUTE DHCP-Client-NDI 94 octets -# Lightweight Directory Access Protocol -ATTRIBUTE DHCP-LDAP 95 octets -# UUID/GUID-based Client Identifier -ATTRIBUTE DHCP-UUID/GUID 97 octets -# Open Group's User Authentication -ATTRIBUTE DHCP-User-Auth 98 octets -# NetInfo Parent-Server Address -ATTRIBUTE DHCP-Netinfo-Address 112 octets -# NetInfo Parent-Server Tag -ATTRIBUTE DHCP-Netinfo-Tag 113 octets -# URL -ATTRIBUTE DHCP-URL 114 octets -# DHCP Auto-Configuration -ATTRIBUTE DHCP-Auto-Config 116 byte -# Name Service Search -ATTRIBUTE DHCP-Name-Service-Search 117 octets -# Subnet Selection Option -ATTRIBUTE DHCP-Subnet-Selection-Option 118 octets -# DNS domain serach list -ATTRIBUTE DHCP-Domain-Search 119 octets -# SIP-Servers DHCP Option -ATTRIBUTE DHCP-SIP-Servers-DHCP-Option 120 octets -# Classless Static Route Option -ATTRIBUTE DHCP-Classless-Static-Route 121 octets -# CableLabs Client Configuration -ATTRIBUTE DHCP-CCC 122 octets -# 16 GeoConf Option -ATTRIBUTE DHCP-GeoConf-Option 123 octets - -# Vendor Class -# -# String name that defines the vendor space used for the TLV's -# in option 125. -# -ATTRIBUTE DHCP-V-I-Vendor-Class 124 octets -# Vendor-Specific -ATTRIBUTE DHCP-V-I-Vendor-Specific 125 octets # tlv -# 6 bytes: E4:45:74:68:00:00 -ATTRIBUTE DHCP-Etherboot 128 octets -# (for IP Phone software load) -ATTRIBUTE DHCP-TFTP-Server-IP-Address 128 octets - -ATTRIBUTE DHCP-Call-Server-IP-address 129 octets - -ATTRIBUTE DHCP-Ethernet-Interface 130 octets - -ATTRIBUTE DHCP-Vendor-Discrimination-Str 130 octets - -ATTRIBUTE DHCP-Remote-Stats-Svr-IP-Address 131 octets - -ATTRIBUTE DHCP-IEEE-802.1Q-L2-Priority 132 octets - -ATTRIBUTE DHCP-IEEE-802.1P-VLAN-ID 133 octets - -ATTRIBUTE DHCP-Diffserv-Code-Point 134 octets - -ATTRIBUTE DHCP-HTTP-Proxy 135 octets - -ATTRIBUTE DHCP-Cisco-TFTP-Server-IP-Addresses 150 ipaddr array - -ATTRIBUTE DHCP-End-Of-Options 255 byte - -VALUE DHCP-Opcode Client-Message 1 -VALUE DHCP-Opcode Server-Message 2 - -VALUE DHCP-Message-Type DHCP-Discover 1 -VALUE DHCP-Message-Type DHCP-Offer 2 -VALUE DHCP-Message-Type DHCP-Request 3 -VALUE DHCP-Message-Type DHCP-Decline 4 -VALUE DHCP-Message-Type DHCP-Ack 5 -VALUE DHCP-Message-Type DHCP-NAK 6 -VALUE DHCP-Message-Type DHCP-Release 7 -VALUE DHCP-Message-Type DHCP-Inform 8 -VALUE DHCP-Message-Type DHCP-Force-Renew 9 - -VALUE DHCP-Parameter-Request-List DHCP-Subnet-Mask 1 -VALUE DHCP-Parameter-Request-List DHCP-Time-Offset 2 -VALUE DHCP-Parameter-Request-List DHCP-Router-Address 3 -VALUE DHCP-Parameter-Request-List DHCP-Time-Server 4 -VALUE DHCP-Parameter-Request-List DHCP-IEN-116-Name-Server 5 -VALUE DHCP-Parameter-Request-List DHCP-Domain-Name-Server 6 -VALUE DHCP-Parameter-Request-List DHCP-Log-Server 7 -VALUE DHCP-Parameter-Request-List DHCP-Quotes-Server 8 -VALUE DHCP-Parameter-Request-List DHCP-LPR-Server 9 -VALUE DHCP-Parameter-Request-List DHCP-Impress-Server 10 -VALUE DHCP-Parameter-Request-List DHCP-RLP-Server 11 -VALUE DHCP-Parameter-Request-List DHCP-Hostname 12 -VALUE DHCP-Parameter-Request-List DHCP-Boot-File-Size 13 -VALUE DHCP-Parameter-Request-List DHCP-Merit-Dump-File 14 -VALUE DHCP-Parameter-Request-List DHCP-Domain-Name 15 -VALUE DHCP-Parameter-Request-List DHCP-Swap-Server 16 -VALUE DHCP-Parameter-Request-List DHCP-Root-Path 17 -VALUE DHCP-Parameter-Request-List DHCP-Bootp-Extensions-Path 18 -VALUE DHCP-Parameter-Request-List DHCP-IP-Forward-Enable 19 -VALUE DHCP-Parameter-Request-List DHCP-Source-Route-Enable 20 -VALUE DHCP-Parameter-Request-List DHCP-Policy-Filter 21 -VALUE DHCP-Parameter-Request-List DHCP-Max-Datagram-Reassembly-Sz 22 -VALUE DHCP-Parameter-Request-List DHCP-Default-IP-TTL 23 -VALUE DHCP-Parameter-Request-List DHCP-Path-MTU-Aging-Timeout 24 -VALUE DHCP-Parameter-Request-List DHCP-Path-MTU-Plateau-Table 25 -VALUE DHCP-Parameter-Request-List DHCP-Interface-MTU-Size 26 -VALUE DHCP-Parameter-Request-List DHCP-All-Subnets-Are-Local 27 -VALUE DHCP-Parameter-Request-List DHCP-Broadcast-Address 28 -VALUE DHCP-Parameter-Request-List DHCP-Perform-Mask-Discovery 29 -VALUE DHCP-Parameter-Request-List DHCP-Provide-Mask-To-Others 30 -VALUE DHCP-Parameter-Request-List DHCP-Perform-Router-Discovery 31 -VALUE DHCP-Parameter-Request-List DHCP-Router-Solicitation-Address 32 -VALUE DHCP-Parameter-Request-List DHCP-Static-Routes 33 -VALUE DHCP-Parameter-Request-List DHCP-Trailer-Encapsulation 34 -VALUE DHCP-Parameter-Request-List DHCP-ARP-Cache-Timeout 35 -VALUE DHCP-Parameter-Request-List DHCP-Ethernet-Encapsulation 36 -VALUE DHCP-Parameter-Request-List DHCP-Default-TCP-TTL 37 -VALUE DHCP-Parameter-Request-List DHCP-Keep-Alive-Interval 38 -VALUE DHCP-Parameter-Request-List DHCP-Keep=Alive-Garbage 39 -VALUE DHCP-Parameter-Request-List DHCP-NIS-Domain-Name 40 -VALUE DHCP-Parameter-Request-List DHCP-NIS-Servers 41 -VALUE DHCP-Parameter-Request-List DHCP-NTP-Servers 42 -VALUE DHCP-Parameter-Request-List DHCP-Vendor 43 -VALUE DHCP-Parameter-Request-List DHCP-NETBIOS-Name-Servers 44 -VALUE DHCP-Parameter-Request-List DHCP-NETBIOS-Dgm-Dist-Servers 45 -VALUE DHCP-Parameter-Request-List DHCP-NETBIOS-Node-Type 46 -VALUE DHCP-Parameter-Request-List DHCP-NETBIOS 47 -VALUE DHCP-Parameter-Request-List DHCP-X-Window-Font-Server 48 -VALUE DHCP-Parameter-Request-List DHCP-X-Window-Display-Mgr 49 -VALUE DHCP-Parameter-Request-List DHCP-Requested-IP-Address 50 -VALUE DHCP-Parameter-Request-List DHCP-IP-Address-Lease-Time 51 -VALUE DHCP-Parameter-Request-List DHCP-Overload 52 -VALUE DHCP-Parameter-Request-List DHCP-Message-Type 53 -VALUE DHCP-Parameter-Request-List DHCP-DHCP-Server-Identifier 54 -VALUE DHCP-Parameter-Request-List DHCP-Parameter-Request-List 55 -VALUE DHCP-Parameter-Request-List DHCP-DHCP-Error-Message 56 -VALUE DHCP-Parameter-Request-List DHCP-DHCP-Maximum-Msg-Size 57 -VALUE DHCP-Parameter-Request-List DHCP-Renewal-Time 58 -VALUE DHCP-Parameter-Request-List DHCP-Rebinding-Time 59 -VALUE DHCP-Parameter-Request-List DHCP-Class-Identifier 60 -VALUE DHCP-Parameter-Request-List DHCP-Client-Identifier 61 -VALUE DHCP-Parameter-Request-List DHCP-Netware-Domain-Name 62 -VALUE DHCP-Parameter-Request-List DHCP-Netware-Sub-Options 63 -VALUE DHCP-Parameter-Request-List DHCP-NIS-Client-Domain-Name 64 -VALUE DHCP-Parameter-Request-List DHCP-NIS-Server-Address 65 -VALUE DHCP-Parameter-Request-List DHCP-TFTP-Server-Name 66 -VALUE DHCP-Parameter-Request-List DHCP-Boot-File-Name 67 -VALUE DHCP-Parameter-Request-List DHCP-Home-Agent-Address 68 -VALUE DHCP-Parameter-Request-List DHCP-SMTP-Server-Address 69 -VALUE DHCP-Parameter-Request-List DHCP-POP3-Server-Address 70 -VALUE DHCP-Parameter-Request-List DHCP-NNTP-Server-Address 71 -VALUE DHCP-Parameter-Request-List DHCP-WWW-Server-Address 72 -VALUE DHCP-Parameter-Request-List DHCP-Finger-Server-Address 73 -VALUE DHCP-Parameter-Request-List DHCP-IRC-Server-Address 74 -VALUE DHCP-Parameter-Request-List DHCP-StreetTalk-Server-Address 75 -VALUE DHCP-Parameter-Request-List DHCP-STDA-Server-Address 76 -VALUE DHCP-Parameter-Request-List DHCP-User-Class 77 -VALUE DHCP-Parameter-Request-List DHCP-Directory-Agent 78 -VALUE DHCP-Parameter-Request-List DHCP-Service-Scope 79 -VALUE DHCP-Parameter-Request-List DHCP-Rapid-Commit 80 -VALUE DHCP-Parameter-Request-List DHCP-Client-FQDN 81 -VALUE DHCP-Parameter-Request-List DHCP-Relay-Agent-Information 82 -VALUE DHCP-Parameter-Request-List DHCP-iSNS 83 -VALUE DHCP-Parameter-Request-List DHCP-NDS-Servers 85 -VALUE DHCP-Parameter-Request-List DHCP-NDS-Tree-Name 86 -VALUE DHCP-Parameter-Request-List DHCP-NDS-Context 87 -VALUE DHCP-Parameter-Request-List DHCP-Authentication 90 -VALUE DHCP-Parameter-Request-List DHCP-Client-Last-Txn-Time 91 -VALUE DHCP-Parameter-Request-List DHCP-associated-ip 92 -VALUE DHCP-Parameter-Request-List DHCP-Client-System 93 -VALUE DHCP-Parameter-Request-List DHCP-Client-NDI 94 -VALUE DHCP-Parameter-Request-List DHCP-LDAP 95 -VALUE DHCP-Parameter-Request-List DHCP-UUID/GUID 97 -VALUE DHCP-Parameter-Request-List DHCP-User-Auth 98 -VALUE DHCP-Parameter-Request-List DHCP-Netinfo-Address 112 -VALUE DHCP-Parameter-Request-List DHCP-Netinfo-Tag 113 -VALUE DHCP-Parameter-Request-List DHCP-URL 114 -VALUE DHCP-Parameter-Request-List DHCP-Auto-Config 116 -VALUE DHCP-Parameter-Request-List DHCP-Name-Service-Search 117 -VALUE DHCP-Parameter-Request-List DHCP-Subnet-Selection-Option 118 -VALUE DHCP-Parameter-Request-List DHCP-Domain-Search 119 -VALUE DHCP-Parameter-Request-List DHCP-SIP-Servers-DHCP-Option 120 -VALUE DHCP-Parameter-Request-List DHCP-Classless-Static-Route 121 -VALUE DHCP-Parameter-Request-List DHCP-CCC 122 -VALUE DHCP-Parameter-Request-List DHCP-GeoConf-Option 123 -VALUE DHCP-Parameter-Request-List DHCP-V-I-Vendor-Class 124 -VALUE DHCP-Parameter-Request-List DHCP-V-I-Vendor-Specific 125 -VALUE DHCP-Parameter-Request-List DHCP-Etherboot 128 -VALUE DHCP-Parameter-Request-List DHCP-TFTP-Server-IP-Address 128 -VALUE DHCP-Parameter-Request-List DHCP-Call-Server-IP-address 129 -VALUE DHCP-Parameter-Request-List DHCP-Ethernet-Interface 130 -VALUE DHCP-Parameter-Request-List DHCP-Vendor-Discrimination-Str 130 -VALUE DHCP-Parameter-Request-List DHCP-Remote-Stats-Svr-IP-Address 131 -VALUE DHCP-Parameter-Request-List DHCP-IEEE-802.1P-VLAN-ID 132 -VALUE DHCP-Parameter-Request-List DHCP-IEEE-802.1Q-L2-Priority 133 -VALUE DHCP-Parameter-Request-List DHCP-Diffserv-Code-Point 134 -VALUE DHCP-Parameter-Request-List DHCP-HTTP-Proxy 135 - -# -# Don't pay too much attention to these values. They will be fixed -# in a future release. -# -ATTRIBUTE DHCP-Agent-Circuit-Id 0x0152 octets -ATTRIBUTE DHCP-Agent-Remote-Id 0x0252 octets - -END-VENDOR DHCP diff --git a/resources/protocols/radius/dictionary.digium b/resources/protocols/radius/dictionary.digium index 5c028e00..9b64738a 100644 --- a/resources/protocols/radius/dictionary.digium +++ b/resources/protocols/radius/dictionary.digium @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Digium's Asterisk specific radius attributes @@ -7,7 +9,7 @@ # # http://bugs.digium.com/file_download.php\?file_id=9688\&type=bug # -# $Id: 98f9d9591478577b88861ef0ea4a99f6d453cd8d $ +# $Id: 937f2d4cb9fed8f40ff742a43e02edc5e9ef15ea $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.dlink b/resources/protocols/radius/dictionary.dlink index 5722c486..6020c076 100644 --- a/resources/protocols/radius/dictionary.dlink +++ b/resources/protocols/radius/dictionary.dlink @@ -1,12 +1,14 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # D-Link Vendor Specific Attributes Dictionary # # Created by Sylph Lin <sylph.lin@gmail.com> # -# Version $Id: fcbfce088111094e6bd9dc9b4ae72215b181e141 $ +# Version $Id: 2048c8b0d8b2178dccf43b0c82e62ef63043b235 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.dragonwave b/resources/protocols/radius/dictionary.dragonwave index 85658ba8..79bf1989 100644 --- a/resources/protocols/radius/dictionary.dragonwave +++ b/resources/protocols/radius/dictionary.dragonwave @@ -1,11 +1,13 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Dragonwave # http://www.dragonwaveinc.comw # -# $Id: 60a37d053d47f66f22bd8163e3697f2389020747 $ +# $Id: daa18eb826778cff4b92a05d9a263af57bd8bcb0 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.efficientip b/resources/protocols/radius/dictionary.efficientip index 09efef4b..f220ef67 100644 --- a/resources/protocols/radius/dictionary.efficientip +++ b/resources/protocols/radius/dictionary.efficientip @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Efficient IP VSA's # -# $Id: 3c1dd7519f360e6421531dbb731082a11589e667 $ +# $Id: 3c6fb2ccbcbcc8d93adfd091e24fc7f670e70b03 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.eleven b/resources/protocols/radius/dictionary.eleven new file mode 100644 index 00000000..27a3887f --- /dev/null +++ b/resources/protocols/radius/dictionary.eleven @@ -0,0 +1,55 @@ +# -*- text -*- +# Copyright (C) 2023 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# Eleven Software +# +# $Id: 93dabcb5a94417c9243a8aef28719bf5a23abcf4 $ +# +############################################################################## + +VENDOR Eleven 52970 + +BEGIN-VENDOR Eleven + +# +# DPSK attributes +# +# The RADIUS server responds with two Cisco-AVPair attributes: +# +# Cisco-AVPair = "psk-mode=ascii" +# Cisco-AVPair = "psk=<passphrase>" +# +# +ATTRIBUTE Eleven-Authentication-Find-Key 3 tlv + +BEGIN-TLV Eleven-Authentication-Find-Key +# +# The second EAPoL frame of the 4-way handshake +# + ATTRIBUTE Eleven-EAPOL-Frame-2 1 octets +END-TLV Eleven-Authentication-Find-Key + +# +# The first EAPoL frame of the 4-way handshake. +# +ATTRIBUTE Eleven-EAPOL-Anonce 2 octets + +# +# SSID name +# +ATTRIBUTE Eleven-EAPOL-SSID 3 string + +# +# BSSID +# +ATTRIBUTE Eleven-EAPOL-APMAC 4 octets + +# +# Wireless client MAC address. +# +ATTRIBUTE Eleven-EAPOL-STMAC 5 octets + +END-VENDOR Eleven diff --git a/resources/protocols/radius/dictionary.eltex b/resources/protocols/radius/dictionary.eltex index 6bcc4a12..f4226d23 100644 --- a/resources/protocols/radius/dictionary.eltex +++ b/resources/protocols/radius/dictionary.eltex @@ -1,7 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -# -# dictionary.eltex +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # VENDOR Eltex 35265 diff --git a/resources/protocols/radius/dictionary.epygi b/resources/protocols/radius/dictionary.epygi index 8e0ec8ab..328e729d 100644 --- a/resources/protocols/radius/dictionary.epygi +++ b/resources/protocols/radius/dictionary.epygi @@ -1,7 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -# -# dictionary.Epygi +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # VENDOR Epygi 16459 diff --git a/resources/protocols/radius/dictionary.equallogic b/resources/protocols/radius/dictionary.equallogic index 06caf5f1..ad72e063 100644 --- a/resources/protocols/radius/dictionary.equallogic +++ b/resources/protocols/radius/dictionary.equallogic @@ -1,7 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -# -# Equallogic Dictionary +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Equallogic was acquired by Dell in 2008. # @@ -41,3 +40,4 @@ ATTRIBUTE Equallogic-Admin-Repl-Site-Access 8 string # Comma-separated list of s ATTRIBUTE Equallogic-Admin-Account-Type 9 string # RO or RW END-VENDOR Equallogic + diff --git a/resources/protocols/radius/dictionary.ericsson b/resources/protocols/radius/dictionary.ericsson index 1dd8fbce..6206215e 100644 --- a/resources/protocols/radius/dictionary.ericsson +++ b/resources/protocols/radius/dictionary.ericsson @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Ericsson dictionary # -# $Id: f0825d1048699daab7dd236a74f1d738ead98fee $ +# $Id: da715df7464f20faec711eef579497b50ef0c792 $ # ############################################################################## @@ -82,7 +84,6 @@ ATTRIBUTE Ericsson-ViG-Redirecting-num-NP 78 integer ATTRIBUTE Ericsson-ViG-Redirecting-num-PI 79 integer ATTRIBUTE Ericsson-ViG-Redirecting-num-RFD 80 integer ATTRIBUTE Ericsson-ViG-Time-stamp-UTC 81 integer -ATTRIBUTE Ericsson-ViG-Time-stamp-UTC 81 integer ATTRIBUTE Ericsson-ViG-Time-stamp-TZ 82 integer ATTRIBUTE Ericsson-ViG-Time-stamp-DST 83 integer ATTRIBUTE Ericsson-ViG-Session-routing-duration 84 integer @@ -111,7 +112,6 @@ ATTRIBUTE Ericsson-ViG-Service-ID 106 integer ATTRIBUTE Ericsson-ViG-User-ID 107 string ATTRIBUTE Ericsson-ViG-Service-Name 108 string ATTRIBUTE Ericsson-ViG-Test-Call-Indicator 109 integer -ATTRIBUTE Ericsson-ViG-Test-Call-Indicator 109 integer ATTRIBUTE Ericsson-ViG-Emergency-Call-Indicator 110 integer ATTRIBUTE Ericsson-ViG-Calling-ID 111 string ATTRIBUTE Ericsson-ViG-Called-ID 112 string diff --git a/resources/protocols/radius/dictionary.ericsson.ab b/resources/protocols/radius/dictionary.ericsson.ab index aa535b8a..903fd712 100644 --- a/resources/protocols/radius/dictionary.ericsson.ab +++ b/resources/protocols/radius/dictionary.ericsson.ab @@ -1,262 +1,10 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # -# Ericsson-AB dictionary. -# -# Version: 1.00 14-Sep-2000 Chris Adams <cmadams@hiwaay.net> -# 1.10 26-Oct-2014 Anish Bhatt <anish@chelsio.com> -# $Id$ -# - -VENDOR Ericsson-AB 2352 - -# -# Ericsson-AB Vendor Specific Extensions -# -# The first set here uses '_' as the separator, as Ericsson-AB has changed -# their documentation to use '-' vs. '_'. The older '_' style entries -# are listed first so that they will still be accepted, -# yet not preferred. -# -# -# Ericsson-AB Vendor Specific Extensions ( older style syntax ) -# -# The names use underscores (_) instead of dashes (-), because -# that's what Ericsson-AB used in their older documentation and examples. -# +VENDOR Ericsson-AB 2352 BEGIN-VENDOR Ericsson-AB -ATTRIBUTE Client_DNS_Pri 1 ipaddr -ATTRIBUTE Client_DNS_Sec 2 ipaddr -ATTRIBUTE DHCP_Max_Leases 3 integer -ATTRIBUTE Context_Name 4 string -ATTRIBUTE Bridge_Group 5 string -ATTRIBUTE BG_Aging_Time 6 string -ATTRIBUTE BG_Path_Cost 7 string -ATTRIBUTE BG_Span_Dis 8 string -ATTRIBUTE BG_Trans_BPDU 9 string -ATTRIBUTE Rate_Limit_Rate 10 integer -ATTRIBUTE Rate_Limit_Burst 11 integer -ATTRIBUTE Police_Rate 12 integer -ATTRIBUTE Police_Burst 13 integer -ATTRIBUTE Source_Validation 14 integer -ATTRIBUTE Tunnel_Domain 15 integer -ATTRIBUTE Tunnel_Local_Name 16 string -ATTRIBUTE Tunnel_Remote_Name 17 string -ATTRIBUTE Tunnel_Function 18 integer -ATTRIBUTE Tunnel-Flow-Control 19 integer -ATTRIBUTE Tunnel-Static 20 integer -ATTRIBUTE Tunnel_Max_Sessions 21 integer -ATTRIBUTE Tunnel_Max_Tunnels 22 integer -ATTRIBUTE Tunnel_Session_Auth 23 integer -ATTRIBUTE Tunnel_Window 24 integer -ATTRIBUTE Tunnel_Retransmit 25 integer -ATTRIBUTE Tunnel_Cmd_Timeout 26 integer -ATTRIBUTE PPPOE_URL 27 string -ATTRIBUTE PPPOE_MOTM 28 string -ATTRIBUTE Tunnel_Group 29 integer -ATTRIBUTE Tunnel_Context 30 string -ATTRIBUTE Tunnel_Algorithm 31 integer -ATTRIBUTE Tunnel_Deadtime 32 integer -ATTRIBUTE Mcast_Send 33 integer -ATTRIBUTE Mcast_Receive 34 integer -ATTRIBUTE Mcast_MaxGroups 35 integer -ATTRIBUTE Ip_Address_Pool_Name 36 string -ATTRIBUTE Tunnel_DNIS 37 integer -ATTRIBUTE Medium_Type 38 integer -ATTRIBUTE PVC_Encapsulation_Type 39 integer -ATTRIBUTE PVC_Profile_Name 40 string -ATTRIBUTE PVC_Circuit_Padding 41 integer -ATTRIBUTE Bind_Type 42 integer -ATTRIBUTE Bind_Auth_Protocol 43 integer -ATTRIBUTE Bind_Auth_Max_Sessions 44 integer -ATTRIBUTE Bind_Bypass_Bypass 45 string -ATTRIBUTE Bind_Auth_Context 46 string -ATTRIBUTE Bind_Auth_Service_Grp 47 string -ATTRIBUTE Bind_Bypass_Context 48 string -ATTRIBUTE Bind_Int_Context 49 string -ATTRIBUTE Bind_Tun_Context 50 string -ATTRIBUTE Bind_Ses_Context 51 string -ATTRIBUTE Bind_Dot1q_Slot 52 integer -ATTRIBUTE Bind_Dot1q_Port 53 integer -ATTRIBUTE Bind_Dot1q_Vlan_Tag_Id 54 integer -ATTRIBUTE Bind_Int_Interface_Name 55 string -ATTRIBUTE Bind_L2TP_Tunnel_Name 56 string -ATTRIBUTE Bind_L2TP_Flow_Control 57 integer -ATTRIBUTE Bind_Sub_User_At_Context 58 string -ATTRIBUTE Bind_Sub_Password 59 string -ATTRIBUTE Ip_Host_Addr 60 string -ATTRIBUTE IP_TOS_Field 61 integer -ATTRIBUTE NAS_Real_Port 62 integer -ATTRIBUTE Tunnel_Session_Auth_Ctx 63 string -ATTRIBUTE Tunnel_Session_Auth_Service_Grp 64 string -ATTRIBUTE Tunnel_Rate_Limit_Rate 65 integer -ATTRIBUTE Tunnel_Rate_Limit_Burst 66 integer -ATTRIBUTE Tunnel_Police_Rate 67 integer -ATTRIBUTE Tunnel_Police_Burst 68 integer -ATTRIBUTE Tunnel_L2F_Second_Password 69 string -ATTRIBUTE ACL-Definition 70 string -ATTRIBUTE PPPoE-IP-Route-Add 71 string -ATTRIBUTE TTY_Level_Max 72 integer -ATTRIBUTE TTY_Level_Start 73 integer -ATTRIBUTE Bind-DHCP-Context 76 string -ATTRIBUTE Tunnel-Mobil-Group 77 string -ATTRIBUTE Tunnel-Client-VPN 78 string -ATTRIBUTE Tunnel-Server-VPN 79 string -ATTRIBUTE PPP-Compression 84 integer -ATTRIBUTE Tunnel-Hello-Timer 85 integer -ATTRIBUTE Redback-Reason 86 integer -ATTRIBUTE Qos-Policy-Policing 87 string -ATTRIBUTE Qos-Policy-Metering 88 string -ATTRIBUTE Qos-Policy-Queuing 89 string -ATTRIBUTE Igmp-Service-Profile 90 string -ATTRIBUTE Sub-Profile-Name 91 string -ATTRIBUTE Forward-Policy 92 string -ATTRIBUTE Remote-Port 93 string -ATTRIBUTE Reauth-String 94 string -ATTRIBUTE Reauth-More 95 integer - -# -# These next 2 seem to be copies of the DHCP options... -# -ATTRIBUTE Agent-Remote-Id 96 octets -ATTRIBUTE Agent-Circuit-Id 97 octets -ATTRIBUTE Platform-Type 98 integer -ATTRIBUTE RB-Client-NBNS-Pri 99 ipaddr -ATTRIBUTE RB-Client-NBNS-Sec 100 ipaddr -ATTRIBUTE Shaping-Profile-Name 101 string -ATTRIBUTE Bridge-Profile 103 string -ATTRIBUTE IP-Interface 104 string -ATTRIBUTE NAT-Policy-Name 105 string -ATTRIBUTE RB-NPM-Service-Id 106 string -ATTRIBUTE HTTP-Redirect-Profile-Name 107 string -ATTRIBUTE Bind-Auto-Sub-User 108 string -ATTRIBUTE Bind-Auto-Sub-Context 109 string -ATTRIBUTE Bind-Auto-Sub-Password 110 string -ATTRIBUTE Circuit-Protocol-Encap 111 integer -ATTRIBUTE OS-Version 112 string -ATTRIBUTE Session-Traffic-Limit 113 string -ATTRIBUTE QOS-Reference 114 string -ATTRIBUTE DHCP-Vendor-Class-ID 125 string -ATTRIBUTE Qos-Rate 126 string -ATTRIBUTE DHCP-Vendor-Encap-Option 127 string -ATTRIBUTE Acct_Input_Octets_64 128 octets -ATTRIBUTE Acct_Output_Octets_64 129 octets -ATTRIBUTE Acct_Input_Packets_64 130 octets -ATTRIBUTE Acct_Output_Packets_64 131 octets -ATTRIBUTE Assigned_IP_Address 132 ipaddr -ATTRIBUTE Acct_Mcast_In_Octets 133 integer -ATTRIBUTE Acct_Mcast_Out_Octets 134 integer -ATTRIBUTE Acct_Mcast_In_Packets 135 integer -ATTRIBUTE Acct_Mcast_Out_Packets 136 integer -ATTRIBUTE LAC_Port 137 integer -ATTRIBUTE LAC_Real_Port 138 integer -ATTRIBUTE LAC_Port_Type 139 integer -ATTRIBUTE LAC_Real_Port_Type 140 integer -ATTRIBUTE Acct_Dyn_Ac_Ent 141 string -ATTRIBUTE Session_Error_Code 142 integer -ATTRIBUTE Session_Error_Msg 143 string - -VALUE PVC_Encapsulation_Type AAA_ENCAPS_ATM_RAW 1 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_ATM_ROUTE1483 2 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_ATM_AUTO1483 3 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_ATM_MULTI 4 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_ATM_BRIDGE1483 5 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_ATM_PPP 6 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_ATM_PPP_SERIAL 7 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_ATM_PPP_NLPID 8 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_ATM_PPP_AUTO 9 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_ATM_PPPOE 10 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_ATM_L2TP 11 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_ATM_PPP_LLC 12 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_FRAME_AUTO1490 13 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_FRAME_MULTI 14 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_FRAME_BRIDGE1490 15 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_FRAME_PPP 16 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_FRAME_PPP_AUTO 17 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_FRAME_PPPOE 18 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_FRAME_ROUTE1490 19 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_FRAME_L2TP 20 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_L2TP_VC_MUXED 21 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_ETH 22 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_ETH_PPPOE 23 -VALUE PVC_Encapsulation_Type AAA_ENCAPS_ETH_MULTI 24 -VALUE PVC_Circuit_Padding AAA_CIRCUIT_PADDING 1 -VALUE PVC_Circuit_Padding AAA_CIRCUIT_NO_PADDING 2 -VALUE Bind_Type AAA_AUTH_BIND 1 -VALUE Bind_Type AAA_BYPASS_BIND 2 -VALUE Bind_Type AAA_INTERFACE_BIND 3 -VALUE Bind_Type AAA_SUBSCRIBE_BIND 4 -VALUE Bind_Type AAA_TUNNEL_BIND 5 -VALUE Bind_Type AAA_SESSION_BIND 6 -VALUE Bind_Type AAA_Q8021_BIND 7 -VALUE Bind_Type AAA_MULTI_BIND 8 -VALUE Bind_Auth_Protocol AAA_PPP_PAP 1 -VALUE Bind_Auth_Protocol AAA_PPP_CHAP 2 -VALUE Bind_Auth_Protocol AAA_PPP_CHAP_WAIT 3 -VALUE Bind_Auth_Protocol AAA_PPP_CHAP_PAP 4 -VALUE Bind_Auth_Protocol AAA_PPP_CHAP_WAIT_PAP 5 - -VALUE Tunnel_Function LAC-Only 1 -VALUE Tunnel_Function LNS-Only 2 -VALUE Tunnel_Function LAC-LNS 3 -VALUE Tunnel_Session_Auth CHAP 1 -VALUE Tunnel_Session_Auth PAP 2 -VALUE Tunnel_Session_Auth CHAP-PAP 3 -VALUE Mcast_Send NO-SEND 1 -VALUE Mcast_Send SEND 2 -VALUE Mcast_Send UNSOLICITED-SEND 3 -VALUE Mcast_Receive NO-RECEIVE 1 -VALUE Mcast_Receive RECEIVE 2 - -VALUE Tunnel_DNIS DNIS 1 -VALUE Tunnel_DNIS DNIS-Only 2 - -VALUE LAC_Port_Type NAS_PORT_TYPE_10BT 40 -VALUE LAC_Port_Type NAS_PORT_TYPE_100BT 41 -VALUE LAC_Port_Type NAS_PORT_TYPE_DS3_FR 42 -VALUE LAC_Port_Type NAS_PORT_TYPE_DS3_ATM 43 -VALUE LAC_Port_Type NAS_PORT_TYPE_OC3 44 -VALUE LAC_Port_Type NAS_PORT_TYPE_HSSI 45 -VALUE LAC_Port_Type NAS_PORT_TYPE_EIA530 46 -VALUE LAC_Port_Type NAS_PORT_TYPE_T1 47 -VALUE LAC_Port_Type NAS_PORT_TYPE_CHAN_T3 48 -VALUE LAC_Port_Type NAS_PORT_TYPE_DS1_FR 49 -VALUE LAC_Port_Type NAS_PORT_TYPE_E3_ATM 50 -VALUE LAC_Port_Type NAS_PORT_TYPE_IMA_ATM 51 -VALUE LAC_Port_Type NAS_PORT_TYPE_DS3_ATM_2 52 -VALUE LAC_Port_Type NAS_PORT_TYPE_OC3_ATM_2 53 -VALUE LAC_Port_Type NAS_PORT_TYPE_1000BSX 54 -VALUE LAC_Port_Type NAS_PORT_TYPE_E1_FR 55 -VALUE LAC_Port_Type NAS_PORT_TYPE_E1_ATM 56 -VALUE LAC_Port_Type NAS_PORT_TYPE_E3_FR 57 -VALUE LAC_Port_Type NAS_PORT_TYPE_OC3_POS 58 -VALUE LAC_Port_Type NAS_PORT_TYPE_OC12_POS 59 -VALUE LAC_Port_Type NAS_PORT_TYPE_PPPOE 60 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_10BT 40 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_100BT 41 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_DS3_FR 42 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_DS3_ATM 43 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_OC3 44 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_HSSI 45 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_EIA530 46 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_T1 47 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_CHAN_T3 48 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_DS1_FR 49 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_E3_ATM 50 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_IMA_ATM 51 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_DS3_ATM_2 52 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_OC3_ATM_2 53 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_1000BSX 54 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_E1_FR 55 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_E1_ATM 56 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_E3_FR 57 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_OC3_POS 58 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_OC12_POS 59 -VALUE LAC_Real_Port_Type NAS_PORT_TYPE_PPPOE 60 - -# -# New names. -# ATTRIBUTE Client-DNS-Pri 1 ipaddr ATTRIBUTE Client-DNS-Sec 2 ipaddr ATTRIBUTE DHCP-Max-Leases 3 integer @@ -271,35 +19,145 @@ ATTRIBUTE Rate-Limit-Burst 11 integer ATTRIBUTE Police-Rate 12 integer ATTRIBUTE Police-Burst 13 integer ATTRIBUTE Source-Validation 14 integer + +VALUE Source-Validation Enabled 1 +VALUE Source-Validation Disabled 2 + ATTRIBUTE Tunnel-Domain 15 integer + +VALUE Tunnel-Domain Enabled 1 +VALUE Tunnel-Domain Disabled 2 + ATTRIBUTE Tunnel-Local-Name 16 string ATTRIBUTE Tunnel-Remote-Name 17 string ATTRIBUTE Tunnel-Function 18 integer + +VALUE Tunnel-Function LAC-Only 1 +VALUE Tunnel-Function LNS-Only 2 +VALUE Tunnel-Function LAC-LNS 3 + ATTRIBUTE Tunnel-Flow-Control 19 integer ATTRIBUTE Tunnel-Static 20 integer ATTRIBUTE Tunnel-Max-Sessions 21 integer ATTRIBUTE Tunnel-Max-Tunnels 22 integer ATTRIBUTE Tunnel-Session-Auth 23 integer + +VALUE Tunnel-Session-Auth CHAP 1 +VALUE Tunnel-Session-Auth PAP 2 +VALUE Tunnel-Session-Auth CHAP-PAP 3 + ATTRIBUTE Tunnel-Window 24 integer ATTRIBUTE Tunnel-Retransmit 25 integer ATTRIBUTE Tunnel-Cmd-Timeout 26 integer ATTRIBUTE PPPOE-URL 27 string ATTRIBUTE PPPOE-MOTM 28 string ATTRIBUTE Tunnel-Group 29 integer + +VALUE Tunnel-Group Enabled 1 +VALUE Tunnel-Group Disabled 2 + ATTRIBUTE Tunnel-Context 30 string ATTRIBUTE Tunnel-Algorithm 31 integer + +VALUE Tunnel-Algorithm First 1 +VALUE Tunnel-Algorithm Load-Balance 2 +VALUE Tunnel-Algorithm WRR 3 + ATTRIBUTE Tunnel-Deadtime 32 integer ATTRIBUTE Mcast-Send 33 integer + +VALUE Mcast-Send NO-SEND 1 +VALUE Mcast-Send SEND 2 +VALUE Mcast-Send UNSOLICITED-SEND 3 + ATTRIBUTE Mcast-Receive 34 integer + +VALUE Mcast-Receive NO-RECEIVE 1 +VALUE Mcast-Receive RECEIVE 2 + ATTRIBUTE Mcast-MaxGroups 35 integer ATTRIBUTE Ip-Address-Pool-Name 36 string ATTRIBUTE Tunnel-DNIS 37 integer + +VALUE Tunnel-DNIS DNIS 1 +VALUE Tunnel-DNIS DNIS-Only 2 +VALUE Tunnel-DNIS DNIS-Generate 4 + ATTRIBUTE Medium-Type 38 integer + +VALUE Medium-Type DSL 11 +VALUE Medium-Type Cable 12 +VALUE Medium-Type Wireless 13 +VALUE Medium-Type Satellite 14 + ATTRIBUTE PVC-Encapsulation-Type 39 integer + +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-RAW 1 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-ROUTE1483 2 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-AUTO1483 3 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-MULTI 4 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-BRIDGE1483 5 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-PPP 6 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-PPP-SERIAL 7 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-PPP-NLPID 8 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-PPP-AUTO 9 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-PPPOE 10 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-L2TP 11 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-PPP-LLC 12 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-AUTO1490 13 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-MULTI 14 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-BRIDGE1490 15 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-PPP 16 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-PPP-AUTO 17 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-PPPOE 18 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-ROUTE1490 19 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-L2TP 20 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-L2TP-VC-MUXED 21 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ETH 22 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ETH-PPPOE 23 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ETH-MULTI 24 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ETH-DOT1Q 25 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ETH-DOT1Q-PPPOE 26 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-MULTI-PPPOE 27 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-MULTI-IPV6OE 28 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-MULTI-PPPOE-N-IPV6OE 29 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ETH-DOT1Q-TUNNEL 30 +VALUE PVC-Encapsulation-Type AAA-ENCAPS-ETH-DOT1Q-TUNNEL-PPPOE 31 + ATTRIBUTE PVC-Profile-Name 40 string ATTRIBUTE PVC-Circuit-Padding 41 integer + +VALUE PVC-Circuit-Padding AAA-CIRCUIT-PADDING 1 +VALUE PVC-Circuit-Padding AAA-CIRCUIT-NO-PADDING 2 + ATTRIBUTE Bind-Type 42 integer + +VALUE Bind-Type AAA-AUTH-BIND 1 +VALUE Bind-Type AAA-BYPASS-BIND 2 +VALUE Bind-Type AAA-INTERFACE-BIND 3 +VALUE Bind-Type AAA-SUBSCRIBE-BIND 4 +VALUE Bind-Type AAA-TUNNEL-BIND 5 +VALUE Bind-Type AAA-SESSION-BIND 6 +VALUE Bind-Type AAA-Q8021-BIND 7 +VALUE Bind-Type AAA-MULTI-BIND 8 +VALUE Bind-Type AAA-DHCP-BIND 9 +VALUE Bind-Type AAA-MULTI-BIND-SUB 10 +VALUE Bind-Type AAA-BRIDGE-GROUP-BIND 11 +VALUE Bind-Type AAA-VLAN-BIND 12 +VALUE Bind-Type AAA-VLAN-GROUP-BIND 13 +VALUE Bind-Type AAA-AUTO-SUBSCRIBER-BIND 14 + ATTRIBUTE Bind-Auth-Protocol 43 integer + +VALUE Bind-Auth-Protocol AAA-PPP-PAP 1 +VALUE Bind-Auth-Protocol AAA-PPP-CHAP 2 +VALUE Bind-Auth-Protocol AAA-PPP-CHAP-WAIT 3 +VALUE Bind-Auth-Protocol AAA-PPP-CHAP-PAP 4 +VALUE Bind-Auth-Protocol AAA-PPP-CHAP-WAIT-PAP 5 +VALUE Bind-Auth-Protocol AAA-PPP-EAP 6 +VALUE Bind-Auth-Protocol AAA-PPP-PAP-CHAP 7 +VALUE Bind-Auth-Protocol AAA-PPP-PAP-CHAP-WAIT 8 + ATTRIBUTE Bind-Auth-Max-Sessions 44 integer ATTRIBUTE Bind-Bypass-Bypass 45 string ATTRIBUTE Bind-Auth-Context 46 string @@ -318,6 +176,24 @@ ATTRIBUTE Bind-Sub-User-At-Context 58 string ATTRIBUTE Bind-Sub-Password 59 string ATTRIBUTE Ip-Host-Addr 60 string ATTRIBUTE IP-TOS-Field 61 integer + +VALUE IP-TOS-Field normal 0 +VALUE IP-TOS-Field min-cost-only 1 +VALUE IP-TOS-Field max-reliability-only 2 +VALUE IP-TOS-Field max-reliability-plus-min-cost 3 +VALUE IP-TOS-Field max-throughput-only 4 +VALUE IP-TOS-Field max-throughput-plus-min-cost 5 +VALUE IP-TOS-Field max-throughput-plus-max-reliability 6 +VALUE IP-TOS-Field max-throughput-plus-max-reliability-plus-min-cost 7 +VALUE IP-TOS-Field min-delay-only 8 +VALUE IP-TOS-Field min-delay-plus-min-cost 9 +VALUE IP-TOS-Field min-delay-plus-max-reliability 10 +VALUE IP-TOS-Field min-delay-plus-max-reliability-plus-min-cost 11 +VALUE IP-TOS-Field min-delay-plus-max-throughput 12 +VALUE IP-TOS-Field min-delay-plus-max-throughput-plus-min-cost 13 +VALUE IP-TOS-Field min-delay-plus-max-throughput-plus-max-reliability 14 +VALUE IP-TOS-Field min-delay-plus-max-throughput-plus-max-reliability-plus-min-cost 15 + ATTRIBUTE NAS-Real-Port 62 integer ATTRIBUTE Tunnel-Session-Auth-Ctx 63 string ATTRIBUTE Tunnel-Session-Auth-Service-Grp 64 string @@ -339,7 +215,7 @@ ATTRIBUTE Tunnel-Server-Rhost 81 string ATTRIBUTE Tunnel-Client-Int-Addr 82 ipaddr ATTRIBUTE Tunnel-Server-Int-Addr 83 ipaddr ATTRIBUTE PPP-Compression 84 integer -ATTRIBUTE Tunnel-Hello-Timer 85 integer +ATTRIBUTE Tunnel-Hello-Timer 85 integer has_tag ATTRIBUTE Redback-Reason 86 integer ATTRIBUTE Qos-Policing-Profile-Name 87 string ATTRIBUTE Qos-Metering-Profile-Name 88 string @@ -350,9 +226,15 @@ ATTRIBUTE Forward-Policy 92 string ATTRIBUTE Remote-Port 93 string ATTRIBUTE Reauth 94 string ATTRIBUTE Reauth-More 95 integer -ATTRIBUTE Agent-Remote-Id 96 string -ATTRIBUTE Agent-Circuit-Id 97 string +ATTRIBUTE Agent-Remote-Id 96 octets +ATTRIBUTE Agent-Circuit-Id 97 octets ATTRIBUTE Platform-Type 98 integer + +VALUE Platform-Type SMS 1 +VALUE Platform-Type SmartEdge-800 2 +VALUE Platform-Type SE-400 3 +VALUE Platform-Type SE-100 4 + ATTRIBUTE Client-NBNS-Pri 99 ipaddr ATTRIBUTE Client-NBNS-Sec 100 ipaddr ATTRIBUTE Shaping-Profile-Name 101 string @@ -365,6 +247,9 @@ ATTRIBUTE Bind-Auto-Sub-User 108 string ATTRIBUTE Bind-Auto-Sub-Context 109 string ATTRIBUTE Bind-Auto-Sub-Password 110 string ATTRIBUTE Circuit-Protocol-Encap 111 integer + +VALUE Circuit-Protocol-Encap ENCAPS-PPPOE 27 + ATTRIBUTE OS-Version 112 string ATTRIBUTE Session-Traffic-Limit 113 string ATTRIBUTE QOS-Reference 114 string @@ -375,23 +260,86 @@ ATTRIBUTE Tunnel-Police-Excess-Burst 124 octets ATTRIBUTE DHCP-Vendor-Class-ID 125 string ATTRIBUTE Qos-Rate 126 string ATTRIBUTE DHCP-Vendor-Encap-Option 127 string -ATTRIBUTE Acct-Input-Octets-64 128 octets -ATTRIBUTE Acct-Output-Octets-64 129 octets -ATTRIBUTE Acct-Input-Packets-64 130 octets -ATTRIBUTE Acct-Output-Packets-64 131 octets +ATTRIBUTE Acct-Input-Octets-64 128 integer64 +ATTRIBUTE Acct-Output-Octets-64 129 integer64 +ATTRIBUTE Acct-Input-Packets-64 130 integer64 +ATTRIBUTE Acct-Output-Packets-64 131 integer64 ATTRIBUTE Assigned-IP-Address 132 ipaddr -ATTRIBUTE Acct-Mcast-In-Octets-64 133 octets -ATTRIBUTE Acct-Mcast-Out-Octets-64 134 octets -ATTRIBUTE Acct-Mcast-In-Packets-64 135 octets -ATTRIBUTE Acct-Mcast-Out-Packets-64 136 octets +ATTRIBUTE Acct-Mcast-In-Octets-64 133 integer64 +ATTRIBUTE Acct-Mcast-Out-Octets-64 134 integer64 +ATTRIBUTE Acct-Mcast-In-Packets-64 135 integer64 +ATTRIBUTE Acct-Mcast-Out-Packets-64 136 integer64 ATTRIBUTE LAC-Port 137 integer ATTRIBUTE LAC-Real-Port 138 integer ATTRIBUTE LAC-Port-Type 139 integer + +VALUE LAC-Port-Type NAS-PORT-TYPE-10BT 40 +VALUE LAC-Port-Type NAS-PORT-TYPE-100BT 41 +VALUE LAC-Port-Type NAS-PORT-TYPE-DS3-FR 42 +VALUE LAC-Port-Type NAS-PORT-TYPE-DS3-ATM 43 +VALUE LAC-Port-Type NAS-PORT-TYPE-OC3 44 +VALUE LAC-Port-Type NAS-PORT-TYPE-HSSI 45 +VALUE LAC-Port-Type NAS-PORT-TYPE-EIA530 46 +VALUE LAC-Port-Type NAS-PORT-TYPE-T1 47 +VALUE LAC-Port-Type NAS-PORT-TYPE-CHAN-T3 48 +VALUE LAC-Port-Type NAS-PORT-TYPE-DS1-FR 49 +VALUE LAC-Port-Type NAS-PORT-TYPE-E3-ATM 50 +VALUE LAC-Port-Type NAS-PORT-TYPE-IMA-ATM 51 +VALUE LAC-Port-Type NAS-PORT-TYPE-DS3-ATM-2 52 +VALUE LAC-Port-Type NAS-PORT-TYPE-OC3-ATM-2 53 +VALUE LAC-Port-Type NAS-PORT-TYPE-1000BSX 54 +VALUE LAC-Port-Type NAS-PORT-TYPE-E1-FR 55 +VALUE LAC-Port-Type NAS-PORT-TYPE-E1-ATM 56 +VALUE LAC-Port-Type NAS-PORT-TYPE-E3-FR 57 +VALUE LAC-Port-Type NAS-PORT-TYPE-OC3-POS 58 +VALUE LAC-Port-Type NAS-PORT-TYPE-OC12-POS 59 +VALUE LAC-Port-Type NAS-PORT-TYPE-PPPOE 60 + ATTRIBUTE LAC-Real-Port-Type 140 integer + +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-10BT 40 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-100BT 41 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-DS3-FR 42 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-DS3-ATM 43 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-OC3 44 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-HSSI 45 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-EIA530 46 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-T1 47 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-CHAN-T3 48 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-DS1-FR 49 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-E3-ATM 50 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-IMA-ATM 51 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-DS3-ATM-2 52 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-OC3-ATM-2 53 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-1000BSX 54 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-E1-FR 55 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-E1-ATM 56 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-E3-FR 57 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-OC3-POS 58 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-OC12-POS 59 +VALUE LAC-Real-Port-Type NAS-PORT-TYPE-PPPOE 60 + ATTRIBUTE Acct-Dyn-Ac-Ent 141 string ATTRIBUTE Session-Error-Code 142 integer ATTRIBUTE Session-Error-Msg 143 string ATTRIBUTE Acct-Update-Reason 144 integer + +VALUE Acct-Update-Reason AAA-LOAD-ACCT-SESSION-UP 1 +VALUE Acct-Update-Reason AAA-LOAD-ACCT-SESSION-DOWN 2 +VALUE Acct-Update-Reason AAA-LOAD-ACCT-PERIODIC 3 +VALUE Acct-Update-Reason AAA-LOAD-ACCT-DYN-AC-ENT-START 4 +VALUE Acct-Update-Reason AAA-LOAD-ACCT-DYN-AC-ENT-STOP 5 +VALUE Acct-Update-Reason AAA-LOAD-ACCT-DYN-AC-ENT-TIMEOUT 6 +VALUE Acct-Update-Reason AAA-LOAD-ACCT-SUBSCRIBER-REAUTHOR 7 +VALUE Acct-Update-Reason AAA-LOAD-ACCT-PPP-IPCP-UP 8 +VALUE Acct-Update-Reason AAA-LOAD-ACCT-PPP-MP-LINK-UP 9 +VALUE Acct-Update-Reason AAA-LOAD-ACCT-DHCP-IP-ADDR-GRANTED 10 +VALUE Acct-Update-Reason AAA-LOAD-ACCT-DHCP-IP-ADDR-RELEASED 11 +VALUE Acct-Update-Reason AAA-LOAD-ACCT-ACL-TIMERED-ACTION 12 +VALUE Acct-Update-Reason AAA-LOAD-ACCT-ACL-ACTION 13 +VALUE Acct-Update-Reason AAA-LOAD-ACCT-CMD 14 +VALUE Acct-Update-Reason AAA-LOAD-ACCT-TEST 15 + ATTRIBUTE Mac-Addr 145 string ATTRIBUTE Vlan-Source-Info 146 string ATTRIBUTE Acct-Mcast-In-Octets 147 integer @@ -424,8 +372,22 @@ ATTRIBUTE DSL-Actual-Inter-Delay-Up 177 integer ATTRIBUTE DSL-Max-Inter-Delay-Down 178 integer ATTRIBUTE DSL-Actual-Inter-Delay-Down 179 integer ATTRIBUTE DSL-Line-State 180 integer + +VALUE DSL-Line-State Showtime 1 +VALUE DSL-Line-State Idle 2 +VALUE DSL-Line-State Silent 3 + ATTRIBUTE DSL-L2-Encapsulation 181 integer ATTRIBUTE DSL-Transmission-System 182 integer + +VALUE DSL-Transmission-System ADSL1 1 +VALUE DSL-Transmission-System ADSL2 2 +VALUE DSL-Transmission-System ADSL2+ 3 +VALUE DSL-Transmission-System VDSL1 4 +VALUE DSL-Transmission-System VDSL2 5 +VALUE DSL-Transmission-System SDSL 6 +VALUE DSL-Transmission-System UNKNOWN 7 + ATTRIBUTE DSL-PPPOA-PPPOE-Inter-Work-Flag 183 integer ATTRIBUTE DSL-Actual-Rate-Down-Factor 185 integer ATTRIBUTE DSL-Combined-Line-Info 184 string @@ -433,12 +395,28 @@ ATTRIBUTE Class-Volume-limit 186 string ATTRIBUTE Class-Volume-In-Counter 187 string ATTRIBUTE Class-Volume-Out-Counter 188 string ATTRIBUTE Flow-FAC-Profile 189 string -ATTRIBUTE Flow-FAC-Profile 189 string -ATTRIBUTE Service-Name 190 string -ATTRIBUTE Service-Action 191 integer -ATTRIBUTE Service-Parameter 192 string -ATTRIBUTE Service-Error-Cause 193 integer -ATTRIBUTE Deactivate-Service-Name 194 string +ATTRIBUTE Service-Name 190 string has_tag +ATTRIBUTE Service-Action 191 integer has_tag + +VALUE Service-Action DE-ACTIVATE 0 +VALUE Service-Action ACTIVATE-WITH-ACCT 1 +VALUE Service-Action ACTIVATE-WITHOUT-ACCT 2 + +ATTRIBUTE Service-Parameter 192 string has_tag +ATTRIBUTE Service-Error-Cause 193 integer has_tag + +VALUE Service-Error-Cause Service-success 0 +VALUE Service-Error-Cause Unsupported-attribute 401 +VALUE Service-Error-Cause Missing-attribute 402 +VALUE Service-Error-Cause Invalid-request 404 +VALUE Service-Error-Cause Resource-unavailable 506 +VALUE Service-Error-Cause Generic-service-error 550 +VALUE Service-Error-Cause Service-not-found 551 +VALUE Service-Error-Cause Service-already-active 552 +VALUE Service-Error-Cause Service-accounting-disabled 553 +VALUE Service-Error-Cause Service-duplicate-parameter 554 + +ATTRIBUTE Deactivate-Service-Name 194 string has_tag ATTRIBUTE Qos-Profile-Overhead 195 string ATTRIBUTE Dynamic-QoS-Param 196 string ATTRIBUTE Acct-Alt-Session-ID 197 string @@ -448,7 +426,7 @@ ATTRIBUTE SBC-Adjacency 200 string ATTRIBUTE DHCP-Field 201 octets ATTRIBUTE DHCP-Option 202 octets ATTRIBUTE Security-Service 203 string -ATTRIBUTE Reauth-Service-Name 204 string +ATTRIBUTE Reauth-Service-Name 204 string has_tag ATTRIBUTE Flow-IP-Profile 205 string ATTRIBUTE Radius-Throttle-Watermark 206 integer ATTRIBUTE RB-IPV6-DNS 207 string @@ -457,7 +435,7 @@ ATTRIBUTE Cluster-Partition-ID 209 string ATTRIBUTE Circuit-Group-Member 210 string ATTRIBUTE Delegated-Max-Prefix 212 integer ATTRIBUTE IPv4-Address-Release-Control 213 string -ATTRIBUTE Acct-Input-IPv4-Octet 214 integer +ATTRIBUTE Acct-Input-IPv4-Octets 214 integer ATTRIBUTE Acct-Output-IPv4-Octets 215 integer ATTRIBUTE Acct-Input-IPv4-Packets 216 integer ATTRIBUTE Acct-Output-IPv4-Packets 217 integer @@ -470,194 +448,4 @@ ATTRIBUTE Acct-Output-IPv6-Packets 223 integer ATTRIBUTE Acct-Input-IPv6-Gigawords 224 integer ATTRIBUTE Acct-Output-IPv6-Gigawords 225 integer -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-RAW 1 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-ROUTE1483 2 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-AUTO1483 3 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-MULTI 4 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-BRIDGE1483 5 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-PPP 6 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-PPP-SERIAL 7 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-PPP-NLPID 8 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-PPP-AUTO 9 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-PPPOE 10 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-L2TP 11 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-PPP-LLC 12 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-AUTO1490 13 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-MULTI 14 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-BRIDGE1490 15 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-PPP 16 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-PPP-AUTO 17 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-PPPOE 18 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-ROUTE1490 19 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-FRAME-L2TP 20 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-L2TP-VC-MUXED 21 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ETH 22 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ETH-PPPOE 23 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ETH-MULTI 24 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ETH-DOT1Q 25 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ETH-DOT1Q-PPPOE 26 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-MULTI-PPPOE 27 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-MULTI-IPV6OE 28 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ATM-MULTI-PPPOE-N-IPV6OE 29 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ETH-DOT1Q-TUNNEL 30 -VALUE PVC-Encapsulation-Type AAA-ENCAPS-ETH-DOT1Q-TUNNEL-PPPOE 31 - -VALUE PVC-Circuit-Padding AAA-CIRCUIT-PADDING 1 -VALUE PVC-Circuit-Padding AAA-CIRCUIT-NO-PADDING 2 -VALUE Bind-Type AAA-AUTH-BIND 1 -VALUE Bind-Type AAA-BYPASS-BIND 2 -VALUE Bind-Type AAA-INTERFACE-BIND 3 -VALUE Bind-Type AAA-SUBSCRIBE-BIND 4 -VALUE Bind-Type AAA-TUNNEL-BIND 5 -VALUE Bind-Type AAA-SESSION-BIND 6 -VALUE Bind-Type AAA-Q8021-BIND 7 -VALUE Bind-Type AAA-MULTI-BIND 8 -VALUE Bind-Type AAA-DHCP-BIND 9 -VALUE Bind-Type AAA-MULTI-BIND-SUB 10 -VALUE Bind-Type AAA-BRIDGE-GROUP-BIND 11 -VALUE Bind-Type AAA-VLAN-BIND 12 -VALUE Bind-Type AAA-VLAN-GROUP-BIND 13 -VALUE Bind-Type AAA-AUTO-SUBSCRIBER-BIND 14 -VALUE Bind-Auth-Protocol AAA-PPP-PAP 1 -VALUE Bind-Auth-Protocol AAA-PPP-CHAP 2 -VALUE Bind-Auth-Protocol AAA-PPP-CHAP-WAIT 3 -VALUE Bind-Auth-Protocol AAA-PPP-CHAP-PAP 4 -VALUE Bind-Auth-Protocol AAA-PPP-CHAP-WAIT-PAP 5 -VALUE Bind-Auth-Protocol AAA-PPP-EAP 6 -VALUE Bind-Auth-Protocol AAA-PPP-PAP-CHAP 7 -VALUE Bind-Auth-Protocol AAA-PPP-PAP-CHAP-WAIT 8 - -VALUE Source-Validation Enabled 1 -VALUE Source-Validation Disabled 2 -VALUE Tunnel-Domain Enabled 1 -VALUE Tunnel-Domain Disabled 2 -VALUE Tunnel-Function LAC-Only 1 -VALUE Tunnel-Function LNS-Only 2 -VALUE Tunnel-Function LAC-LNS 3 -VALUE Tunnel-Session-Auth CHAP 1 -VALUE Tunnel-Session-Auth PAP 2 -VALUE Tunnel-Session-Auth CHAP-PAP 3 -VALUE Tunnel-Group Enabled 1 -VALUE Tunnel-Group Disabled 2 -VALUE Tunnel-Algorithm First 1 -VALUE Tunnel-Algorithm Load-Balance 2 -VALUE Tunnel-Algorithm WRR 3 -VALUE Mcast-Send NO-SEND 1 -VALUE Mcast-Send SEND 2 -VALUE Mcast-Send UNSOLICITED-SEND 3 -VALUE Mcast-Receive NO-RECEIVE 1 -VALUE Mcast-Receive RECEIVE 2 - -VALUE Tunnel-DNIS DNIS 1 -VALUE Tunnel-DNIS DNIS-Only 2 -VALUE Tunnel-DNIS DNIS-Generate 4 - -VALUE Platform-Type SMS 1 -VALUE Platform-Type SmartEdge-800 2 -VALUE Platform-Type SE-400 3 -VALUE Platform-Type SE-100 4 - -VALUE Circuit-Protocol-Encap ENCAPS-PPPOE 27 - -VALUE Medium-Type DSL 11 -VALUE Medium-Type Cable 12 -VALUE Medium-Type Wireless 13 -VALUE Medium-Type Satellite 14 - -VALUE IP-TOS-Field normal 0 -VALUE IP-TOS-Field min-cost-only 1 -VALUE IP-TOS-Field max-reliability-only 2 -VALUE IP-TOS-Field max-reliability-plus-min-cost 3 -VALUE IP-TOS-Field max-throughput-only 4 -VALUE IP-TOS-Field max-throughput-plus-min-cost 5 -VALUE IP-TOS-Field max-throughput-plus-max-reliability 6 -VALUE IP-TOS-Field max-throughput-plus-max-reliability-plus-min-cost 7 -VALUE IP-TOS-Field min-delay-only 8 -VALUE IP-TOS-Field min-delay-plus-min-cost 9 -VALUE IP-TOS-Field min-delay-plus-max-reliability 10 -VALUE IP-TOS-Field min-delay-plus-max-reliability-plus-min-cost 11 -VALUE IP-TOS-Field min-delay-plus-max-throughput 12 -VALUE IP-TOS-Field min-delay-plus-max-throughput-plus-min-cost 13 -VALUE IP-TOS-Field min-delay-plus-max-throughput-plus-max-reliability 14 -VALUE IP-TOS-Field min-delay-plus-max-throughput-plus-max-reliability-plus-min-cost 15 - -VALUE LAC-Port-Type NAS-PORT-TYPE-10BT 40 -VALUE LAC-Port-Type NAS-PORT-TYPE-100BT 41 -VALUE LAC-Port-Type NAS-PORT-TYPE-DS3-FR 42 -VALUE LAC-Port-Type NAS-PORT-TYPE-DS3-ATM 43 -VALUE LAC-Port-Type NAS-PORT-TYPE-OC3 44 -VALUE LAC-Port-Type NAS-PORT-TYPE-HSSI 45 -VALUE LAC-Port-Type NAS-PORT-TYPE-EIA530 46 -VALUE LAC-Port-Type NAS-PORT-TYPE-T1 47 -VALUE LAC-Port-Type NAS-PORT-TYPE-CHAN-T3 48 -VALUE LAC-Port-Type NAS-PORT-TYPE-DS1-FR 49 -VALUE LAC-Port-Type NAS-PORT-TYPE-E3-ATM 50 -VALUE LAC-Port-Type NAS-PORT-TYPE-IMA-ATM 51 -VALUE LAC-Port-Type NAS-PORT-TYPE-DS3-ATM-2 52 -VALUE LAC-Port-Type NAS-PORT-TYPE-OC3-ATM-2 53 -VALUE LAC-Port-Type NAS-PORT-TYPE-1000BSX 54 -VALUE LAC-Port-Type NAS-PORT-TYPE-E1-FR 55 -VALUE LAC-Port-Type NAS-PORT-TYPE-E1-ATM 56 -VALUE LAC-Port-Type NAS-PORT-TYPE-E3-FR 57 -VALUE LAC-Port-Type NAS-PORT-TYPE-OC3-POS 58 -VALUE LAC-Port-Type NAS-PORT-TYPE-OC12-POS 59 -VALUE LAC-Port-Type NAS-PORT-TYPE-PPPOE 60 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-10BT 40 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-100BT 41 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-DS3-FR 42 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-DS3-ATM 43 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-OC3 44 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-HSSI 45 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-EIA530 46 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-T1 47 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-CHAN-T3 48 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-DS1-FR 49 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-E3-ATM 50 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-IMA-ATM 51 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-DS3-ATM-2 52 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-OC3-ATM-2 53 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-1000BSX 54 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-E1-FR 55 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-E1-ATM 56 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-E3-FR 57 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-OC3-POS 58 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-OC12-POS 59 -VALUE LAC-Real-Port-Type NAS-PORT-TYPE-PPPOE 60 - -# Although Ericsson-AB uses - instead of _ in the Attributes, these values are listed -# with _ in the latest (6.1.4.4) documentation, so I have entered them as so -# graeme - -VALUE Acct-Update-Reason AAA_LOAD_ACCT_SESSION_UP 1 -VALUE Acct-Update-Reason AAA_LOAD_ACCT_SESSION_DOWN 2 -VALUE Acct-Update-Reason AAA_LOAD_ACCT_PERIODIC 3 -VALUE Acct-Update-Reason AAA_LOAD_ACCT_DYN_AC_ENT_START 4 -VALUE Acct-Update-Reason AAA_LOAD_ACCT_DYN_AC_ENT_STOP 5 -VALUE Acct-Update-Reason AAA_LOAD_ACCT_DYN_AC_ENT_TIMEOUT 6 -VALUE Acct-Update-Reason AAA_LOAD_ACCT_SUBSCRIBER_REAUTHOR 7 -VALUE Acct-Update-Reason AAA_LOAD_ACCT_PPP_IPCP_UP 8 -VALUE Acct-Update-Reason AAA_LOAD_ACCT_PPP_MP_LINK_UP 9 -VALUE Acct-Update-Reason AAA_LOAD_ACCT_DHCP_IP_ADDR_GRANTED 10 -VALUE Acct-Update-Reason AAA_LOAD_ACCT_DHCP_IP_ADDR_RELEASED 11 -VALUE Acct-Update-Reason AAA_LOAD_ACCT_ACL_TIMERED_ACTION 12 -VALUE Acct-Update-Reason AAA_LOAD_ACCT_ACL_ACTION 13 -VALUE Acct-Update-Reason AAA_LOAD_ACCT_CMD 14 -VALUE Acct-Update-Reason AAA_LOAD_ACCT_TEST 15 - -VALUE DSL-Line-State Showtime 1 -VALUE DSL-Line-State Idle 2 -VALUE DSL-Line-State Silent 3 - -VALUE DSL-Transmission-System ADSL1 1 -VALUE DSL-Transmission-System ADSL2 2 -VALUE DSL-Transmission-System ADSL2+ 3 -VALUE DSL-Transmission-System VDSL1 4 -VALUE DSL-Transmission-System VDSL2 5 -VALUE DSL-Transmission-System SDSL 6 -VALUE DSL-Transmission-System UNKNOWN 7 - -VALUE Service-Action DE-ACTIVATE 0 -VALUE Service-Action ACTIVATE-WITH-ACCT 1 -VALUE Service-Action ACTIVATE-WITHOUT-ACCT 2 - END-VENDOR Ericsson-AB diff --git a/resources/protocols/radius/dictionary.ericsson.packet.core.networks b/resources/protocols/radius/dictionary.ericsson.packet.core.networks index d15bfcb5..34e5a696 100644 --- a/resources/protocols/radius/dictionary.ericsson.packet.core.networks +++ b/resources/protocols/radius/dictionary.ericsson.packet.core.networks @@ -1,5 +1,5 @@ -# -# dictionary.ericsson.packet.core.networks +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # VENDOR Ericsson-Packet-Core-Networks 10923 diff --git a/resources/protocols/radius/dictionary.erx b/resources/protocols/radius/dictionary.erx new file mode 100644 index 00000000..71921a78 --- /dev/null +++ b/resources/protocols/radius/dictionary.erx @@ -0,0 +1,433 @@ +# -*- text -*- +# Copyright (C) 2020 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# Version $Id: 2a4f3edf2e2b90a9347e6f491d9f86286178f9b1 $ +# +# Juniper's (was Unisphere's) broadband RAS +# From Terje Krogdahl <tekr@nextra.com> +# +# Version: $Id: 2a4f3edf2e2b90a9347e6f491d9f86286178f9b1 $ +# + +# This dictionary applies to access services on Juniper JUNOS (M/MX) +# based platforms as well as JUNOSe, although some of the attributes +# have been given new names on JUNOS: +# http://www.juniper.net/techpubs/software/junos/junos112/radius-dictionary/unisphereDictionary_for_JUNOS_v11-2.dct +# http://www.juniper.net/techpubs/en_US/junos10.3/topics/reference/general/aaa-subscriber-access-radius-vsa.html +# +# Juniper now publishes a single 'current' document for the latest OS with all supported VSAs here: +# https://www.juniper.net/documentation/en_US/junos/topics/reference/general/aaa-subscriber-access-radius-vsa.html +# +# In this file, we keep the ERX prefix and the JUNOSe attribute names +# for backwards compatibility +# +# Juniper ERX dictionaries are available at: +# http://www.juniper.net/techpubs/software/erx/junose71/unisphere7-1.dct +# http://www.juniper.net/techpubs/software/erx/junose700/unisphere7-0.dct +# http://www.juniper.net/techpubs/software/erx/junose700/swconfig-broadband/html/radius-attributes.html +# http://www.juniper.net/techpubs/software/erx/junose52/unisphere5-2.dct +# http://www.juniper.net/techpubs/software/erx/erx50x/swconfig-broadband/html/radius-attributes.html +# (The below are from when it was the Unisphere ERX) +# http://www.juniper.net/techpubs/software/erx/erx410/unisphere4-1.dct +# http://www.juniper.net/techpubs/software/erx/erx403/unisphere4-0.dct +# http://www.juniper.net/techpubs/software/erx/erx3xx/unisphere3-2.dct +# http://www.juniper.net/techpubs/software/erx/erx3xx/unisphere3-0.dct +# +# As a note on ERX broken-ness, If you don't send a Framed-IP-Address +# in the Access-Accept packet, the ERX disconnects the user, and +# sends an Accounting-Request packet with Acct-Status-Type = Stop +# +# It does NOT send a 'Start' packet, so this behaviour confuses the +# heck out of most admins, who do everything right, but have the ERX +# do stupid things. +# +# The ERX supports Ascend "abinary" format. See: +# +# http://www.juniper.net/techpubs/software/erx/junose71/swconfig-policy/html/policy-mgmt-apply5.html +# +# For this to work in FreeRADIUS, you will have to specify the attribute +# in hex, as in: +# +# Ascend-Data-Filter = 0x010203... +# + +VENDOR ERX 4874 + +BEGIN-VENDOR ERX + +ATTRIBUTE ERX-Virtual-Router-Name 1 string +ATTRIBUTE ERX-Address-Pool-Name 2 string +ATTRIBUTE ERX-Local-Loopback-Interface 3 string +ATTRIBUTE ERX-Primary-Dns 4 ipaddr +ATTRIBUTE ERX-Secondary-Dns 5 ipaddr +ATTRIBUTE ERX-Primary-Wins 6 ipaddr +ATTRIBUTE ERX-Secondary-Wins 7 ipaddr +ATTRIBUTE ERX-Tunnel-Virtual-Router 8 string has_tag +ATTRIBUTE ERX-Tunnel-Password 9 string has_tag # sent in cleartext! +ATTRIBUTE ERX-Ingress-Policy-Name 10 string +ATTRIBUTE ERX-Egress-Policy-Name 11 string +ATTRIBUTE ERX-Ingress-Statistics 12 integer +ATTRIBUTE ERX-Egress-Statistics 13 integer +ATTRIBUTE ERX-Atm-Service-Category 14 integer +ATTRIBUTE ERX-Atm-PCR 15 integer +ATTRIBUTE ERX-Atm-SCR 16 integer +ATTRIBUTE ERX-Atm-MBS 17 integer +ATTRIBUTE ERX-Cli-Initial-Access-Level 18 string +ATTRIBUTE ERX-Cli-Allow-All-VR-Access 19 integer +ATTRIBUTE ERX-Alternate-Cli-Access-Level 20 string +ATTRIBUTE ERX-Alternate-Cli-Vrouter-Name 21 string +ATTRIBUTE ERX-Sa-Validate 22 integer +ATTRIBUTE ERX-Igmp-Enable 23 integer +ATTRIBUTE ERX-Pppoe-Description 24 string +ATTRIBUTE ERX-Redirect-VR-Name 25 string +ATTRIBUTE ERX-Qos-Profile-Name 26 string +ATTRIBUTE ERX-Pppoe-Max-Sessions 27 integer +ATTRIBUTE ERX-Pppoe-Url 28 string +ATTRIBUTE ERX-Qos-Profile-Interface-Type 29 integer +ATTRIBUTE ERX-Tunnel-Nas-Port-Method 30 integer +ATTRIBUTE ERX-Service-Bundle 31 string +ATTRIBUTE ERX-Tunnel-Tos 32 integer +ATTRIBUTE ERX-Tunnel-Maximum-Sessions 33 integer +ATTRIBUTE ERX-Framed-Ip-Route-Tag 34 string +ATTRIBUTE ERX-Dial-Out-Number 35 string +ATTRIBUTE ERX-PPP-Username 36 string +ATTRIBUTE ERX-PPP-Password 37 string +ATTRIBUTE ERX-PPP-Auth-Protocol 38 integer +ATTRIBUTE ERX-Minimum-BPS 39 integer +ATTRIBUTE ERX-Maximum-BPS 40 integer +ATTRIBUTE ERX-Bearer-Type 41 integer +ATTRIBUTE ERX-Input-Gigapkts 42 integer +ATTRIBUTE ERX-Output-Gigapkts 43 integer +ATTRIBUTE ERX-Tunnel-Interface-Id 44 string +ATTRIBUTE ERX-IpV6-Virtual-Router 45 string +ATTRIBUTE ERX-IpV6-Local-Interface 46 string +ATTRIBUTE ERX-Ipv6-Primary-Dns 47 ipv6addr +ATTRIBUTE ERX-Ipv6-Secondary-Dns 48 ipv6addr +ATTRIBUTE Sdx-Service-Name 49 string +ATTRIBUTE Sdx-Session-Volume-Quota 50 string +ATTRIBUTE Sdx-Tunnel-Disconnect-Cause-Info 51 string +ATTRIBUTE ERX-Radius-Client-Address 52 ipaddr +ATTRIBUTE ERX-Service-Description 53 string +ATTRIBUTE ERX-L2tp-Recv-Window-Size 54 integer +ATTRIBUTE ERX-Dhcp-Options 55 octets +ATTRIBUTE ERX-Dhcp-Mac-Addr 56 string +ATTRIBUTE ERX-Dhcp-Gi-Address 57 ipaddr +ATTRIBUTE ERX-LI-Action 58 integer encrypt=2 +ATTRIBUTE ERX-Med-Dev-Handle 59 octets encrypt=2 +ATTRIBUTE ERX-Med-Ip-Address 60 ipaddr encrypt=2 +ATTRIBUTE ERX-Med-Port-Number 61 integer encrypt=2 +ATTRIBUTE ERX-MLPPP-Bundle-Name 62 string +ATTRIBUTE ERX-Interface-Desc 63 string +ATTRIBUTE ERX-Tunnel-Group 64 string +ATTRIBUTE ERX-Service-Activate 65 string has_tag +ATTRIBUTE ERX-Service-Deactivate 66 string +ATTRIBUTE ERX-Service-Volume 67 integer has_tag +ATTRIBUTE ERX-Service-Timeout 68 integer has_tag +ATTRIBUTE ERX-Service-Statistics 69 integer has_tag + +ATTRIBUTE ERX-DF-Bit 70 integer + +ATTRIBUTE ERX-IGMP-Access-Name 71 string +ATTRIBUTE ERX-IGMP-Access-Src-Name 72 string +ATTRIBUTE ERX-IGMP-OIF-Map-Name 73 string + +ATTRIBUTE ERX-MLD-Access-Name 74 string +ATTRIBUTE ERX-MLD-Access-Src-Name 75 string +ATTRIBUTE ERX-MLD-OIF-Map-Name 76 string +ATTRIBUTE ERX-MLD-Version 77 integer +ATTRIBUTE ERX-IGMP-Version 78 integer +ATTRIBUTE ERX-IP-Mcast-Adm-Bw-Limit 79 integer +ATTRIBUTE ERX-IPv6-Mcast-Adm-Bw-Limit 80 integer +ATTRIBUTE ERX-Qos-Parameters 82 string +ATTRIBUTE ERX-Service-Session 83 string + +ATTRIBUTE ERX-Mobile-IP-Algorithm 84 integer +ATTRIBUTE ERX-Mobile-IP-SPI 85 integer +ATTRIBUTE ERX-Mobile-IP-Key 86 string +ATTRIBUTE ERX-Mobile-IP-Replay 87 integer +ATTRIBUTE ERX-Mobile-IP-Access-Control 88 string +ATTRIBUTE ERX-Mobile-IP-Lifetime 89 integer + +ATTRIBUTE ERX-L2TP-Resynch-Method 90 integer + +ATTRIBUTE ERX-Tunnel-Switch-Profile 91 string + +ATTRIBUTE ERX-L2c-Up-Stream-Data 92 string +ATTRIBUTE ERX-L2c-Down-Stream-Data 93 string + +ATTRIBUTE ERX-Tunnel-Tx-Speed-Method 94 integer + +ATTRIBUTE ERX-IGMP-Query-Interval 95 integer +ATTRIBUTE ERX-IGMP-Max-Resp-Time 96 integer +ATTRIBUTE ERX-IGMP-Immediate-Leave 97 integer +ATTRIBUTE ERX-MLD-Query-Interval 98 integer +ATTRIBUTE ERX-MLD-Max-Resp-Time 99 integer +ATTRIBUTE ERX-MLD-Immediate-Leave 100 integer +ATTRIBUTE ERX-IP-Block-Multicast 101 integer + +ATTRIBUTE ERX-IGMP-Explicit-Tracking 102 integer +ATTRIBUTE ERX-IGMP-No-Tracking-V2-Grps 103 integer +ATTRIBUTE ERX-MLD-Explicit-Tracking 104 integer +ATTRIBUTE ERX-MLD-No-Tracking-V1-Grps 105 integer + +ATTRIBUTE ERX-IPv6-Ingress-Policy-Name 106 string +ATTRIBUTE ERX-IPv6-Egress-Policy-Name 107 string +ATTRIBUTE ERX-CoS-Shaping-Pmt-Type 108 string +ATTRIBUTE ERX-DHCP-Guided-Relay-Server 109 ipaddr + +ATTRIBUTE ERX-Acc-Loop-Cir-Id 110 string +ATTRIBUTE ERX-Acc-Aggr-Cir-Id-Bin 111 octets +ATTRIBUTE ERX-Acc-Aggr-Cir-Id-Asc 112 string +ATTRIBUTE ERX-Act-Data-Rate-Up 113 integer +ATTRIBUTE ERX-Act-Data-Rate-Dn 114 integer +ATTRIBUTE ERX-Min-Data-Rate-Up 115 integer +ATTRIBUTE ERX-Min-Data-Rate-Dn 116 integer +ATTRIBUTE ERX-Att-Data-Rate-Up 117 integer +ATTRIBUTE ERX-Att-Data-Rate-Dn 118 integer +ATTRIBUTE ERX-Max-Data-Rate-Up 119 integer +ATTRIBUTE ERX-Max-Data-Rate-Dn 120 integer +ATTRIBUTE ERX-Min-LP-Data-Rate-Up 121 integer +ATTRIBUTE ERX-Min-LP-Data-Rate-Dn 122 integer +ATTRIBUTE ERX-Max-Interlv-Delay-Up 123 integer +ATTRIBUTE ERX-Act-Interlv-Delay-Up 124 integer +ATTRIBUTE ERX-Max-Interlv-Delay-Dn 125 integer +ATTRIBUTE ERX-Act-Interlv-Delay-Dn 126 integer +ATTRIBUTE ERX-DSL-Line-State 127 integer +ATTRIBUTE ERX-DSL-Type 128 integer + +ATTRIBUTE ERX-IPv6-NdRa-Prefix 129 ipv6prefix +ATTRIBUTE ERX-Qos-Set-Name 130 string + +ATTRIBUTE ERX-Service-Acct-Interval 140 integer has_tag + +ATTRIBUTE ERX-DownStream-Calc-Rate 141 integer +ATTRIBUTE ERX-UpStream-Calc-Rate 142 integer +ATTRIBUTE ERX-Max-Clients-Per-Interface 143 integer + +ATTRIBUTE ERX-PPP-Monitor-Ingress-Only 144 integer + +ATTRIBUTE ERX-CoS-Scheduler-Pmt-Type 146 string +ATTRIBUTE ERX-Backup-Address-Pool 147 string + +ATTRIBUTE ERX-ICR-Partition-Id 150 string +ATTRIBUTE ERX-IPv6-Acct-Input-Octets 151 integer +ATTRIBUTE ERX-IPv6-Acct-Output-Octets 152 integer +ATTRIBUTE ERX-IPv6-Acct-Input-Packets 153 integer +ATTRIBUTE ERX-IPv6-Acct-Output-Packets 154 integer +ATTRIBUTE ERX-IPv6-Acct-Input-Gigawords 155 integer +ATTRIBUTE ERX-IPv6-Acct-Output-Gigawords 156 integer +ATTRIBUTE ERX-IPv6-NdRa-Pool-Name 157 string +ATTRIBUTE ERX-PppoE-Padn 158 string +ATTRIBUTE ERX-Dhcp-Option-82 159 octets +ATTRIBUTE ERX-Vlan-Map-Id 160 integer +ATTRIBUTE ERX-IPv6-Delegated-Pool-Name 161 string +ATTRIBUTE ERX-Tx-Connect-Speed 162 integer +ATTRIBUTE ERX-Rx-Connect-Speed 163 integer + +# ATTRIBUTE 164 - 173 RESERVED +ATTRIBUTE ERX-Service-Activate-Type 173 integer has_tag +ATTRIBUTE ERX-Client-Profile-Name 174 string +ATTRIBUTE ERX-Redirect-GW-Address 175 ipaddr +ATTRIBUTE ERX-APN-Name 176 string +ATTRIBUTE ERX-Cos-Shaping-Rate 177 string +ATTRIBUTE ERX-Action-Reason 178 string +ATTRIBUTE ERX-Service-Volume-Gigawords 179 integer has_tag +ATTRIBUTE ERX-Update-Service 180 string has_tag +ATTRIBUTE ERX-DHCPv6-Guided-Relay-Server 181 ipv6addr +ATTRIBUTE ERX-Acc-Loop-Remote-Id 182 string +ATTRIBUTE ERX-Acc-Loop-Encap 183 octets +ATTRIBUTE ERX-Inner-Vlan-Map-Id 184 integer +ATTRIBUTE ERX-Core-Facing-Interface 185 string +ATTRIBUTE ERX-DHCP-First-Relay-IPv4-Address 189 ipaddr +ATTRIBUTE ERX-DHCP-First-Relay-IPv6-Address 190 ipv6addr +ATTRIBUTE ERX-Input-Interface-Filter 191 string +ATTRIBUTE ERX-Output-Interface-Filter 192 string +ATTRIBUTE ERX-Pim-Enable 193 integer +ATTRIBUTE ERX-Bulk-CoA-Transaction-Id 194 integer +ATTRIBUTE ERX-Bulk-CoA-Identifier 195 integer +ATTRIBUTE ERX-IPv4-Input-Service-Set 196 string +ATTRIBUTE ERX-IPv4-Output-Service-Set 197 string +ATTRIBUTE ERX-IPv4-Input-Service-Filter 198 string +ATTRIBUTE ERX-IPv4-Output-Service-Filter 199 string +ATTRIBUTE ERX-IPv6-Input-Service-Set 200 string +ATTRIBUTE ERX-IPv6-Output-Service-Set 201 string +ATTRIBUTE ERX-IPv6-Input-Service-Filter 202 string +ATTRIBUTE ERX-IPv6-Output-Service-Filter 203 string +ATTRIBUTE ERX-Adv-Pcef-Profile-Name 204 string +ATTRIBUTE ERX-Adv-Pcef-Rule-Name 205 string +ATTRIBUTE ERX-Re-Authentication-Catalyst 206 integer +ATTRIBUTE ERX-DHCPv6-Options 207 octets +ATTRIBUTE ERX-DHCP-Header 208 octets +ATTRIBUTE ERX-DHCPv6-Header 209 octets +ATTRIBUTE ERX-Acct-Request-Reason 210 integer + +ATTRIBUTE ERX-Inner-Tag-Protocol-Id 211 string +ATTRIBUTE ERX-Routing-Services 212 integer +ATTRIBUTE ERX-Interface-Set-Targeting-Weight 213 integer +ATTRIBUTE ERX-Interface-Targeting-Weight 214 integer +ATTRIBUTE ERX-Hybrid-Access-DSL-Downstream-Speed 216 integer +ATTRIBUTE ERX-Hybrid-Access-LTE-Downstream-Speed 217 integer + +ATTRIBUTE ERX-PON-Access-Type 219 integer +ATTRIBUTE ERX-ONT-ONU-Average-Data-Rate-Downstream 220 integer +ATTRIBUTE ERX-ONT-ONU-Peak-Data-Rate-Downstream 221 integer +ATTRIBUTE ERX-ONT-ONU-Maximum-Data-Rate-Upstream 222 integer +ATTRIBUTE ERX-ONT-ONU-Assured-Data-Rate-Upstream 223 integer +ATTRIBUTE ERX-PON-Tree-Maximum-Data-Rate-Upstream 224 integer +ATTRIBUTE ERX-PON-Tree-Maximum-Data-Rate-Downstream 225 integer + +ATTRIBUTE ERX-Expected-Throughput-Upstream 226 integer +ATTRIBUTE ERX-Expected-Throughput-Downstream 227 integer +ATTRIBUTE ERX-Attainable-Expected-Throughput-Upstream 228 integer +ATTRIBUTE ERX-Attainable-Expected-Throughput-Downstream 229 integer +ATTRIBUTE ERX-Gamma-Data-Rate-Upstream 230 integer +ATTRIBUTE ERX-Gamma-Data-Rate-Downstream 231 integer +ATTRIBUTE ERX-Attainable-Gamma-Data-Rate-Upstream 232 integer +ATTRIBUTE ERX-Attainable-Gamma-Data-Rate-Downstream 233 integer + +# +# Values Attribute Name Number +# +VALUE ERX-Ingress-Statistics disable 0 +VALUE ERX-Ingress-Statistics enable 1 + +VALUE ERX-Egress-Statistics disable 0 +VALUE ERX-Egress-Statistics enable 1 + +VALUE ERX-Atm-Service-Category UBR 1 +VALUE ERX-Atm-Service-Category UBRPCR 2 +VALUE ERX-Atm-Service-Category nrtVBR 3 +VALUE ERX-Atm-Service-Category CBR 4 + +VALUE ERX-Cli-Allow-All-VR-Access disable 0 +VALUE ERX-Cli-Allow-All-VR-Access enable 1 + +VALUE ERX-Sa-Validate disable 0 +VALUE ERX-Sa-Validate enable 1 + +VALUE ERX-Igmp-Enable disable 0 +VALUE ERX-Igmp-Enable enable 1 + +VALUE ERX-Qos-Profile-Interface-Type IP 1 +VALUE ERX-Qos-Profile-Interface-Type ATM 2 +VALUE ERX-Qos-Profile-Interface-Type HDLC 3 +VALUE ERX-Qos-Profile-Interface-Type ETHERNET 4 +VALUE ERX-Qos-Profile-Interface-Type SERVER-PORT 5 +VALUE ERX-Qos-Profile-Interface-Type ATM-1483 6 +VALUE ERX-Qos-Profile-Interface-Type FRAME-RELAY 7 +VALUE ERX-Qos-Profile-Interface-Type MPLS-MINOR 8 +VALUE ERX-Qos-Profile-Interface-Type CBF 9 +VALUE ERX-Qos-Profile-Interface-Type IP-TUNNEL 10 +VALUE ERX-Qos-Profile-Interface-Type VLAN-SUB 11 +VALUE ERX-Qos-Profile-Interface-Type PPPOE-SUB 12 + +VALUE ERX-Tunnel-Nas-Port-Method None 0 +VALUE ERX-Tunnel-Nas-Port-Method CISCO-CLID 1 + +VALUE ERX-PPP-Auth-Protocol None 0 +VALUE ERX-PPP-Auth-Protocol PAP 1 +VALUE ERX-PPP-Auth-Protocol CHAP 2 +VALUE ERX-PPP-Auth-Protocol PAP-CHAP 3 +VALUE ERX-PPP-Auth-Protocol CHAP-PAP 4 + +VALUE ERX-Bearer-Type None 0 +VALUE ERX-Bearer-Type Analog 1 +VALUE ERX-Bearer-Type Digital 2 + +VALUE ERX-LI-Action off 0 +VALUE ERX-LI-Action on 1 +VALUE ERX-LI-Action noop 2 + +VALUE ERX-DF-Bit dont-ignore-df-bit 0 +VALUE ERX-DF-Bit ignore-df-bit 1 + +VALUE ERX-MLD-Version v1 1 +VALUE ERX-MLD-Version v2 2 + +VALUE ERX-IGMP-Version v1 1 +VALUE ERX-IGMP-Version v2 2 +VALUE ERX-IGMP-Version v3 3 + +VALUE ERX-Service-Statistics disabled 0 +VALUE ERX-Service-Statistics time 1 +VALUE ERX-Service-Statistics time-volume 2 + +VALUE ERX-L2TP-Resynch-Method disable 0 +VALUE ERX-L2TP-Resynch-Method failover 1 +VALUE ERX-L2TP-Resynch-Method silent-failover 2 +VALUE ERX-L2TP-Resynch-Method failover-with-silent-backup 3 + +VALUE ERX-Tunnel-Tx-Speed-Method static-layer2 1 +VALUE ERX-Tunnel-Tx-Speed-Method dynamic-layer2 2 +VALUE ERX-Tunnel-Tx-Speed-Method qos 3 +VALUE ERX-Tunnel-Tx-Speed-Method actual 4 + +VALUE ERX-IGMP-Immediate-Leave disabled 0 +VALUE ERX-IGMP-Immediate-Leave enabled 1 + +VALUE ERX-MLD-Immediate-Leave disabled 0 +VALUE ERX-MLD-Immediate-Leave enabled 1 + +VALUE ERX-IP-Block-Multicast disabled 0 +VALUE ERX-IP-Block-Multicast enabled 1 + +VALUE ERX-IGMP-Explicit-Tracking disabled 0 +VALUE ERX-IGMP-Explicit-Tracking enabled 1 + +VALUE ERX-IGMP-No-Tracking-V2-Grps disabled 0 +VALUE ERX-IGMP-No-Tracking-V2-Grps enabled 1 + +VALUE ERX-MLD-Explicit-Tracking disabled 0 +VALUE ERX-MLD-Explicit-Tracking enabled 1 + +VALUE ERX-MLD-No-Tracking-V1-Grps disabled 0 +VALUE ERX-MLD-No-Tracking-V1-Grps enabled 1 + +VALUE ERX-DSL-Line-State SHOWTIME 1 +VALUE ERX-DSL-Line-State IDLE 2 +VALUE ERX-DSL-Line-State SILENT 3 + +VALUE ERX-DSL-Type ADSL1 1 +VALUE ERX-DSL-Type ADSL2 2 +VALUE ERX-DSL-Type ADSL2PLUS 3 +VALUE ERX-DSL-Type VDSL1 4 +VALUE ERX-DSL-Type VDSL2 5 +VALUE ERX-DSL-Type SDSL 6 +VALUE ERX-DSL-Type UNKNOWN 7 + +VALUE ERX-PPP-Monitor-Ingress-Only disabled 0 +VALUE ERX-PPP-Monitor-Ingress-Only enabled 1 + +VALUE ERX-Service-Activate-Type dynamic 1 +VALUE ERX-Service-Activate-Type opscript 1 + +VALUE ERX-Pim-Enable disabled 0 +VALUE ERX-Pim-Enable enabled 1 + +VALUE ERX-Re-Authentication-Catalyst disabled 0 +VALUE ERX-Re-Authentication-Catalyst client-renew 1 + +VALUE ERX-Acct-Request-Reason Acct-Start-Ack 1 +VALUE ERX-Acct-Request-Reason Periodic 2 +VALUE ERX-Acct-Request-Reason IP-Active 4 +VALUE ERX-Acct-Request-Reason IP-Inactive 8 +VALUE ERX-Acct-Request-Reason IPv6-Active 16 +VALUE ERX-Acct-Request-Reason IPv6-Inactive 32 +VALUE ERX-Acct-Request-Reason Session-Active 64 +VALUE ERX-Acct-Request-Reason Session-Inactive 128 +VALUE ERX-Acct-Request-Reason Line-Speed-Change 256 +VALUE ERX-Acct-Request-Reason Address-Assignment-Change 512 +VALUE ERX-Acct-Request-Reason CoA-Complete 1024 + +VALUE ERX-Routing-Services disabled 0 +VALUE ERX-Routing-Services enabled 1 + +VALUE ERX-PON-Access-Type Other 0 +VALUE ERX-PON-Access-Type GPON 1 +VALUE ERX-PON-Access-Type XG-PON1 2 +VALUE ERX-PON-Access-Type TWDM-PON 3 +VALUE ERX-PON-Access-Type XGS-PON 4 +VALUE ERX-PON-Access-Type WDM-PON 5 +VALUE ERX-PON-Access-Type UNKNOWN 7 + +END-VENDOR ERX diff --git a/resources/protocols/radius/dictionary.extreme b/resources/protocols/radius/dictionary.extreme index b027d47b..dbcf614a 100644 --- a/resources/protocols/radius/dictionary.extreme +++ b/resources/protocols/radius/dictionary.extreme @@ -1,74 +1,75 @@ # -*- text -*- -# Copyright (C) 2017 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # -# Dictionary for Extreme Networks VSA's. -# http://www.extremenetworks.com/ +# Dictionary for Extreme Networks VSA's. +# http://www.extremenetworks.com/ # -# $Id$ +# $Id: d180bb93a248c0686a70438caa749a790f74124b $ # -VENDOR Extreme 1916 +VENDOR Extreme 1916 BEGIN-VENDOR Extreme # Legacy Altitude/Summit Wireless -ATTRIBUTE Extreme-Service-Type 1 integer -ATTRIBUTE Extreme-Current-SSID 2 string -ATTRIBUTE Extr_Wlan_Allowed_SSID 3 string -ATTRIBUTE Extreme-Wlan-Index 4 integer -ATTRIBUTE Extr_Wlan_QoS_Profile 5 integer -ATTRIBUTE Extr_Wlan_Allowed_Radio 6 string -ATTRIBUTE Guest-User-Expiry-Date-Time 7 string -ATTRIBUTE Guest-User-Start-Date-Time 8 string -ATTRIBUTE Extr_MU_Posture_Status 9 string -ATTRIBUTE Extreme-Downlink-Limit-Kbps 10 integer -ATTRIBUTE Extreme-Uplink-Limit-Kbps 11 integer -ATTRIBUTE Extreme-User-Group 12 string -ATTRIBUTE Extreme-Login-Service 100 integer +ATTRIBUTE Extreme-Service-Type 1 integer +ATTRIBUTE Extreme-Current-SSID 2 string +ATTRIBUTE Extr_Wlan_Allowed_SSID 3 string +ATTRIBUTE Extreme-Wlan-Index 4 integer +ATTRIBUTE Extr_Wlan_QoS_Profile 5 integer +ATTRIBUTE Extr_Wlan_Allowed_Radio 6 string +ATTRIBUTE Guest-User-Expiry-Date-Time 7 string +ATTRIBUTE Guest-User-Start-Date-Time 8 string +ATTRIBUTE Extr_MU_Posture_Status 9 string +ATTRIBUTE Extreme-Downlink-Limit-Kbps 10 integer +ATTRIBUTE Extreme-Uplink-Limit-Kbps 11 integer +ATTRIBUTE Extreme-User-Group 12 string +ATTRIBUTE Extreme-Login-Service 100 integer # -ATTRIBUTE Extreme-NAS-IP-Address 101 ipaddr +ATTRIBUTE Extreme-NAS-IP-Address 101 ipaddr # XOS Attributes -ATTRIBUTE Extreme-CLI-Authorization 201 integer -ATTRIBUTE Extreme-Shell-Command 202 string -ATTRIBUTE Extreme-Netlogin-Vlan 203 string -ATTRIBUTE Extreme-Netlogin-Url 204 string -ATTRIBUTE Extreme-Netlogin-Url-Desc 205 string -ATTRIBUTE Extreme-Netlogin-Only 206 integer -ATTRIBUTE Extreme-User-Location 208 string -ATTRIBUTE Extreme-Netlogin-Vlan-Tag 209 integer -ATTRIBUTE Extreme-Netlogin-Extended-Vlan 211 string -ATTRIBUTE Extreme-Security-Profile 212 string -ATTRIBUTE Extreme-VM-Name 213 string -ATTRIBUTE Extreme-VM-VPP-Name 214 string -ATTRIBUTE Extreme-VM-IP-Addr 215 ipaddr -ATTRIBUTE Extreme-VM-VLAN-ID 216 integer -ATTRIBUTE Extreme-VM-VR-Name 217 string -ATTRIBUTE Extreme-Netlogin-VR-Name 218 string -ATTRIBUTE Extreme-NSI-Type 230 integer has_tag -ATTRIBUTE Extreme-NSI-ID 231 string has_tag -ATTRIBUTE Extreme-Email-Address 233 string +ATTRIBUTE Extreme-CLI-Authorization 201 integer +ATTRIBUTE Extreme-Shell-Command 202 string +ATTRIBUTE Extreme-Netlogin-Vlan 203 string +ATTRIBUTE Extreme-Netlogin-Url 204 string +ATTRIBUTE Extreme-Netlogin-Url-Desc 205 string +ATTRIBUTE Extreme-Netlogin-Only 206 integer +ATTRIBUTE Extreme-User-Location 208 string +ATTRIBUTE Extreme-Netlogin-Vlan-Tag 209 integer +ATTRIBUTE Extreme-Netlogin-Extended-Vlan 211 string +ATTRIBUTE Extreme-Security-Profile 212 string +ATTRIBUTE Extreme-VM-Name 213 string +ATTRIBUTE Extreme-VM-VPP-Name 214 string +ATTRIBUTE Extreme-VM-IP-Addr 215 ipaddr +ATTRIBUTE Extreme-VM-VLAN-ID 216 integer +ATTRIBUTE Extreme-VM-VR-Name 217 string +ATTRIBUTE Extreme-Netlogin-VR-Name 218 string +ATTRIBUTE Extreme-NSI-Type 230 integer has_tag +ATTRIBUTE Extreme-NSI-ID 231 string has_tag +ATTRIBUTE Extreme-Email-Address 233 string -VALUE Extreme-Service-Type Monitor 1 -VALUE Extreme-Service-Type Help-Desk-Manager 2 -VALUE Extreme-Service-Type Network-Administrator 4 -VALUE Extreme-Service-Type System-Administrator 8 -VALUE Extreme-Service-Type Web-User-Administrator 16 -VALUE Extreme-Service-Type Super-User 32768 +VALUE Extreme-Service-Type Monitor 1 +VALUE Extreme-Service-Type Help-Desk-Manager 2 +VALUE Extreme-Service-Type Network-Administrator 4 +VALUE Extreme-Service-Type System-Administrator 8 +VALUE Extreme-Service-Type Web-User-Administrator 16 +VALUE Extreme-Service-Type Super-User 32768 -VALUE Extreme-Login-Service HTTP 16 -VALUE Extreme-Login-Service SSH 32 -VALUE Extreme-Login-Service Telnet 64 -VALUE Extreme-Login-Service Console 128 -VALUE Extreme-Login-Service All 240 +VALUE Extreme-Login-Service HTTP 16 +VALUE Extreme-Login-Service SSH 32 +VALUE Extreme-Login-Service Telnet 64 +VALUE Extreme-Login-Service Console 128 +VALUE Extreme-Login-Service All 240 -VALUE Extreme-CLI-Authorization Disabled 0 -VALUE Extreme-CLI-Authorization Enabled 1 +VALUE Extreme-CLI-Authorization Disabled 0 +VALUE Extreme-CLI-Authorization Enabled 1 -VALUE Extreme-Netlogin-Only Disabled 0 -VALUE Extreme-Netlogin-Only Enabled 1 +VALUE Extreme-Netlogin-Only Disabled 0 +VALUE Extreme-Netlogin-Only Enabled 1 -VALUE Extreme-NSI-Type VNI-OR-ISID 1 +VALUE Extreme-NSI-Type VNI-OR-ISID 1 -END-VENDOR Extreme +END-VENDOR Extreme diff --git a/resources/protocols/radius/dictionary.f5 b/resources/protocols/radius/dictionary.f5 index ce97f9c4..76a8604a 100644 --- a/resources/protocols/radius/dictionary.f5 +++ b/resources/protocols/radius/dictionary.f5 @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # F5 VSAs # -# $Id: 2425a40216fda54fdeb57dfa5037ff63569a229f $ +# $Id: abcbfeebeb3789046dbd8b1e1ff24004e1c7bb07 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.fdxtended b/resources/protocols/radius/dictionary.fdxtended index 55d9d977..22c5c18c 100644 --- a/resources/protocols/radius/dictionary.fdxtended +++ b/resources/protocols/radius/dictionary.fdxtended @@ -1,3 +1,7 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# VENDOR fdXtended 34536 BEGIN-VENDOR fdXtended diff --git a/resources/protocols/radius/dictionary.force10 b/resources/protocols/radius/dictionary.force10 new file mode 100644 index 00000000..f8e77740 --- /dev/null +++ b/resources/protocols/radius/dictionary.force10 @@ -0,0 +1,10 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +# Version $Id: 367a6c5b61999b099516288fdc70275c6879209e $ + +VENDOR Force10 6027 +BEGIN-VENDOR Force10 +ATTRIBUTE Force10-AVPair 1 string +END-VENDOR Force10 diff --git a/resources/protocols/radius/dictionary.fortinet b/resources/protocols/radius/dictionary.fortinet index 38a9bf7c..8f091e55 100644 --- a/resources/protocols/radius/dictionary.fortinet +++ b/resources/protocols/radius/dictionary.fortinet @@ -1,11 +1,14 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Fortinet's VSA's -# As posted to the list by Richie Lee. # -# $Id: 5011d0df266b0e645de11b7ac781c888161f99e3 $ +# 2019-0502 +# +# $Id: d730a1db4fd398d3ba864a608a2c752df5db928f $ # ############################################################################## @@ -22,9 +25,31 @@ ATTRIBUTE Fortinet-Vdom-Name 3 string ATTRIBUTE Fortinet-Client-IPv6-Address 4 octets ATTRIBUTE Fortinet-Interface-Name 5 string ATTRIBUTE Fortinet-Access-Profile 6 string - -# -# Integer Translations -# +ATTRIBUTE Fortinet-SSID 7 string +ATTRIBUTE Fortinet-AP-Name 8 string +ATTRIBUTE Fortinet-FAC-Auth-Status 11 string +ATTRIBUTE Fortinet-FAC-Token-ID 12 string +ATTRIBUTE Fortinet-FAC-Challenge-Code 15 string +ATTRIBUTE Fortinet-Webfilter-Category-Allow 16 octets +ATTRIBUTE Fortinet-Webfilter-Category-Block 17 octets +ATTRIBUTE Fortinet-Webfilter-Category-Monitor 18 octets +ATTRIBUTE Fortinet-AppCtrl-Category-Allow 19 octets +ATTRIBUTE Fortinet-AppCtrl-Category-Block 20 octets +ATTRIBUTE Fortinet-AppCtrl-Risk-Allow 21 octets +ATTRIBUTE Fortinet-AppCtrl-Risk-Block 22 octets +ATTRIBUTE Fortinet-WirelessController-Device-MAC 23 ether +ATTRIBUTE Fortinet-WirelessController-WTP-ID 24 string +ATTRIBUTE Fortinet-WirelessController-Assoc-Time 25 date +ATTRIBUTE Fortinet-FortiWAN-AVPair 26 string +ATTRIBUTE Fortinet-FDD-Access-Profile 30 string +ATTRIBUTE Fortinet-FDD-Trusted-Hosts 31 string +ATTRIBUTE Fortinet-FDD-SPP-Name 32 string +ATTRIBUTE Fortinet-FDD-Is-System-Admin 33 string +ATTRIBUTE Fortinet-FDD-Is-SPP-Admin 34 string +ATTRIBUTE Fortinet-FDD-SPP-Policy-Group 35 string +ATTRIBUTE Fortinet-FDD-Allow-API-Access 36 string +ATTRIBUTE Fortinet-Fpc-User-Role 40 string +ATTRIBUTE Fortinet-Tenant-Identification 41 string +ATTRIBUTE Fortinet-Host-Port-AVPair 42 string END-VENDOR Fortinet diff --git a/resources/protocols/radius/dictionary.foundry b/resources/protocols/radius/dictionary.foundry index 134b206b..bc1055f0 100644 --- a/resources/protocols/radius/dictionary.foundry +++ b/resources/protocols/radius/dictionary.foundry @@ -1,11 +1,10 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -# -# dictionary.foundry +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # As posted to the list by Thomas Keitel <tkeitel@arc.nasa.gov> # -# Version: $Id: 341ae94a3fa1af08d995bcbaa9f883c09429ffe3 $ +# Version: $Id: 4b3487008e14b61a1d6790c7a57f7396ca441b66 $ # VENDOR Foundry 1991 @@ -22,7 +21,13 @@ ATTRIBUTE Foundry-802.1x-Valid-Lookup 7 integer ATTRIBUTE Foundry-MAC-Based-Vlan-QoS 8 integer ATTRIBUTE Foundry-INM-Role-Aor-List 9 string ATTRIBUTE Foundry-SI-Context-Role 10 string +# Foundry-COA-Command appears to stomp on Foundry-SI-Context-Role (different departments) +# https://www.brocade.com/content/html/en/fastiron-os/08-0-60/fastiron-08060-securityguide/GUID-A3193D90-3FF4-4B04-8C6D-084743FDE91C.html +ATTRIBUTE Foundry-COA-Command 10 string ATTRIBUTE Foundry-SI-Role-Template 11 string +# Foundry-Voice-Phone-Config appears to stomp on Foundry-SI-Role-Template (different departments) +# http://docs.ruckuswireless.com/fastiron/08.0.60/fastiron-08060-securityguide/GUID-7E649B6D-A80B-40FD-A19A-478ED22C3E2A.html +ATTRIBUTE Foundry-Voice-Phone-Config 11 string VALUE Foundry-INM-Privilege AAA_pri_0 0 VALUE Foundry-INM-Privilege AAA_pri_1 1 diff --git a/resources/protocols/radius/dictionary.freedhcp b/resources/protocols/radius/dictionary.freedhcp index 1af27224..d9cbb036 100644 --- a/resources/protocols/radius/dictionary.freedhcp +++ b/resources/protocols/radius/dictionary.freedhcp @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # DHCP options carried inside of RADIUS VSAs. @@ -10,7 +12,7 @@ # # Despite those issues, this dictionary is still useful. # -# $Id: 3ae9968cb721da0197ed1745fcfe88314efec894 $ +# $Id: fe2836d173571160f72bf2fc2ac7eb5595662af1 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.freeradius b/resources/protocols/radius/dictionary.freeradius index 43f1f138..f2149195 100644 --- a/resources/protocols/radius/dictionary.freeradius +++ b/resources/protocols/radius/dictionary.freeradius @@ -1,13 +1,10 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # The FreeRADIUS Vendor-Specific dictionary. # -# Version: $Id: 5de613e4ef863872ea86de2d31b2afabef485756 $ -# -# For a complete list of Private Enterprise Codes, see: -# -# http://www.isi.edu/in-notes/iana/assignments/enterprise-numbers +# Version: $Id: 2d7bd9c213b96ffe81febad1d6efd1e9468ae91e $ # VENDOR FreeRADIUS 11344 @@ -110,6 +107,8 @@ VALUE FreeRADIUS-Stats-Server-State Alive 0 VALUE FreeRADIUS-Stats-Server-State Zombie 1 VALUE FreeRADIUS-Stats-Server-State Dead 2 VALUE FreeRADIUS-Stats-Server-State Idle 3 +VALUE FreeRADIUS-Stats-Server-State Admin-Down 4 +VALUE FreeRADIUS-Stats-Server-State Connection-Fail 5 # # When a home server is marked "dead" or "alive" @@ -143,4 +142,176 @@ ATTRIBUTE FreeRADIUS-Queue-Use-Percentage 183 integer ATTRIBUTE FreeRADIUS-Stats-Last-Packet-Recv 184 date ATTRIBUTE FreeRADIUS-Stats-Last-Packet-Sent 185 date +# +# EAP-FAST TLVs +# +ATTRIBUTE FreeRADIUS-EAP-FAST-TLV 186 tlv +BEGIN-TLV FreeRADIUS-EAP-FAST-TLV +ATTRIBUTE FreeRADIUS-EAP-FAST-Result 3 short +ATTRIBUTE FreeRADIUS-EAP-FAST-NAK 4 octets +ATTRIBUTE FreeRADIUS-EAP-FAST-Error 5 integer +ATTRIBUTE FreeRADIUS-EAP-FAST-Vendor-Specific 7 octets +ATTRIBUTE FreeRADIUS-EAP-FAST-EAP-Payload 9 octets +ATTRIBUTE FreeRADIUS-EAP-FAST-Intermediate-Result 10 octets + +ATTRIBUTE FreeRADIUS-EAP-FAST-PAC 11 tlv +BEGIN-TLV FreeRADIUS-EAP-FAST-PAC + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-Key 1 octets + + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-Opaque-TLV 2 tlv + BEGIN-TLV FreeRADIUS-EAP-FAST-PAC-Opaque-TLV + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-Opaque-PAC-Key 1 octets + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-Opaque-PAC-Lifetime 3 integer + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-Opaque-I-ID 5 octets + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-Opaque-PAC-Type 10 short + END-TLV FreeRADIUS-EAP-FAST-PAC-Opaque-TLV + + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-Lifetime 3 integer + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-A-ID 4 octets + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-I-ID 5 octets + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-A-ID-Info 7 octets + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-Acknowledge 8 short + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-Info-TLV 9 tlv + BEGIN-TLV FreeRADIUS-EAP-FAST-PAC-Info-TLV + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-Info-PAC-Lifetime 3 integer + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-Info-A-ID 4 octets + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-Info-I-ID 5 octets + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-Info-A-ID-Info 7 octets + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-Info-PAC-Type 10 short + END-TLV FreeRADIUS-EAP-FAST-PAC-Info-TLV + + ATTRIBUTE FreeRADIUS-EAP-FAST-PAC-Type 10 short +END-TLV FreeRADIUS-EAP-FAST-PAC + +ATTRIBUTE FreeRADIUS-EAP-FAST-Crypto-Binding 12 octets + +ATTRIBUTE FreeRADIUS-EAP-FAST-Trusted-Root 18 octets +ATTRIBUTE FreeRADIUS-EAP-FAST-Request-Action 19 short +ATTRIBUTE FreeRADIUS-EAP-FAST-PKCS 20 octets +END-TLV FreeRADIUS-EAP-FAST-TLV + +ATTRIBUTE FreeRADIUS-Stats-Error 187 string + +ATTRIBUTE FreeRADIUS-Stats-Client-IPv6-Address 188 ipv6addr +ATTRIBUTE FreeRADIUS-Stats-Server-IPv6-Address 189 ipv6addr + +###################################################################### +# +# EAP-TEAP TLVs. Some are the same as EAP-FAST. some are unnecessarily different. +# +ATTRIBUTE FreeRADIUS-EAP-TEAP-TLV 190 tlv +BEGIN-TLV FreeRADIUS-EAP-TEAP-TLV +ATTRIBUTE FreeRADIUS-EAP-TEAP-Authority-ID 1 octets +ATTRIBUTE FreeRADIUS-EAP-TEAP-Identity-Type 2 uint16 +VALUE FreeRADIUS-EAP-TEAP-Identity-Type User 1 +VALUE FreeRADIUS-EAP-TEAP-Identity-Type Machine 2 + +ATTRIBUTE FreeRADIUS-EAP-TEAP-Result 3 short +VALUE FreeRADIUS-EAP-TEAP-Result Success 1 +VALUE FreeRADIUS-EAP-TEAP-Result Failure 2 + +ATTRIBUTE FreeRADIUS-EAP-TEAP-NAK 4 octets # 4 octet Vendor-Id + 1 octet NAK type + TLVs +ATTRIBUTE FreeRADIUS-EAP-TEAP-Error 5 integer +VALUE FreeRADIUS-EAP-TEAP-Error User-Account-Expires-Soon 1 +VALUE FreeRADIUS-EAP-TEAP-Error User-Account-Credential-Expires-Soon 2 +VALUE FreeRADIUS-EAP-TEAP-Error User-Account-Authorizations-Change-Soon 3 +VALUE FreeRADIUS-EAP-TEAP-Error Clock-Skew-Detected 4 +VALUE FreeRADIUS-EAP-TEAP-Error Contact-Administrator 5 +VALUE FreeRADIUS-EAP-TEAP-Error User-Account-Credentials-Change-Requires 6 +VALUE FreeRADIUS-EAP-TEAP-Error Inner-Method-Error 1001 +VALUE FreeRADIUS-EAP-TEAP-Error Unspecified-Authentication-Infrastructure-Problem 1002 +VALUE FreeRADIUS-EAP-TEAP-Error Unspecified-Authentication-Failure 1003 +VALUE FreeRADIUS-EAP-TEAP-Error Unspecified-Authorization-Failure 1004 +VALUE FreeRADIUS-EAP-TEAP-Error User-Account-Credentials-Unavailable 1005 +VALUE FreeRADIUS-EAP-TEAP-Error User-Account-Expired 1006 +VALUE FreeRADIUS-EAP-TEAP-Error User-Account-Locked-Try-Again-Later 1007 +VALUE FreeRADIUS-EAP-TEAP-Error User-Account-Locked-Admin-Intervention-Required 1008 +VALUE FreeRADIUS-EAP-TEAP-Error Authentication-Infrastructure-Unavailable 1009 +VALUE FreeRADIUS-EAP-TEAP-Error Authentication-Infrastructure-Not-Trusted 1010 +VALUE FreeRADIUS-EAP-TEAP-Error Clock-Skew-Too-Great 1011 +VALUE FreeRADIUS-EAP-TEAP-Error Invalid-Inner-Realm 1012 +VALUE FreeRADIUS-EAP-TEAP-Error Token-Out-of-Sync-Admin-Intervention-Required 1013 +VALUE FreeRADIUS-EAP-TEAP-Error Token-Out-of-Sync-PIN-Change-Required 1014 +VALUE FreeRADIUS-EAP-TEAP-Error Token-Revoked 1015 +VALUE FreeRADIUS-EAP-TEAP-Error Tokens-Exhausted 1016 +VALUE FreeRADIUS-EAP-TEAP-Error Challenge-Expired 1017 +VALUE FreeRADIUS-EAP-TEAP-Error Challenge-Algorithm-Mismatch 1018 +VALUE FreeRADIUS-EAP-TEAP-Error Client-Certificate-Not-Supplied 1019 +VALUE FreeRADIUS-EAP-TEAP-Error Client-Certificate-Rejected 1020 +VALUE FreeRADIUS-EAP-TEAP-Error Realm-Mismatch-Inner-Outer-Identity 1021 +VALUE FreeRADIUS-EAP-TEAP-Error Unsupported-Algorithm-in-CSR 1022 +VALUE FreeRADIUS-EAP-TEAP-Error Unsupported-Extension-in-CSR 1023 +VALUE FreeRADIUS-EAP-TEAP-Error Bad-Identity-in-CSR 1024 +VALUE FreeRADIUS-EAP-TEAP-Error Bad-CSR 1025 +VALUE FreeRADIUS-EAP-TEAP-Error Internal-CA-Error 1026 +VALUE FreeRADIUS-EAP-TEAP-Error General-PKI-Error 1027 +VALUE FreeRADIUS-EAP-TEAP-Error Inner-Method-Channel-Binding-Not-Supplied 1028 +VALUE FreeRADIUS-EAP-TEAP-Error Inner-Method-Channel-Binding-Missing-Info 1029 +VALUE FreeRADIUS-EAP-TEAP-Error Inner-Method-Channel-Binding-Data-Failed 1030 +VALUE FreeRADIUS-EAP-TEAP-Error User-Account-Credentials-Incorrect 1031 +VALUE FreeRADIUS-EAP-TEAP-Error Tunnel-Compromise-Error 2001 +VALUE FreeRADIUS-EAP-TEAP-Error Unexpected-TLVs 2002 + +ATTRIBUTE FreeRADIUS-EAP-TEAP-Channel-Binding 6 octets # complex format +ATTRIBUTE FreeRADIUS-EAP-TEAP-Vendor-Specific 7 octets # 4-octet vendor ID + TLVs +ATTRIBUTE FreeRADIUS-EAP-TEAP-Request-Action 8 octets # 1 octet + sub TLVs +ATTRIBUTE FreeRADIUS-EAP-TEAP-EAP-Payload 9 octets # EAP packet + TLVs + +ATTRIBUTE FreeRADIUS-EAP-TEAP-Intermediate-Result 10 short +VALUE FreeRADIUS-EAP-TEAP-Intermediate-Result Success 1 +VALUE FreeRADIUS-EAP-TEAP-Intermediate-Result Failure 2 + +ATTRIBUTE FreeRADIUS-EAP-TEAP-PAC 11 tlv +BEGIN-TLV FreeRADIUS-EAP-TEAP-PAC + ATTRIBUTE FreeRADIUS-EAP-TEAP-PAC-Key 1 octets + + ATTRIBUTE FreeRADIUS-EAP-TEAP-PAC-Opaque 2 octets + ATTRIBUTE FreeRADIUS-EAP-TEAP-PAC-Lifetime 3 integer + ATTRIBUTE FreeRADIUS-EAP-TEAP-PAC-A-ID 4 octets + ATTRIBUTE FreeRADIUS-EAP-TEAP-PAC-I-ID 5 octets + ATTRIBUTE FreeRADIUS-EAP-TEAP-PAC-A-ID-Info 7 octets + ATTRIBUTE FreeRADIUS-EAP-TEAP-PAC-Acknowledgement 8 short + ATTRIBUTE FreeRADIUS-EAP-TEAP-PAC-Info-TLV 9 tlv + # + # Sub-TLVs with the same numbers as the similar ones above. + # + BEGIN-TLV FreeRADIUS-EAP-TEAP-PAC-Info-TLV + ATTRIBUTE FreeRADIUS-EAP-TEAP-PAC-Info-PAC-Lifetime 3 integer + ATTRIBUTE FreeRADIUS-EAP-TEAP-PAC-Info-A-ID 4 octets + ATTRIBUTE FreeRADIUS-EAP-TEAP-PAC-Info-I-ID 5 octets + ATTRIBUTE FreeRADIUS-EAP-TEAP-PAC-Info-A-ID-Info 7 octets + ATTRIBUTE FreeRADIUS-EAP-TEAP-PAC-Info-PAC-Type 10 short + END-TLV FreeRADIUS-EAP-TEAP-PAC-Info-TLV + + ATTRIBUTE FreeRADIUS-EAP-TEAP-PAC-Type 10 short +END-TLV FreeRADIUS-EAP-TEAP-PAC + +ATTRIBUTE FreeRADIUS-EAP-TEAP-Crypto-Binding 12 octets # complex struct + +ATTRIBUTE FreeRADIUS-EAP-TEAP-Basic-Password-Auth-Req 13 string +ATTRIBUTE FreeRADIUS-EAP-TEAP-Basic-Password-Auth-Resp 14 octets # complex struct + +ATTRIBUTE FreeRADIUS-EAP-TEAP-PKCS7 15 octets +ATTRIBUTE FreeRADIUS-EAP-TEAP-PKCS10 16 octets + +ATTRIBUTE FreeRADIUS-EAP-TEAP-Trusted-Server-Root 17 octets # 1 octet + sub TLVs +END-TLV FreeRADIUS-EAP-TEAP-TLV + +# +# End of EAP-TEAP +# +###################################################################### + +# 190 is reserved + +ATTRIBUTE FreeRADIUS-Total-Auth-Conflicts 191 integer +ATTRIBUTE FreeRADIUS-Total-Acct-Conflicts 192 integer + +# +# Worker thread activity +# +ATTRIBUTE FreeRADIUS-Stats-Threads-Active 193 integer +ATTRIBUTE FreeRADIUS-Stats-Threads-Total 194 integer +ATTRIBUTE FreeRADIUS-Stats-Threads-Max 195 integer + END-VENDOR FreeRADIUS diff --git a/resources/protocols/radius/dictionary.freeradius.evs5 b/resources/protocols/radius/dictionary.freeradius.evs5 new file mode 100644 index 00000000..668afb04 --- /dev/null +++ b/resources/protocols/radius/dictionary.freeradius.evs5 @@ -0,0 +1,22 @@ +# -*- text -*- +# Copyright (C) 2022 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +# The FreeRADIUS Extended-Vendor-Specific-5 dictionary. +# +# Version: $Id: 0f961580a2e2f413cb93aee2fa87dd73cc16fdc7 $ +# + +BEGIN-VENDOR FreeRADIUS format=Extended-Vendor-Specific-5 + +# +# The next two attributes are for sending EAPoL keys to a RADIUS server. +# +# See: +# +# https://w1.fi/cgit/hostap/commit/?id=b94371af8402f60218716552e571ca72cff4e3c0 +# +ATTRIBUTE FreeRADIUS-802.1X-Anonce 1 octets # really 32 octets +ATTRIBUTE FreeRADIUS-802.1X-EAPoL-Key-Msg 2 octets + +END-VENDOR FreeRADIUS diff --git a/resources/protocols/radius/dictionary.freeradius.internal b/resources/protocols/radius/dictionary.freeradius.internal index d75e9d69..b1eea2cd 100644 --- a/resources/protocols/radius/dictionary.freeradius.internal +++ b/resources/protocols/radius/dictionary.freeradius.internal @@ -1,9 +1,10 @@ # -*- text -*- -# Copyright (C) 2011 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Non Protocol Attributes used by FreeRADIUS # -# $Id: b830d56623fc3aad78122fa6af04ce66416123b6 $ +# $Id: 52b9bb8750aa04ef30c32ef335a5d7c9c6d0d92f $ # # The attributes number ranges are allocates as follows: @@ -38,7 +39,7 @@ ATTRIBUTE Prefix 1003 string ATTRIBUTE Suffix 1004 string ATTRIBUTE Group 1005 string ATTRIBUTE Crypt-Password 1006 string -ATTRIBUTE Connect-Rate 1007 integer +#ATTRIBUTE Connect-Rate 1007 integer ATTRIBUTE Add-Prefix 1008 string ATTRIBUTE Add-Suffix 1009 string ATTRIBUTE Expiration 1010 date @@ -83,7 +84,7 @@ ATTRIBUTE Replicate-To-Realm 1049 string ATTRIBUTE Acct-Session-Start-Time 1050 date ATTRIBUTE Acct-Unique-Session-Id 1051 string ATTRIBUTE Client-IP-Address 1052 ipaddr virtual -ATTRIBUTE Ldap-UserDn 1053 string +ATTRIBUTE LDAP-UserDN 1053 string ATTRIBUTE NS-MTA-MD5-Password 1054 string ATTRIBUTE SQL-User-Name 1055 string ATTRIBUTE LM-Password 1057 octets @@ -102,12 +103,12 @@ ATTRIBUTE Digest-CNonce 1070 string ATTRIBUTE Digest-Nonce-Count 1071 string ATTRIBUTE Digest-User-Name 1072 string ATTRIBUTE Pool-Name 1073 string -ATTRIBUTE Ldap-Group 1074 string +# LDAP-Group is now dynamically created ATTRIBUTE Module-Success-Message 1075 string ATTRIBUTE Module-Failure-Message 1076 string # X99-Fast 1077 integer ATTRIBUTE Rewrite-Rule 1078 string -ATTRIBUTE Sql-Group 1079 string +# SQL-Group is now dynamically created ATTRIBUTE Response-Packet-Type 1080 integer virtual ATTRIBUTE Digest-HA1 1081 string ATTRIBUTE MS-CHAP-Use-NTLM-Auth 1082 integer @@ -147,7 +148,7 @@ VALUE EAP-IKEv2-IDType DER_ASN1_GN 10 VALUE EAP-IKEv2-IDType KEY_ID 11 ATTRIBUTE EAP-IKEv2-ID 1104 string -ATTRIBUTE EAP-IKEv2-Secret 1105 string +ATTRIBUTE EAP-IKEv2-Secret 1105 string secret ATTRIBUTE EAP-IKEv2-AuthType 1106 integer VALUE EAP-IKEv2-AuthType none 0 @@ -177,6 +178,16 @@ ATTRIBUTE Packet-Original-Timestamp 1109 date ATTRIBUTE SQL-Table-Name 1110 string ATTRIBUTE Home-Server-Pool 1111 string +# For delayed evaluation of maps +ATTRIBUTE Attribute-Map 1112 string + +# See sites-available/coa-relay +ATTRIBUTE CoA-Packet-Type 1113 string +ATTRIBUTE CoA-Packet-DST-IP-Address 1114 ipaddr +ATTRIBUTE CoA-Packet-DST-Port 1115 integer +ATTRIBUTE CoA-Acct-Session-Id 1116 string +ATTRIBUTE CoA-Packet-DST-IPv6-Address 1117 ipv6addr + ATTRIBUTE FreeRADIUS-Client-IP-Address 1120 ipaddr ATTRIBUTE FreeRADIUS-Client-IPv6-Address 1121 ipv6addr # The rest of the FreeRADIUS-Client-* attributes are at 1150... @@ -186,7 +197,7 @@ ATTRIBUTE FreeRADIUS-Client-Require-MA 1122 integer VALUE FreeRADIUS-Client-Require-MA no 0 VALUE FreeRADIUS-Client-Require-MA yes 1 -ATTRIBUTE FreeRADIUS-Client-Secret 1123 string +ATTRIBUTE FreeRADIUS-Client-Secret 1123 string secret ATTRIBUTE FreeRADIUS-Client-Shortname 1124 string ATTRIBUTE FreeRADIUS-Client-NAS-Type 1125 string ATTRIBUTE FreeRADIUS-Client-Virtual-Server 1126 string @@ -224,42 +235,18 @@ ATTRIBUTE MS-CHAP-New-NT-Password 1137 octets ATTRIBUTE Stripped-User-Domain 1138 string ATTRIBUTE Called-Station-SSID 1139 string - -VALUE Cache-Status-Only no 0 -VALUE Cache-Status-Only yes 1 - -VALUE Cache-Merge no 0 -VALUE Cache-Merge yes 1 - -VALUE Cache-Read-Only no 0 -VALUE Cache-Read-Only yes 1 +ATTRIBUTE Called-Station-MAC 1140 octets +ATTRIBUTE Pre-Shared-Key 1141 string +ATTRIBUTE Pairwise-Master-Key 1142 octets +ATTRIBUTE PSK-Identity 1143 string ATTRIBUTE OTP-Challenge 1145 string ATTRIBUTE EAP-Session-Id 1146 octets ATTRIBUTE Chbind-Response-Code 1147 integer -ATTRIBUTE Chbind-Response-Code 1147 integer - VALUE Chbind-Response-Code success 2 VALUE Chbind-Response-Code failure 3 -# -# Server-side "listen type = foo" -# -ATTRIBUTE Listen-Socket-Type 1147 integer - -VALUE Listen-Socket-Type none 0 -VALUE Listen-Socket-Type status 0 -VALUE Listen-Socket-Type proxy 1 -VALUE Listen-Socket-Type auth 2 -VALUE Listen-Socket-Type auth+acct 2 -VALUE Listen-Socket-Type acct 3 -VALUE Listen-Socket-Type detail 4 -VALUE Listen-Socket-Type vmps 5 -VALUE Listen-Socket-Type dhcp 6 -VALUE Listen-Socket-Type control 7 -VALUE Listen-Socket-Type coa 8 - ATTRIBUTE Acct-Input-Octets64 1148 integer64 ATTRIBUTE Acct-Output-Octets64 1149 integer64 @@ -272,6 +259,7 @@ ATTRIBUTE FreeRADIUS-Response-Delay-USec 1155 integer ATTRIBUTE REST-HTTP-Header 1160 string ATTRIBUTE REST-HTTP-Body 1161 string +ATTRIBUTE REST-HTTP-Status-Code 1162 integer ATTRIBUTE Cache-Expires 1170 date ATTRIBUTE Cache-Created 1171 date @@ -281,6 +269,42 @@ ATTRIBUTE Cache-Merge 1174 integer ATTRIBUTE Cache-Entry-Hits 1175 integer ATTRIBUTE Cache-Read-Only 1176 integer +VALUE Cache-Status-Only no 0 +VALUE Cache-Status-Only yes 1 + +VALUE Cache-Merge no 0 +VALUE Cache-Merge yes 1 + +VALUE Cache-Read-Only no 0 +VALUE Cache-Read-Only yes 1 + +ATTRIBUTE SSHA2-224-Password 1177 octets +ATTRIBUTE SSHA2-256-Password 1178 octets +ATTRIBUTE SSHA2-384-Password 1179 octets +ATTRIBUTE SSHA2-512-Password 1180 octets + +ATTRIBUTE PBKDF2-Password 1181 octets +ATTRIBUTE SSHA3-224-Password 1182 octets +ATTRIBUTE SSHA3-256-Password 1183 octets +ATTRIBUTE SSHA3-384-Password 1184 octets +ATTRIBUTE SSHA3-512-Password 1185 octets + +ATTRIBUTE MS-CHAP-Peer-Challenge 1192 octets +ATTRIBUTE Home-Server-Name 1193 string +ATTRIBUTE Originating-Realm-Key 1194 string +ATTRIBUTE Proxy-To-Originating-Realm 1195 string + +ATTRIBUTE TOTP-Secret 1194 string # base32 encoded +ATTRIBUTE TOTP-Key 1195 octets # raw key +ATTRIBUTE TOTP-Password 1196 string + +ATTRIBUTE Proxy-Tunneled-Request-As-EAP 1197 integer +VALUE Proxy-Tunneled-Request-As-EAP No 0 +VALUE Proxy-Tunneled-Request-As-EAP Yes 1 +ATTRIBUTE Temp-Home-Server-String 1198 string + +ATTRIBUTE TOTP-Time-Offset 1199 signed + # # Range: 1200-1279 # EAP-SIM (and other EAP type) weirdness. @@ -310,13 +334,20 @@ ATTRIBUTE EAP-Sim-HMAC 1209 string ATTRIBUTE EAP-Sim-KEY 1210 octets ATTRIBUTE EAP-Sim-EXTRA 1211 octets -ATTRIBUTE EAP-Sim-Kc1 1212 octets -ATTRIBUTE EAP-Sim-Kc2 1213 octets -ATTRIBUTE EAP-Sim-Kc3 1214 octets +ATTRIBUTE EAP-Sim-KC1 1212 octets +ATTRIBUTE EAP-Sim-KC2 1213 octets +ATTRIBUTE EAP-Sim-KC3 1214 octets ATTRIBUTE EAP-Sim-Ki 1215 octets ATTRIBUTE EAP-Sim-Algo-Version 1216 integer +ATTRIBUTE Outer-Realm-Name 1218 string +ATTRIBUTE Inner-Realm-Name 1219 string + +ATTRIBUTE EAP-Pwd-Password-Hash 1220 octets +ATTRIBUTE EAP-Pwd-Password-Salt 1221 octets +ATTRIBUTE EAP-Pwd-Password-Prep 1222 byte + # # Range: 1280 - 1535 # EAP-type specific attributes @@ -380,6 +411,8 @@ ATTRIBUTE EAP-Type-EAP-AKA2 1330 octets ATTRIBUTE EAP-Type-EAP-GPSK 1331 octets ATTRIBUTE EAP-Type-EAP-PWD 1332 octets ATTRIBUTE EAP-Type-EAP-EVEv1 1333 octets +ATTRIBUTE EAP-Type-EAP-PT-EAP 1334 octets +ATTRIBUTE EAP-Type-EAP-TEAP 1335 octets ATTRIBUTE EAP-Type-Microsoft-MS-CHAPv2 1306 octets ATTRIBUTE EAP-Type-Cisco-MS-CHAPv2 1309 octets @@ -515,6 +548,11 @@ ATTRIBUTE Tmp-Cast-IPv4Prefix 1870 ipv4prefix # these attributes. # ATTRIBUTE WiMAX-MN-NAI 1900 string +ATTRIBUTE WiMAX-SIM-Ki 1901 octets +ATTRIBUTE WiMAX-SIM-OPc 1902 octets +ATTRIBUTE WiMAX-SIM-AMF 1903 octets +ATTRIBUTE WiMAX-SIM-SQN 1904 octets +ATTRIBUTE WiMAX-SIM-RAND 1905 octets ATTRIBUTE TLS-Cert-Serial 1910 string ATTRIBUTE TLS-Cert-Expiration 1911 string @@ -524,7 +562,8 @@ ATTRIBUTE TLS-Cert-Common-Name 1914 string ATTRIBUTE TLS-Cert-Subject-Alt-Name-Email 1915 string ATTRIBUTE TLS-Cert-Subject-Alt-Name-Dns 1916 string ATTRIBUTE TLS-Cert-Subject-Alt-Name-Upn 1917 string -# 1918 - 1919: reserved for future cert attributes +ATTRIBUTE TLS-Cert-Valid-Since 1918 string +ATTRIBUTE TLS-Session-Information 1919 string ATTRIBUTE TLS-Client-Cert-Serial 1920 string ATTRIBUTE TLS-Client-Cert-Expiration 1921 string ATTRIBUTE TLS-Client-Cert-Issuer 1922 string @@ -539,11 +578,41 @@ ATTRIBUTE TLS-Client-Cert-X509v3-Basic-Constraints 1930 string ATTRIBUTE TLS-Client-Cert-Subject-Alt-Name-Dns 1931 string ATTRIBUTE TLS-Client-Cert-Subject-Alt-Name-Upn 1932 string ATTRIBUTE TLS-PSK-Identity 1933 string +ATTRIBUTE TLS-Client-Cert-X509v3-Extended-Key-Usage-OID 1936 string +ATTRIBUTE TLS-Client-Cert-Valid-Since 1937 string +ATTRIBUTE TLS-Cache-Method 1938 integer +VALUE TLS-Cache-Method save 1 +VALUE TLS-Cache-Method load 2 +VALUE TLS-Cache-Method clear 3 +VALUE TLS-Cache-Method refresh 4 -# 1934 - 1939: reserved for future cert attributes + +ATTRIBUTE TLS-Client-Cert-X509v3-Certificate-Policies 1939 string + +# 1940 - 1959: reserved for TLS session caching, mostly in 4.0 + +ATTRIBUTE TLS-Session-ID 1940 octets +ATTRIBUTE TLS-Session-Data 1942 octets + +# Set by EAP-TLS code +ATTRIBUTE TLS-OCSP-Cert-Valid 1943 integer +VALUE TLS-OCSP-Cert-Valid unknown 3 +VALUE TLS-OCSP-Cert-Valid skipped 2 +VALUE TLS-OCSP-Cert-Valid yes 1 +VALUE TLS-OCSP-Cert-Valid no 0 + +ATTRIBUTE TLS-Cache-Filename 1946 string + +ATTRIBUTE TLS-Session-Version 1947 string +ATTRIBUTE TLS-Session-Cipher-Suite 1948 string + +ATTRIBUTE TLS-Session-Cert-File 1949 string +ATTRIBUTE TLS-Session-Cert-Private-Key-File 1950 string + +ATTRIBUTE TLS-Server-Name-Indication 1951 string # -# Range: 1940-2099 +# Range: 1960-2099 # Free # # Range: 2100-2199 @@ -590,7 +659,7 @@ ATTRIBUTE Radclient-Test-Name 2200 string # Free # # Range: 3000-3999 -# Site-local attributes (see raddb/dictionary.in) +# Site-local attributes (see raddb/dictionary) # Do NOT define attributes in this range! # # Range: 4000-65535 @@ -604,53 +673,43 @@ ATTRIBUTE Radclient-Test-Name 2200 string # Non-Protocol Integer Translations # -VALUE Auth-Type Local 0 -VALUE Auth-Type System 1 -VALUE Auth-Type SecurID 2 -VALUE Auth-Type Crypt-Local 3 +VALUE Auth-Type Local 1 VALUE Auth-Type Reject 4 -VALUE Auth-Type ActivCard 5 -VALUE Auth-Type EAP 6 -VALUE Auth-Type ARAP 7 # # FreeRADIUS extensions (most originally from Cistron) # VALUE Auth-Type Accept 254 -VALUE Auth-Type PAP 1024 -VALUE Auth-Type CHAP 1025 -# 1026 was LDAP, but we deleted it. Adding it back will break the -# ldap module. -VALUE Auth-Type PAM 1027 -VALUE Auth-Type MS-CHAP 1028 -VALUE Auth-Type MSCHAP 1028 -VALUE Auth-Type Kerberos 1029 -VALUE Auth-Type CRAM 1030 -VALUE Auth-Type NS-MTA-MD5 1031 -# 1032 is unused (was a duplicate of CRAM) -VALUE Auth-Type SMB 1033 -VALUE Auth-Type MS-CHAP-V2 1034 - # # Authorization type, too. # -VALUE Autz-Type Local 0 +VALUE Autz-Type Local 1 # # And accounting # -VALUE Acct-Type Local 0 +VALUE Acct-Type Local 1 # # And Session handling # -VALUE Session-Type Local 0 +VALUE Session-Type Local 1 # # And Post-Auth -VALUE Post-Auth-Type Local 0 -VALUE Post-Auth-Type Reject 1 +VALUE Post-Auth-Type Local 1 +VALUE Post-Auth-Type Reject 2 +VALUE Post-Auth-Type Challenge 3 +VALUE Post-Auth-Type Client-Lost 4 + +# +# And Post-Proxy +VALUE Post-Proxy-Type Fail 1 +VALUE Post-Proxy-Type Fail-Authentication 2 +VALUE Post-Proxy-Type Fail-Accounting 3 +VALUE Post-Proxy-Type Fail-CoA 4 +VALUE Post-Proxy-Type Fail-Disconnect 5 # # Experimental Non-Protocol Integer Translations for FreeRADIUS @@ -749,15 +808,18 @@ VALUE EAP-Type Identity 1 VALUE EAP-Type Notification 2 VALUE EAP-Type NAK 3 VALUE EAP-Type MD5-Challenge 4 +VALUE EAP-Type EAP-MD5 4 VALUE EAP-Type MD5 4 VALUE EAP-Type One-Time-Password 5 VALUE EAP-Type OTP 5 VALUE EAP-Type Generic-Token-Card 6 +VALUE EAP-Type EAP-GTC 6 VALUE EAP-Type GTC 6 VALUE EAP-Type RSA-Public-Key 9 VALUE EAP-Type DSS-Unilateral 10 VALUE EAP-Type KEA 11 VALUE EAP-Type KEA-Validate 12 +VALUE EAP-Type EAP-TLS 13 VALUE EAP-Type TLS 13 VALUE EAP-Type Defender-Token 14 VALUE EAP-Type RSA-SecurID-EAP 15 @@ -765,11 +827,14 @@ VALUE EAP-Type Arcot-Systems-EAP 16 VALUE EAP-Type Cisco-LEAP 17 VALUE EAP-Type LEAP 17 VALUE EAP-Type Nokia-IP-Smart-Card 18 +VALUE EAP-Type EAP-SIM 18 VALUE EAP-Type SIM 18 VALUE EAP-Type SRP-SHA1 19 # 20 is unassigned +VALUE EAP-Type EAP-TTLS 21 VALUE EAP-Type TTLS 21 VALUE EAP-Type Remote-Access-Service 22 +VALUE EAP-Type EAP-AKA 23 VALUE EAP-Type AKA 23 VALUE EAP-Type 3Com-Wireless 24 VALUE EAP-Type PEAP 25 @@ -791,21 +856,26 @@ VALUE EAP-Type SecuriSuite-EAP 39 VALUE EAP-Type DeviceConnect-EAP 40 VALUE EAP-Type SPEKE 41 VALUE EAP-Type MOBAC 42 +VALUE EAP-Type EAP-FAST 43 VALUE EAP-Type FAST 43 VALUE EAP-Type Zonelabs 44 VALUE EAP-Type Link 45 VALUE EAP-Type PAX 46 VALUE EAP-Type PSK 47 VALUE EAP-Type SAKE 48 +VALUE EAP-Type EAP-IKEv2 49 VALUE EAP-Type IKEv2 49 VALUE EAP-Type AKA2 50 VALUE EAP-Type GPSK 51 VALUE EAP-Type PWD 52 -VALUE EAP-Type EVEv1 53 +VALUE EAP-Type EKEv1 53 +VALUE EAP-Type PT-EAP 54 +VALUE EAP-Type TEAP 55 # # And this is what most people mean by MS-CHAPv2 # +VALUE EAP-Type EAP-MSCHAPv2 26 VALUE EAP-Type MSCHAPv2 26 # diff --git a/resources/protocols/radius/dictionary.freeswitch b/resources/protocols/radius/dictionary.freeswitch index 2594ef7e..04ea901b 100644 --- a/resources/protocols/radius/dictionary.freeswitch +++ b/resources/protocols/radius/dictionary.freeswitch @@ -1,11 +1,10 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -# -# dictionary.freeswitch +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # cparker@segv.org # -# Version: $Id: ad9e04752d451c2ca75840b774ce824d9e44eddc $ +# Version: $Id: 0592e4cdf460c628c75c8a570516ab07a8d43ced $ # VENDOR Freeswitch 27880 diff --git a/resources/protocols/radius/dictionary.gandalf b/resources/protocols/radius/dictionary.gandalf index dbb08fa9..c990b50b 100644 --- a/resources/protocols/radius/dictionary.gandalf +++ b/resources/protocols/radius/dictionary.gandalf @@ -1,19 +1,16 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -# Gandalf dictionary +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Version: 1.00 24-July-2003 Blaise St-Laurent <bstlaurent@okiok.com> # # Notes: Dictionary was made specifically for the Gandalf XpressWay # RLAN with Link Authentication through RADIUS # -# $Id: 258b192f136914bcac3a65a8f770717406e1a4a0 $ +# $Id: 207001337b940297bd5b6b01a979975e5b3fe678 $ # VENDOR Gandalf 64 -# -# Vendor-specific attributes -# BEGIN-VENDOR Gandalf ATTRIBUTE Gandalf-Remote-LAN-Name 0 string diff --git a/resources/protocols/radius/dictionary.garderos b/resources/protocols/radius/dictionary.garderos index bf511580..08145938 100644 --- a/resources/protocols/radius/dictionary.garderos +++ b/resources/protocols/radius/dictionary.garderos @@ -1,9 +1,10 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # dictionary.garderos # -# Version: $Id: e0e317820a1e8c8046e0b16a5a6a0c2a4dfc2b2d $ +# Version: $Id: c401784d5243df6f45dc9b23cd7ed24d848b9260 $ # # For documentation on Garderos attributes, see: # diff --git a/resources/protocols/radius/dictionary.gemtek b/resources/protocols/radius/dictionary.gemtek index 4a1559f0..201d1cb8 100644 --- a/resources/protocols/radius/dictionary.gemtek +++ b/resources/protocols/radius/dictionary.gemtek @@ -1,8 +1,8 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Gemtek Systems VSA's -# Version: dictionary.gemtek, v1.2 2004/07/13 VENDOR Gemtek 10529 diff --git a/resources/protocols/radius/dictionary.h3c b/resources/protocols/radius/dictionary.h3c index d725b129..57665e7f 100644 --- a/resources/protocols/radius/dictionary.h3c +++ b/resources/protocols/radius/dictionary.h3c @@ -1,14 +1,14 @@ # -*- text -*- -# Copyright (C) 2021 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors # This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 -# Version $Id$ +# ############################################################################## # # Dictionary for Huawei-3Com. See also dictionary.huawei # # http://www.h3c.com # -# $Id$ +# $Id: be9eeee0919af69942c7048075e081c96b65a8d5 $ # ############################################################################## @@ -16,78 +16,80 @@ VENDOR H3C 25506 BEGIN-VENDOR H3C -ATTRIBUTE Input-Peak-Rate 1 integer -ATTRIBUTE Input-Average-Rate 2 integer -ATTRIBUTE Input-Basic-Rate 3 integer -ATTRIBUTE Output-Peak-Rate 4 integer -ATTRIBUTE Output-Average-Rate 5 integer -ATTRIBUTE Output-Basic-Rate 6 integer -ATTRIBUTE Remanent-Volume 15 integer -ATTRIBUTE ISP-ID 17 string -ATTRIBUTE Command 20 integer +ATTRIBUTE H3C-Input-Peak-Rate 1 integer +ATTRIBUTE H3C-Input-Average-Rate 2 integer +ATTRIBUTE H3C-Input-Basic-Rate 3 integer +ATTRIBUTE H3C-Output-Peak-Rate 4 integer +ATTRIBUTE H3C-Output-Average-Rate 5 integer +ATTRIBUTE H3C-Output-Basic-Rate 6 integer +ATTRIBUTE H3C-Remanent-Volume 15 integer +ATTRIBUTE H3C-ISP-ID 17 string +ATTRIBUTE H3C-Command 20 integer -VALUE Command Trigger-Request 1 -VALUE Command Terminate-Request 2 -VALUE Command SetPolicy 3 -VALUE Command Result 4 -VALUE Command PortalClear 5 +VALUE H3C-Command Trigger-Request 1 +VALUE H3C-Command Terminate-Request 2 +VALUE H3C-Command SetPolicy 3 +VALUE H3C-Command Result 4 +VALUE H3C-Command PortalClear 5 -ATTRIBUTE Control-Identifier 24 integer -ATTRIBUTE Result-Code 25 integer -ATTRIBUTE Connect_Id 26 integer -ATTRIBUTE Portal-URL 27 string -ATTRIBUTE Ftp-Directory 28 string -ATTRIBUTE Exec-Privilege 29 integer +ATTRIBUTE H3C-Control-Identifier 24 integer +ATTRIBUTE H3C-Result-Code 25 integer +ATTRIBUTE H3C-Connect_Id 26 integer +ATTRIBUTE H3C-Portal-URL 27 string +ATTRIBUTE H3C-Ftp-Directory 28 string +ATTRIBUTE H3C-Exec-Privilege 29 integer -VALUE Exec-Privilege Visit 0 -VALUE Exec-Privilege Monitor 1 -VALUE Exec-Privilege System 2 -VALUE Exec-Privilege Manage 3 +VALUE H3C-Exec-Privilege Visit 0 +VALUE H3C-Exec-Privilege Monitor 1 +VALUE H3C-Exec-Privilege System 2 +VALUE H3C-Exec-Privilege Manage 3 -ATTRIBUTE NAT-IP-Address 32 ipaddr -ATTRIBUTE NAT-Start-Port 33 integer -ATTRIBUTE NAT-End-Port 34 integer -ATTRIBUTE NAS-Startup-Timestamp 59 integer -ATTRIBUTE Ip-Host-Addr 60 string -ATTRIBUTE User-Notify 61 string -ATTRIBUTE User-HeartBeat 62 string -ATTRIBUTE IPv4-Multicast-Receive-Group 98 ipaddr -ATTRIBUTE IPv6-Multicast-Receive-Group 100 ipv6addr -ATTRIBUTE MLD-Access-Limit 101 integer -ATTRIBUTE L2TP-Local-Name 102 string -ATTRIBUTE IGMP-Access-Limit 103 integer -ATTRIBUTE VPN-Instance 104 string -ATTRIBUTE ANCP-Profile 105 string -ATTRIBUTE Longitude-Latitude 111 string -ATTRIBUTE Client-Primary-DNS 135 ipaddr -ATTRIBUTE Client-Secondary-DNS 136 ipaddr -ATTRIBUTE User-Group 140 string -ATTRIBUTE Security-Level 141 integer -ATTRIBUTE Acct-IPv6-Input-Octets 144 integer -ATTRIBUTE Acct-IPv6-Output-Octets 145 integer -ATTRIBUTE Acct-IPv6-Input-Packets 146 integer -ATTRIBUTE Acct-IPv6-Output-Packets 147 integer -ATTRIBUTE Acct-IPv6-Input-Gigawords 146 integer -ATTRIBUTE Acct-IPv6-Output-Gigawords 147 integer -ATTRIBUTE User-Role 155 string -ATTRIBUTE Input-Interval-Octets 201 integer -ATTRIBUTE Output-Interval-Octets 202 integer -ATTRIBUTE Input-Interval-Packets 203 integer -ATTRIBUTE Output-Interval-Packets 204 integer -ATTRIBUTE Input-Interval-Gigawords 205 integer -ATTRIBUTE Output-Interval-Gigawords 206 integer -ATTRIBUTE Backup-NAS-IP 207 ipaddr -ATTRIBUTE Av-Pair 210 string -ATTRIBUTE Accounting-Level 215 integer -ATTRIBUTE Ita-Policy 216 string -ATTRIBUTE NAS-Port-Name 230 string -ATTRIBUTE Auth-Detail-Result 246 integer -ATTRIBUTE Input-Committed-Burst-Size 247 integer -ATTRIBUTE Output-Committed-Burst-Size 248 integer -ATTRIBUTE Authentication-Type 249 integer -ATTRIBUTE WEB-URL 250 string -ATTRIBUTE Subscriber-ID 251 string -ATTRIBUTE Subscriber-Profile 252 string -ATTRIBUTE Product-ID 255 string +ATTRIBUTE H3C-NAT-IP-Address 32 ipaddr +ATTRIBUTE H3C-NAT-Start-Port 33 integer +ATTRIBUTE H3C-NAT-End-Port 34 integer +ATTRIBUTE H3C-NAS-Startup-Timestamp 59 integer +ATTRIBUTE H3C-Ip-Host-Addr 60 string +ATTRIBUTE H3C-User-Notify 61 string +ATTRIBUTE H3C-User-HeartBeat 62 string +ATTRIBUTE H3C-IPv4-Multicast-Receive-Group 98 ipaddr +ATTRIBUTE H3C-IPv6-Multicast-Receive-Group 100 ipv6addr +ATTRIBUTE H3C-MLD-Access-Limit 101 integer +ATTRIBUTE H3C-L2TP-Local-Name 102 string +ATTRIBUTE H3C-IGMP-Access-Limit 103 integer +ATTRIBUTE H3C-VPN-Instance 104 string +ATTRIBUTE H3C-ANCP-Profile 105 string +ATTRIBUTE H3C-Up-Priority 106 integer +ATTRIBUTE H3C-Down-Priority 107 integer +ATTRIBUTE H3C-Longitude-Latitude 111 string +ATTRIBUTE H3C-Client-Primary-DNS 135 ipaddr +ATTRIBUTE H3C-Client-Secondary-DNS 136 ipaddr +ATTRIBUTE H3C-User-Group 140 string +ATTRIBUTE H3C-Security-Level 141 integer +ATTRIBUTE H3C-Acct-IPv6-Input-Octets 144 integer +ATTRIBUTE H3C-Acct-IPv6-Output-Octets 145 integer +ATTRIBUTE H3C-Acct-IPv6-Input-Packets 146 integer +ATTRIBUTE H3C-Acct-IPv6-Output-Packets 147 integer +ATTRIBUTE H3C-Acct-IPv6-Input-Gigawords 146 integer +ATTRIBUTE H3C-Acct-IPv6-Output-Gigawords 147 integer +ATTRIBUTE H3C-User-Role 155 string +ATTRIBUTE H3C-Input-Interval-Octets 201 integer +ATTRIBUTE H3C-Output-Interval-Octets 202 integer +ATTRIBUTE H3C-Input-Interval-Packets 203 integer +ATTRIBUTE H3C-Output-Interval-Packets 204 integer +ATTRIBUTE H3C-Input-Interval-Gigawords 205 integer +ATTRIBUTE H3C-Output-Interval-Gigawords 206 integer +ATTRIBUTE H3C-Backup-NAS-IP 207 ipaddr +ATTRIBUTE H3C-Av-Pair 210 string +ATTRIBUTE H3C-Accounting-Level 215 integer +ATTRIBUTE H3C-Ita-Policy 216 string +ATTRIBUTE H3C-NAS-Port-Name 230 string +ATTRIBUTE H3C-Auth-Detail-Result 246 integer +ATTRIBUTE H3C-Input-Committed-Burst-Size 247 integer +ATTRIBUTE H3C-Output-Committed-Burst-Size 248 integer +ATTRIBUTE H3C-Authentication-Type 249 integer +ATTRIBUTE H3C-WEB-URL 250 string +ATTRIBUTE H3C-Subscriber-ID 251 string +ATTRIBUTE H3C-Subscriber-Profile 252 string +ATTRIBUTE H3C-Product-ID 255 string END-VENDOR H3C diff --git a/resources/protocols/radius/dictionary.hillstone b/resources/protocols/radius/dictionary.hillstone new file mode 100644 index 00000000..89eec529 --- /dev/null +++ b/resources/protocols/radius/dictionary.hillstone @@ -0,0 +1,51 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# From yqsi@hillstonenet.com 2015/11/2 +# +# $Id: b1cf2e2b41345d832ff58581dc33b3b0e90341b4 $ +# +############################################################################## + +VENDOR Hillstone 28557 + +BEGIN-VENDOR Hillstone + +ATTRIBUTE Hillstone-User-vsys-id 1 integer +ATTRIBUTE Hillstone-User-Type 2 integer +ATTRIBUTE Hillstone-User-Admin-Privilege 3 integer +ATTRIBUTE Hillstone-User-Login-Type 4 integer +ATTRIBUTE Hillstone-User-Mobile-Number 5 string +ATTRIBUTE Hillstone-User-Mobile-Operator 6 integer +ATTRIBUTE Hillstone-User-Policy-dst-ip-begin 7 ipaddr +ATTRIBUTE Hillstone-User-Policy-dst-ip-end 8 ipaddr +ATTRIBUTE Hillstone-User-Role-Bame 9 string +ATTRIBUTE Hillstone-VPN-DHCP-Gateway 100 string +ATTRIBUTE Hillstone-VPN-DHCP-Mask 101 string +ATTRIBUTE Hillstone-VPN-DHCP-Pool 102 string +ATTRIBUTE Hillstone-VPN-WINS 103 string +ATTRIBUTE Hillstone-VPN-DNS 104 string +ATTRIBUTE Hillstone-VPN-Split-Route 105 string +ATTRIBUTE Hillstone-VPN-Tunnel-IP 106 string +ATTRIBUTE Hillstone-VPN-SNAT 107 integer + +VALUE Hillstone-User-Type HS-User-l2tp 1 +VALUE Hillstone-User-Type HS-User-8021x 2 +VALUE Hillstone-User-Type HS-User-smartvpn 4 +VALUE Hillstone-User-Type HS-User-normal 8 +VALUE Hillstone-User-Type HS-User-Admin 16 + +VALUE Hillstone-User-Login-Type HS-Admin-Console 1 +VALUE Hillstone-User-Login-Type HS-Admin-Telnet 2 +VALUE Hillstone-User-Login-Type HS-Admin-SSH 4 +VALUE Hillstone-User-Login-Type HS-Admin-HTTP 8 +VALUE Hillstone-User-Login-Type HS-Admin-HTTPS 16 + +VALUE Hillstone-User-Mobile-Operator HS-Mobile-ChinaMobile 1 +VALUE Hillstone-User-Mobile-Operator HS-Mobile-ChinaUnicom 2 +VALUE Hillstone-User-Mobile-Operator HS-Mobile-ChinaTelecom 3 + +END-VENDOR Hillstone diff --git a/resources/protocols/radius/dictionary.hp b/resources/protocols/radius/dictionary.hp index daba4ac7..e0a374b8 100644 --- a/resources/protocols/radius/dictionary.hp +++ b/resources/protocols/radius/dictionary.hp @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # HP ProCurve VSA's # -# $Id: 4df7faf87ecfc1348817a8406758daa31d5532f6 $ +# $Id: b4bafece895c77720a4fffce6c5f6bc7eaeab88e $ # ############################################################################## @@ -19,15 +21,19 @@ BEGIN-VENDOR HP ATTRIBUTE HP-Privilege-Level 1 integer ATTRIBUTE HP-Command-String 2 string ATTRIBUTE HP-Command-Exception 3 integer -ATTRIBUTE HP-Management-Protocol 26 integer # Dynamic port-access attributes ATTRIBUTE HP-Port-Client-Limit-Dot1x 10 integer ATTRIBUTE HP-Port-Client-Limit-MA 11 integer ATTRIBUTE HP-Port-Client-Limit-WA 12 integer ATTRIBUTE HP-Port-Auth-Mode-Dot1x 13 integer +ATTRIBUTE HP-Port-MA-Port-Mode 14 integer ATTRIBUTE HP-Port-Bounce-Host 23 integer ATTRIBUTE HP-Captive-Portal-URL 24 string +ATTRIBUTE HP-User-Role 25 string +ATTRIBUTE HP-Management-Protocol 26 integer +ATTRIBUTE HP-CPPM-Role 27 string +ATTRIBUTE HP-CPPM-Secondary-Role 28 string # Client QoS attributes ATTRIBUTE HP-Port-Priority-Regeneration-Table 40 string @@ -43,11 +49,22 @@ ATTRIBUTE HP-Ip-Filter-Raw 61 string # Client ACL attributes ATTRIBUTE HP-Nas-Filter-Rule 61 string +ATTRIBUTE HP-Access-Profile 62 string ATTRIBUTE HP-Nas-Rules-IPv6 63 integer # VLAN assignment attributes ATTRIBUTE HP-Egress-VLANID 64 integer ATTRIBUTE HP-Egress-VLAN-Name 65 string +ATTRIBUTE HP-Bonjour-Inbound-Profile 66 string +ATTRIBUTE HP-Bonjour-Outbound-Profile 67 string + +# AAA for REST +ATTRIBUTE HP-URI-String 80 string +ATTRIBUTE HP-URI-Json-String 81 string +ATTRIBUTE HP-URI-Access 82 string +ATTRIBUTE HP-URI-Exception 83 integer + +ATTRIBUTE HP-VC-groups 192 string # See http://wiki.freeradius.org/vendor/HP#Capability-advertisements ATTRIBUTE HP-Capability-Advert 255 octets diff --git a/resources/protocols/radius/dictionary.huawei b/resources/protocols/radius/dictionary.huawei index 48709e42..d0e4fa0a 100644 --- a/resources/protocols/radius/dictionary.huawei +++ b/resources/protocols/radius/dictionary.huawei @@ -143,16 +143,16 @@ ATTRIBUTE Huawei-Acct-IPv6-Output-Gigawords 149 integer ATTRIBUTE Huawei-DHCPv6-Option37 150 string ATTRIBUTE Huawei-DHCPv6-Option38 151 string ATTRIBUTE Huawei-User-Mac 153 string -ATTRIBUTE Huawei-DNS-Server-IPv6-address 154 ipv6prefix # manual says ipv6addr with length 18?! +ATTRIBUTE Huawei-DNS-Server-IPv6-address 154 ipv6prefix ATTRIBUTE Huawei-DHCPv4-Option121 155 string ATTRIBUTE Huawei-DHCPv4-Option43 156 string ATTRIBUTE Huawei-Framed-Pool-Group 157 string -ATTRIBUTE Huawei-Framed-IPv6-Address 158 ipv6prefix # manual says 18 byte string? +ATTRIBUTE Huawei-Framed-IPv6-Address 158 ipv6prefix ATTRIBUTE Huawei-Acct-Update-Address 159 integer ATTRIBUTE Huawei-NAT-Policy-Name 160 string -ATTRIBUTE Huawei-NAT-Public-Address 161 string -ATTRIBUTE Huawei-NAT-Start-Port 162 string -ATTRIBUTE Huawei-NAT-End-Port 163 string +ATTRIBUTE Huawei-NAT-Public-Address 161 ipaddr +ATTRIBUTE Huawei-NAT-Start-Port 162 integer +ATTRIBUTE Huawei-NAT-End-Port 163 integer ATTRIBUTE Huawei-NAT-Port-Forwarding 164 string ATTRIBUTE Huawei-NAT-Port-Range-Update 165 integer ATTRIBUTE Huawei-DS-Lite-Tunnel-Name 166 string @@ -175,8 +175,9 @@ VALUE Huawei-Auth-Type Administrative 7 VALUE Huawei-Auth-Type Tunnel 8 VALUE Huawei-Auth-Type MIP 9 VALUE Huawei-Auth-Type None 10 +VALUE Huawei-Auth-Type MAC 11 -ATTRIBUTE Huawei-Acct-Terminate-Subcause 181 string +ATTRIBUTE Huawei-Acct-Terminate-Subcause 181 integer ATTRIBUTE Huawei-Down-QOS-Profile-Name 182 string ATTRIBUTE Huawei-Port-Mirror 183 integer @@ -187,12 +188,13 @@ VALUE Huawei-Port-Mirror Enable 3 ATTRIBUTE Huawei-Account-Info 184 string ATTRIBUTE Huawei-Service-Info 185 string -ATTRIBUTE Huawei-DHCP-Option 187 octets +ATTRIBUTE Huawei-DHCP-Option 187 string ATTRIBUTE Huawei-AVpair 188 string +ATTRIBUTE Huawei-DHCPv6-Option 189 string ATTRIBUTE Huawei-Delegated-IPv6-Prefix-Pool 191 string -ATTRIBUTE Huawei-IPv6-Prefix-Lease 192 octets -ATTRIBUTE Huawei-IPv6-Address-Lease 193 octets -ATTRIBUTE Huawei-IPv6-Policy-Route 194 ipv6prefix # manual says string? +ATTRIBUTE Huawei-IPv6-Prefix-Lease 192 string +ATTRIBUTE Huawei-IPv6-Address-Lease 193 string +ATTRIBUTE Huawei-IPv6-Policy-Route 194 ipv6prefix ATTRIBUTE Huawei-MNG-IPv6 196 integer VALUE Huawei-MNG-IPv6 Unsupported 0 @@ -224,6 +226,8 @@ ATTRIBUTE Huawei-Application-Scene 221 octets ATTRIBUTE Huawei-MS-Maximum-MAC-Study-Number 222 octets # ether?? ATTRIBUTE Huawei-GGSN-Vendor 232 string ATTRIBUTE Huawei-GGSN-Version 233 string +ATTRIBUTE Huawei-USR-GRP-NAME 251 string +ATTRIBUTE Huawei-USER-SRVC_TYPE 252 string ATTRIBUTE Huawei-Web-URL 253 string ATTRIBUTE Huawei-Version 254 string ATTRIBUTE Huawei-Product-ID 255 string diff --git a/resources/protocols/radius/dictionary.iana b/resources/protocols/radius/dictionary.iana index 931707ba..4cd19971 100644 --- a/resources/protocols/radius/dictionary.iana +++ b/resources/protocols/radius/dictionary.iana @@ -1,15 +1,13 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Mostly values which have been allocated by IANA under # "expert review", but which don't have an RFC associated with them. # -# $Id: 989cd0b75728ba5e00e0fd53143c584bb54186cd $ +# $Id: 9f936c5d2ef03f3c05dfc2445e534a09c9f7074a $ # -# RFC 4005 -ATTRIBUTE Originating-Line-Info 94 string - # draft-sterman-aaa-sip-00.txt # # This is bad... at some point the IETF will allocate these. @@ -42,3 +40,9 @@ VALUE NAS-Port-Type xPON 35 VALUE NAS-Port-Type Wireless-XGP 36 VALUE Framed-Protocol PPTP 9 + +# +# https://freeradius.org/rfc/acct_status_type_subsystem.html +# +VALUE Acct-Status-Type Subsystem-On 18 +VALUE Acct-Status-Type Subsystem-Off 19 diff --git a/resources/protocols/radius/dictionary.iea b/resources/protocols/radius/dictionary.iea index 92a4da87..af72a6fe 100644 --- a/resources/protocols/radius/dictionary.iea +++ b/resources/protocols/radius/dictionary.iea @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # IEA Software, Inc. # RADIUS VSA Dictionary diff --git a/resources/protocols/radius/dictionary.infinera b/resources/protocols/radius/dictionary.infinera new file mode 100644 index 00000000..8dac69cf --- /dev/null +++ b/resources/protocols/radius/dictionary.infinera @@ -0,0 +1,12 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +VENDOR Infinera 8708 + +BEGIN-VENDOR Infinera + +ATTRIBUTE Infinera-User-Category 1 string +ATTRIBUTE Infinera-ENM-User-Category 2 string + +END-VENDOR Infinera diff --git a/resources/protocols/radius/dictionary.infoblox b/resources/protocols/radius/dictionary.infoblox index 41733aea..46759c56 100644 --- a/resources/protocols/radius/dictionary.infoblox +++ b/resources/protocols/radius/dictionary.infoblox @@ -1,4 +1,6 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # InfoBlox Inc. VSAs # diff --git a/resources/protocols/radius/dictionary.infonet b/resources/protocols/radius/dictionary.infonet index 5662d090..d27a30c0 100644 --- a/resources/protocols/radius/dictionary.infonet +++ b/resources/protocols/radius/dictionary.infonet @@ -1,7 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -# -# dictionary.infonet +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Accounting VSAs by # "Bernard Lhoas from Infonet" <Bernard_Lhoas@infonet.com> diff --git a/resources/protocols/radius/dictionary.ipunplugged b/resources/protocols/radius/dictionary.ipunplugged index 6862e848..70ae0260 100644 --- a/resources/protocols/radius/dictionary.ipunplugged +++ b/resources/protocols/radius/dictionary.ipunplugged @@ -1,11 +1,13 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # ipUnplugged # http://www.ipunplugged.com/ # -# $Id: 978bbba43480739a2d716fd526fbcf50b0539f21 $ +# $Id: d34dff8d381e249b355499254b44aaf3854b4bad $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.issanni b/resources/protocols/radius/dictionary.issanni index b5aeb464..d40b9215 100644 --- a/resources/protocols/radius/dictionary.issanni +++ b/resources/protocols/radius/dictionary.issanni @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # UTStarcom Issanni DSL router. # -# $Id: a7813e48ee3ccd7825a06f0a84f03ac7c6890adc $ +# $Id: 9b734f13dc2b4607835e8f059aaed3b274acbef7 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.itk b/resources/protocols/radius/dictionary.itk index 95877f16..b9910859 100644 --- a/resources/protocols/radius/dictionary.itk +++ b/resources/protocols/radius/dictionary.itk @@ -1,8 +1,9 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # http://www.digieurope.com/ -# $Id: 555ea3d7d02fc32a3367dff8e038c9da56cef47d $ +# $Id: 0751f33731e5c95cafaa29a163cd59a64d2ea364 $ # VENDOR ITK 1195 diff --git a/resources/protocols/radius/dictionary.juniper b/resources/protocols/radius/dictionary.juniper index bd89cc8c..1abc6e20 100644 --- a/resources/protocols/radius/dictionary.juniper +++ b/resources/protocols/radius/dictionary.juniper @@ -1,11 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # dictionary.juniper # # As posted to the list by Eric Kilfoil <ekilfoil@uslec.net> # -# Version: $Id: d294e4bdf7957f51d95584bb9b85a65737a74592 $ +# Version: $Id: 15b6e6f90da6beeb6684f7a62cf0afda543e58b7 $ # VENDOR Juniper 2636 @@ -22,6 +23,7 @@ ATTRIBUTE Juniper-Interactive-Command 8 string ATTRIBUTE Juniper-Configuration-Change 9 string ATTRIBUTE Juniper-User-Permissions 10 string ATTRIBUTE Juniper-Junosspace-Profile 11 String +ATTRIBUTE Juniper-Junosspace-Profiles 11 String ATTRIBUTE Juniper-CTP-Group 21 integer ATTRIBUTE Juniper-CTPView-APP-Group 22 integer @@ -46,6 +48,16 @@ ATTRIBUTE Juniper-Local-Group-Name 46 string ATTRIBUTE Juniper-Local-Interface 47 string ATTRIBUTE Juniper-Switching-Filter 48 string ATTRIBUTE Juniper-VoIP-Vlan 49 string +ATTRIBUTE Juniper-CWA-Redirect 50 string + +ATTRIBUTE Juniper-AV-Pair 52 string + +ATTRIBUTE Juniper-DHCPv4-Options 55 octets +ATTRIBUTE Juniper-DHCPv6-Options 207 octets +ATTRIBUTE Juniper-DHCPv4-Packet-Header 208 octets +ATTRIBUTE Juniper-DHCPv6-Packet-Header 209 octets +ATTRIBUTE Juniper-Acct-Request-Reason 210 uint32 + VALUE Juniper-CTPView-APP-Group Net_View 1 VALUE Juniper-CTPView-APP-Group Net_Admin 2 @@ -60,4 +72,8 @@ VALUE Juniper-CTPView-OS-Group Web_Manager 1 VALUE Juniper-CTPView-OS-Group System_Admin 2 VALUE Juniper-CTPView-OS-Group Auditor 3 +VALUE Juniper-Acct-Request-Reason IPv4-Active 0x0004 +VALUE Juniper-Acct-Request-Reason IPv6-Active 0x0010 +VALUE Juniper-Acct-Request-Reason Session-Active 0x0040 + END-VENDOR Juniper diff --git a/resources/protocols/radius/dictionary.karlnet b/resources/protocols/radius/dictionary.karlnet index 26802099..5ad94e5b 100644 --- a/resources/protocols/radius/dictionary.karlnet +++ b/resources/protocols/radius/dictionary.karlnet @@ -1,17 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -# -------------------------------------- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# # KarlNet Vendor-specific information -# -------------------------------------- -#--------------------------------------------------------------------------- -# "VENDOR" VENDOR-NAME VENDOR-ID -#--------------------------------------------------------------------------- VENDOR KarlNet 762 -#--------------------------------------------------------------------------- -# "ATTRIBUTE" ATTRIBUTE-NAME ATTR-NUMBER ATTRTYPE VENDOR-NAME -#--------------------------------------------------------------------------- # Sets the remote client's Station Name BEGIN-VENDOR KarlNet @@ -20,9 +14,6 @@ ATTRIBUTE KarlNet-TurboCell-Name 151 string # Sets the remote client's Data Transmit Rate ATTRIBUTE KarlNet-TurboCell-TxRate 152 integer -#--------------------------------------------------------------------------- -# "VALUE" ATTRIBUTE-NAME SETTING-NAME SETTING-VALUE -#--------------------------------------------------------------------------- # 0x00 // Use the locally defined Data Rate VALUE KarlNet-TurboCell-TxRate TxRate-Local 0 # 0x08 // Use the maximum data rate possible diff --git a/resources/protocols/radius/dictionary.kineto b/resources/protocols/radius/dictionary.kineto index 9bf35336..9e997615 100644 --- a/resources/protocols/radius/dictionary.kineto +++ b/resources/protocols/radius/dictionary.kineto @@ -1,9 +1,9 @@ -# Kineto Wireless Dictionary -# dictionary.kineto +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Version $Id: 8cc858428f965cb597011ed4c65908a7db608449 $ # -# Version $Id: 09338cf89125f1c349b658144158465bf9595d4f $ +# Kineto Wireless Dictionary # # As posted to the list by Swaran Sethi <ssethi@kinetowireless.com> # diff --git a/resources/protocols/radius/dictionary.lancom b/resources/protocols/radius/dictionary.lancom index c29f3d67..74624302 100644 --- a/resources/protocols/radius/dictionary.lancom +++ b/resources/protocols/radius/dictionary.lancom @@ -1,7 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -# -# dictionary.lcs +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # originally by # "Eugen K. " <> @@ -37,5 +36,7 @@ ATTRIBUTE LCS-VPN-IPv6-Rule 23 string ATTRIBUTE LCS-Routing-Tag 24 integer ATTRIBUTE LCS-IKEv2-IPv4-Route 25 string ATTRIBUTE LCS-IKEv2-IPv6-Route 26 string +ATTRIBUTE LCS-IKEv2-DNS-Domain 27 string +ATTRIBUTE LCS-Load-Balancer 28 string END-VENDOR Lancom diff --git a/resources/protocols/radius/dictionary.lantronix b/resources/protocols/radius/dictionary.lantronix new file mode 100644 index 00000000..75f931b0 --- /dev/null +++ b/resources/protocols/radius/dictionary.lantronix @@ -0,0 +1,13 @@ +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +# Lantronix SLC Secure Lantronix Console Manager +# Provides SLC-specific user attributes +# +VENDOR Lantronix 244 + +BEGIN-VENDOR Lantronix + +ATTRIBUTE Lantronix-User-Attributes 1 string + +END-VENDOR Lantronix diff --git a/resources/protocols/radius/dictionary.livingston b/resources/protocols/radius/dictionary.livingston index e4d82817..f9e0da74 100644 --- a/resources/protocols/radius/dictionary.livingston +++ b/resources/protocols/radius/dictionary.livingston @@ -1,8 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -# -# Vendor-Specific attributes use the SMI Network Management Private -# Enterprise Code from the "Assigned Numbers" RFC +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # VENDOR Livingston 307 diff --git a/resources/protocols/radius/dictionary.localweb b/resources/protocols/radius/dictionary.localweb index b9d11fc7..8b11a6dc 100644 --- a/resources/protocols/radius/dictionary.localweb +++ b/resources/protocols/radius/dictionary.localweb @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Local-Web Accesspoints diff --git a/resources/protocols/radius/dictionary.lucent b/resources/protocols/radius/dictionary.lucent index 88521654..bdc1807d 100644 --- a/resources/protocols/radius/dictionary.lucent +++ b/resources/protocols/radius/dictionary.lucent @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Lucent VSAs, in their own "magic" 16-bit format. # -# $Id: 09b923ffdee8e1e1a2b05a0c28c456e7531b9448 $ +# $Id: bf4bf88ed7e6c067dbb30a924fce5ee052147ba5 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.manzara b/resources/protocols/radius/dictionary.manzara index 3c0f9381..5fce3d4c 100644 --- a/resources/protocols/radius/dictionary.manzara +++ b/resources/protocols/radius/dictionary.manzara @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # VENDOR Manzara 19382 diff --git a/resources/protocols/radius/dictionary.meinberg b/resources/protocols/radius/dictionary.meinberg index e0e2d32b..e76887a0 100644 --- a/resources/protocols/radius/dictionary.meinberg +++ b/resources/protocols/radius/dictionary.meinberg @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Meinberg # -# $Id: a396b823d836df50320de7645a7b56e90b1a5659 $ +# $Id: b57ea84fea19317f79b68dea0c6c1d467a66488c $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.mellanox b/resources/protocols/radius/dictionary.mellanox new file mode 100644 index 00000000..95285215 --- /dev/null +++ b/resources/protocols/radius/dictionary.mellanox @@ -0,0 +1,18 @@ +# -*- text -*- +# Copyright (C) 2021 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +# dictionary.mellanox +# +# Discovered by Aaron Knister <aaron.knister@gmail.com> +# +# +# Version $Id: 4da5c3469fcd603e41df6fb8f8a3c430d536046d $ + +VENDOR Mellanox 33049 + +BEGIN-VENDOR Mellanox + +ATTRIBUTE Mellanox-Local-User-Name 1 string + +END-VENDOR Mellanox diff --git a/resources/protocols/radius/dictionary.merit b/resources/protocols/radius/dictionary.merit index f1f52cb4..adfb2a9c 100644 --- a/resources/protocols/radius/dictionary.merit +++ b/resources/protocols/radius/dictionary.merit @@ -1,9 +1,10 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # For Merit. # -# $Id: ff5029c1af36b9f88d1e6d03c414ea774d558077 $ +# $Id: cc95c8ab7581966d78c96467f67d528d1d7f1894 $ # VENDOR Merit 61 diff --git a/resources/protocols/radius/dictionary.meru b/resources/protocols/radius/dictionary.meru index 41595a16..71537931 100644 --- a/resources/protocols/radius/dictionary.meru +++ b/resources/protocols/radius/dictionary.meru @@ -1,9 +1,10 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # dictionary.meru # -# $Id: 2f223558db7cf93db5b7ece6d24fa4206b0a64e3 $ +# $Id: b5cee2430b529db0d88a161c5afc7280da7c467b $ # # VENDOR Meru 15983 diff --git a/resources/protocols/radius/dictionary.microsemi b/resources/protocols/radius/dictionary.microsemi index 7a82486b..3eb23c76 100644 --- a/resources/protocols/radius/dictionary.microsemi +++ b/resources/protocols/radius/dictionary.microsemi @@ -1,10 +1,10 @@ # -*- text -*- -# -# dictionary.microsemi +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # As posted to the list by Simon Butcher <simon.butcher@microsemi.com> # -# Version: $Id: b1a4b3791eb6a29216e80da1d9551666c100e956 $ +# Version: $Id: 68967fa1c86ac3f104b70421980d10bdee0c1b28 $ # VENDOR Microsemi 40676 diff --git a/resources/protocols/radius/dictionary.microsoft b/resources/protocols/radius/dictionary.microsoft index ec51c96e..31f351e7 100644 --- a/resources/protocols/radius/dictionary.microsoft +++ b/resources/protocols/radius/dictionary.microsoft @@ -1,31 +1,48 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Microsoft's VSA's, from RFC 2548 # -# $Id$ +# $Id: 6ba9dd5bedec065f0535f82390a8b6e9cdbaaf0f $ # VENDOR Microsoft 311 BEGIN-VENDOR Microsoft -ATTRIBUTE MS-CHAP-Response 1 octets +ATTRIBUTE MS-CHAP-Response 1 octets[50] ATTRIBUTE MS-CHAP-Error 2 string -ATTRIBUTE MS-CHAP-CPW-1 3 octets -ATTRIBUTE MS-CHAP-CPW-2 4 octets +ATTRIBUTE MS-CHAP-CPW-1 3 octets[70] +ATTRIBUTE MS-CHAP-CPW-2 4 octets[84] ATTRIBUTE MS-CHAP-LM-Enc-PW 5 octets ATTRIBUTE MS-CHAP-NT-Enc-PW 6 octets -##ATTRIBUTE MS-MPPE-Encryption-Policy 7 octets ##[wireshark] -ATTRIBUTE MS-MPPE-Encryption-Policy 7 integer ##[wireshark] +ATTRIBUTE MS-MPPE-Encryption-Policy 7 integer + +VALUE MS-MPPE-Encryption-Policy Encryption-Allowed 1 +VALUE MS-MPPE-Encryption-Policy Encryption-Required 2 + # This is referred to as both singular and plural in the RFC. # Plural seems to make more sense. -##ATTRIBUTE MS-MPPE-Encryption-Type 8 octets ##[wireshark] -##ATTRIBUTE MS-MPPE-Encryption-Types 8 octets ##[wireshark] -ATTRIBUTE MS-MPPE-Encryption-Type 8 integer ##[wireshark] -ATTRIBUTE MS-MPPE-Encryption-Types 8 integer ##[wireshark] +ATTRIBUTE MS-MPPE-Encryption-Type 8 integer +ATTRIBUTE MS-MPPE-Encryption-Types 8 integer + +# The values below from FreeRADIUS are incorrect according to the RFC. +#VALUE MS-MPPE-Encryption-Types RC4-40bit-Allowed 1 +#VALUE MS-MPPE-Encryption-Types RC4-128bit-Allowed 2 +#VALUE MS-MPPE-Encryption-Types RC4-40or128-bit-Allowed 6 +VALUE MS-MPPE-Encryption-Types None 0 ##[wireshark] +VALUE MS-MPPE-Encryption-Types RC4-40 2 ##[wireshark] +VALUE MS-MPPE-Encryption-Types RC4-128 4 ##[wireshark] +VALUE MS-MPPE-Encryption-Types RC4-40-128 6 ##[wireshark] +VALUE MS-MPPE-Encryption-Types Stateless 8 ##[wireshark] +VALUE MS-MPPE-Encryption-Types RC4-40-Stateless 10 ##[wireshark] +VALUE MS-MPPE-Encryption-Types RC4-128-Stateless 12 ##[wireshark] +VALUE MS-MPPE-Encryption-Types RC4-40-128-Stateless 14 ##[wireshark] + ATTRIBUTE MS-RAS-Vendor 9 integer # content is Vendor-ID ATTRIBUTE MS-CHAP-Domain 10 string ATTRIBUTE MS-CHAP-Challenge 11 octets -ATTRIBUTE MS-CHAP-MPPE-Keys 12 octets encrypt=1 +ATTRIBUTE MS-CHAP-MPPE-Keys 12 octets[24] encrypt=1 ATTRIBUTE MS-BAP-Usage 13 integer ATTRIBUTE MS-Link-Utilization-Threshold 14 integer # values are 1-100 ATTRIBUTE MS-Link-Drop-Time-Limit 15 integer @@ -40,16 +57,16 @@ ATTRIBUTE MS-Filter 22 octets ATTRIBUTE MS-Acct-Auth-Type 23 integer ATTRIBUTE MS-Acct-EAP-Type 24 integer -ATTRIBUTE MS-CHAP2-Response 25 octets +ATTRIBUTE MS-CHAP2-Response 25 octets[50] ATTRIBUTE MS-CHAP2-Success 26 octets -ATTRIBUTE MS-CHAP2-CPW 27 octets +ATTRIBUTE MS-CHAP2-CPW 27 octets[68] ATTRIBUTE MS-Primary-DNS-Server 28 ipaddr ATTRIBUTE MS-Secondary-DNS-Server 29 ipaddr ATTRIBUTE MS-Primary-NBNS-Server 30 ipaddr ATTRIBUTE MS-Secondary-NBNS-Server 31 ipaddr -#ATTRIBUTE MS-ARAP-Challenge 33 octets +#ATTRIBUTE MS-ARAP-Challenge 33 octets[8] ## MS-RNAP # @@ -102,21 +119,6 @@ ATTRIBUTE MS-TSG-Device-Redirection 63 integer # # Integer Translations # -# MS-MPPE-Encryption-Policy Values ##[wireshark] - -VALUE MS-MPPE-Encryption-Policy Encryption-Allowed 1 ##[wireshark] -VALUE MS-MPPE-Encryption-Policy Encryption-Required 2 ##[wireshark] - -# MS-MPPE-Encryption-Types Values ##[wireshark] - -VALUE MS-MPPE-Encryption-Types None 0 ##[wireshark] -VALUE MS-MPPE-Encryption-Types RC4-40 2 ##[wireshark] -VALUE MS-MPPE-Encryption-Types RC4-128 4 ##[wireshark] -VALUE MS-MPPE-Encryption-Types RC4-40-128 6 ##[wireshark] -VALUE MS-MPPE-Encryption-Types Stateless 8 ##[wireshark] -VALUE MS-MPPE-Encryption-Types RC4-40-Stateless 10 ##[wireshark] -VALUE MS-MPPE-Encryption-Types RC4-128-Stateless 12 ##[wireshark] -VALUE MS-MPPE-Encryption-Types RC4-40-128-Stateless 14 ##[wireshark] # MS-BAP-Usage Values diff --git a/resources/protocols/radius/dictionary.mikrotik b/resources/protocols/radius/dictionary.mikrotik index 0a37be9b..0f24edc5 100644 --- a/resources/protocols/radius/dictionary.mikrotik +++ b/resources/protocols/radius/dictionary.mikrotik @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# # http://www.mikrotik.com # # http://www.mikrotik.com/documentation//manual_2.9/dictionary @@ -10,7 +12,7 @@ # On top of that, the sample dictionary file they provide # DOES NOT WORK. Do NOT use it. # -# $Id: 59775bb19cb71c0e1e53ae0bca0b5ecefb9706d0 $ +# $Id: 778b35a38f1a6f38847a5be34df3076e7f64cfa2 $ # VENDOR Mikrotik 14988 @@ -43,11 +45,14 @@ ATTRIBUTE Mikrotik-Wireless-Comment 21 string ATTRIBUTE Mikrotik-Delegated-IPv6-Pool 22 string ATTRIBUTE Mikrotik-DHCP-Option-Set 23 string ATTRIBUTE Mikrotik-DHCP-Option-Param-STR1 24 string -ATTRIBUTE Mikortik-DHCP-Option-ParamSTR2 25 string +ATTRIBUTE Mikrotik-DHCP-Option-Param-STR2 25 string +ATTRIBUTE Mikrotik-DHCP-Option-ParamSTR2 25 string ATTRIBUTE Mikrotik-Wireless-VLANID 26 integer -ATTRIBUTE Mikrotik-Wireless-VLANID-Type 27 integer +ATTRIBUTE Mikrotik-Wireless-VLANIDtype 27 integer +ATTRIBUTE Mikrotik-Wireless-VLANID-Type 27 integer ATTRIBUTE Mikrotik-Wireless-Minsignal 28 string ATTRIBUTE Mikrotik-Wireless-Maxsignal 29 string +ATTRIBUTE Mikrotik-Switching-Filter 30 string # MikroTik Values @@ -57,4 +62,7 @@ VALUE Mikrotik-Wireless-Enc-Algo 104-bit-WEP 2 VALUE Mikrotik-Wireless-Enc-Algo AES-CCM 3 VALUE Mikrotik-Wireless-Enc-Algo TKIP 4 +VALUE Mikrotik-Wireless-VLANIDtype 802.1q 0 +VALUE Mikrotik-Wireless-VLANIDtype 802.1ad 1 + END-VENDOR Mikrotik diff --git a/resources/protocols/radius/dictionary.mimosa b/resources/protocols/radius/dictionary.mimosa new file mode 100644 index 00000000..f2138d8b --- /dev/null +++ b/resources/protocols/radius/dictionary.mimosa @@ -0,0 +1,39 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 + +VENDOR Mimosa 43356 + +BEGIN-VENDOR Mimosa + +ATTRIBUTE Mimosa-Device-Configuration-Parameter 1 string +ATTRIBUTE Mimosa-FirmwareVersion-Parameter 2 string +ATTRIBUTE Mimosa-FirmwareLocation-Parameter 3 string +ATTRIBUTE Mimosa-WirelessProtocol-Parameter 4 string +ATTRIBUTE Mimosa-ManagementIPAddressMode-Parameter 5 string +ATTRIBUTE Mimosa-ManagementIPAddress-Parameter 6 ipaddr +ATTRIBUTE Mimosa-ManagementIPNetmask-Parameter 7 ipaddr +ATTRIBUTE Mimosa-ManagementIPGateway-Parameter 8 ipaddr +ATTRIBUTE Mimosa-ManagementVlanStatus-Parameter 9 byte +ATTRIBUTE Mimosa-ManagementVlan-Parameter 10 string +ATTRIBUTE Mimosa-ManagementPassword-Parameter 11 string +ATTRIBUTE Mimosa-DeviceName-Parameter 12 string +ATTRIBUTE Mimosa-TrafficShapingPeak-Parameter 13 string +ATTRIBUTE Mimosa-TrafficShapingCommitted-Parameter 14 string +ATTRIBUTE Mimosa-EthernetPortSpeed-Parameter 15 string +ATTRIBUTE Mimosa-DNS1-Parameter 16 ipaddr +ATTRIBUTE Mimosa-DNS2-Parameter 17 ipaddr +ATTRIBUTE Mimosa-HTTPPort-Parameter 18 integer +ATTRIBUTE Mimosa-EnableHTTPS-Parameter 19 byte +ATTRIBUTE Mimosa-HTTPSPort-Parameter 20 integer +ATTRIBUTE Mimosa-CloudManagement-Parameter 21 byte +ATTRIBUTE Mimosa-EnableSNMP-Parameter 22 byte +ATTRIBUTE Mimosa-SNMPCommunityString-Parameter 23 string +ATTRIBUTE Mimosa-SNMPTrapServer-Parameter 24 ipaddr +ATTRIBUTE Mimosa-NTPServerAddress-Parameter 25 string +ATTRIBUTE Mimosa-EnableSyslog-Parameter 26 byte +ATTRIBUTE Mimosa-SyslogServerAddress-Parameter 27 ipaddr +ATTRIBUTE Mimosa-SyslogPort-Parameter 28 integer +ATTRIBUTE Mimosa-SyslogProtocol-Parameter 29 string + +END-VENDOR Mimosa diff --git a/resources/protocols/radius/dictionary.motorola b/resources/protocols/radius/dictionary.motorola index 04d2f83f..1ad37b16 100644 --- a/resources/protocols/radius/dictionary.motorola +++ b/resources/protocols/radius/dictionary.motorola @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Motorola Canopy attributes. @@ -7,7 +9,7 @@ # NOT included in the main dictionaries because of conflicts # with Ascend attributes. # -# $Id: b88938c0ce689cecf2a8207c050e63556dcd9edf $ +# $Id: 85134893c46182a19aee7d14440300aa8aeb1a6d $ # ############################################################################## @@ -69,18 +71,4 @@ VALUE Motorola-Canopy-UserLevel TECH 1 VALUE Motorola-Canopy-UserLevel INSTALL 2 VALUE Motorola-Canopy-UserLevel ADMIN 3 -ATTRIBUTE Motorola-Canopy-Shared-Secret 224 string -ATTRIBUTE Motorola-Canopy-SULDR 225 string -ATTRIBUTE Motorola-Canopy-SDLDR 226 string -ATTRIBUTE Motorola-Canopy-ULBA 227 string -ATTRIBUTE Motorola-Canopy-DLBA 228 string -ATTRIBUTE Motorola-Canopy-Enable 229 string -ATTRIBUTE Motorola-Canopy-LPSULDR 230 string -ATTRIBUTE Motorola-Canopy-LPSDLDR 231 string -ATTRIBUTE Motorola-Canopy-HPCENABLE 232 string -ATTRIBUTE Motorola-Canopy-HPSULDR 233 string -ATTRIBUTE Motorola-Canopy-HPSDLDR 234 string -ATTRIBUTE Motorola-Canopy-HIGHERBW 235 string -ATTRIBUTE Motorola-Canopy-CIRENABLE 236 string - END-VENDOR Motorola diff --git a/resources/protocols/radius/dictionary.motorola.illegal b/resources/protocols/radius/dictionary.motorola.illegal new file mode 100644 index 00000000..e82bda90 --- /dev/null +++ b/resources/protocols/radius/dictionary.motorola.illegal @@ -0,0 +1,29 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# Motorola Canopy attributes. +# +# See also dictionary.motorola.illegal. You can use that one +# by listing it in raddb/dictionary. +# +# $Id: bbddb370e49cb87443e6e21dbf8f18884a33cc98 $ +# +############################################################################## + +ATTRIBUTE Motorola-Canopy-Shared-Secret 224 string +ATTRIBUTE Motorola-Canopy-SULDR 225 string +ATTRIBUTE Motorola-Canopy-SDLDR 226 string +ATTRIBUTE Motorola-Canopy-ULBA 227 string +ATTRIBUTE Motorola-Canopy-DLBA 228 string +ATTRIBUTE Motorola-Canopy-Enable 229 string +ATTRIBUTE Motorola-Canopy-LPSULDR 230 string +ATTRIBUTE Motorola-Canopy-LPSDLDR 231 string +ATTRIBUTE Motorola-Canopy-HPCENABLE 232 string +ATTRIBUTE Motorola-Canopy-HPSULDR 233 string +ATTRIBUTE Motorola-Canopy-HPSDLDR 234 string +ATTRIBUTE Motorola-Canopy-HIGHERBW 235 string +ATTRIBUTE Motorola-Canopy-CIRENABLE 236 string + diff --git a/resources/protocols/radius/dictionary.motorola.wimax b/resources/protocols/radius/dictionary.motorola.wimax index 0477366b..4886fe3e 100644 --- a/resources/protocols/radius/dictionary.motorola.wimax +++ b/resources/protocols/radius/dictionary.motorola.wimax @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Motorola WiMAX attributes. # -# $Id: 9948cdc1d706b3683b149b30835753e60dd010f4 $ +# $Id: 5920af1eea654a0eefcc7ce4526becb7eb8aa56e $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.navini b/resources/protocols/radius/dictionary.navini index 2ecf43fb..7103465a 100644 --- a/resources/protocols/radius/dictionary.navini +++ b/resources/protocols/radius/dictionary.navini @@ -1,12 +1,13 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # dictionary.navini # # By # "Paul Shields" <pshields@navini.com> # -# Version: $Id: 63c127d7ef1b468b23ae8a729aceae5299209b2a $ +# Version: $Id: 24e644e69f5de8d0aaebfc830747a555254f172a $ # VENDOR Navini 6504 diff --git a/resources/protocols/radius/dictionary.net b/resources/protocols/radius/dictionary.net new file mode 100644 index 00000000..e14192a5 --- /dev/null +++ b/resources/protocols/radius/dictionary.net @@ -0,0 +1,132 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +# From https://support.sonus.net/display/UXDOC50/Vendor+Specific+Attributes+Reference + +VENDOR NET 177 + +BEGIN-VENDOR NET + +# MSC/Media related attributes +ATTRIBUTE NET-Fwd-Flow-In-Realm 11 string # unsupported +ATTRIBUTE NET-Fwd-Flow-In-Src-Addr 12 string +ATTRIBUTE NET-Fwd-Flow-In-Src-Port 13 integer +ATTRIBUTE NET-Fwd-Flow-In-Dst-Addr 14 string +ATTRIBUTE NET-Fwd-Flow-In-Dst-Port 15 integer +ATTRIBUTE NET-Fwd-Flow-Out-Realm 16 string # unsupported +ATTRIBUTE NET-Fwd-Flow-Out-Src-Addr 17 string +ATTRIBUTE NET-Fwd-Flow-Out-Src-Port 18 integer +ATTRIBUTE NET-Fwd-Flow-Out-Dst-Addr 19 string +ATTRIBUTE NET-Fwd-Flow-Out-Dst-Port 20 integer +ATTRIBUTE NET-Bwd-Flow-In-Realm 21 string # unsupported +ATTRIBUTE NET-Bwd-Flow-In-Src-Addr 22 string +ATTRIBUTE NET-Bwd-Flow-In-Src-Port 23 integer +ATTRIBUTE NET-Bwd-Flow-In-Dst-Addr 24 string +ATTRIBUTE NET-Bwd-Flow-In-Dst-Port 25 integer +ATTRIBUTE NET-Bwd-Flow-Out-Realm 26 string # unsupported +ATTRIBUTE NET-Bwd-Flow-Out-Src-Addr 27 string +ATTRIBUTE NET-Bwd-Flow-Out-Src-Port 28 integer +ATTRIBUTE NET-Bwd-Flow-Out-Dst-Addr 29 string +ATTRIBUTE NET-Bwd-Flow-Out-Dst-Port 30 integer +ATTRIBUTE NET-Fwd-Flow-Media-Type 31 string +ATTRIBUTE NET-Fwd-Flow-PTime 32 integer +ATTRIBUTE NET-Fwd-Octets 33 integer +ATTRIBUTE NET-Fwd-Packets 34 integer +ATTRIBUTE NET-Fwd-RTCP-Packets-Lost 35 integer # future +ATTRIBUTE NET-Fwd-RTCP-Avg-Jitter 36 integer # future +ATTRIBUTE NET-Fwd-RTP-Avg-Latency 37 integer +ATTRIBUTE NET-Fwd-RTCP-MaxJitter 38 integer # future +ATTRIBUTE NET-Fwd-RTP-MaxLatency 39 integer +ATTRIBUTE NET-Fwd-RTP-Packets-Lost 40 integer +ATTRIBUTE NET-Fwd-RTP-Avg-Jitter 41 integer +ATTRIBUTE NET-Fwd-RTP-MaxJitter 42 integer +ATTRIBUTE NET-Bwd-Octets 43 integer +ATTRIBUTE NET-Bwd-Packets 44 integer +ATTRIBUTE NET-Bwd-RTCP-Packets-Lost 45 integer # future +ATTRIBUTE NET-Bwd-RTCP-Avg-Jitter 46 integer # future +ATTRIBUTE NET-Bwd-RTP-Avg-Latency 47 integer +ATTRIBUTE NET-Bwd-RTCP-MaxJitter 48 integer # future +ATTRIBUTE NET-Bwd-RTP-MaxLatency 49 integer +ATTRIBUTE NET-Bwd-RTP-Packets-Lost 50 integer +ATTRIBUTE NET-Bwd-RTP-Avg-Jitter 51 integer +ATTRIBUTE NET-Bwd-RTP-MaxJitter 52 integer + +# Generic Session and Signaling Group related metrics +ATTRIBUTE NET-Session-Ingress-CallId 60 integer +ATTRIBUTE NET-Session-Egress-CallId 61 integer +ATTRIBUTE NET-Session-Generic-Id 62 integer +ATTRIBUTE NET-Routing-Table-Number 63 integer +ATTRIBUTE NET-Ingress-Signaling-Group 64 integer +ATTRIBUTE NET-Egress-Signaling-Group 65 integer +ATTRIBUTE NET-Primary-Routing-Number 66 string +ATTRIBUTE NET-Egress-Final-Routing-Num 67 string +ATTRIBUTE NET-Ingress-Channel-Number 68 integer +ATTRIBUTE NET-Egress-Channel-Number 69 integer +ATTRIBUTE NET-Call-Type 70 integer +ATTRIBUTE NET-Call-Origin 71 integer +ATTRIBUTE NET-Calling-Number 72 string +ATTRIBUTE NET-Called-Number 73 string +ATTRIBUTE NET-Calling-Name 74 string +ATTRIBUTE NET-Disconnect-Cause 75 integer +ATTRIBUTE NET-Abort-Cause 76 integer +ATTRIBUTE NET-Ingress-Channel-Id 77 string +ATTRIBUTE NET-Egress-Channel-Id 78 string +ATTRIBUTE NET-Call-Priority 79 string + +# Generic Call related attributes +ATTRIBUTE NET-Call-Number-Type 90 string +ATTRIBUTE NET-Call-Plan 91 string +ATTRIBUTE NET-Original-Called-Number 92 string +ATTRIBUTE NET-Original-Called-Type 93 string +ATTRIBUTE NET-Original-Called-Plan 94 string +ATTRIBUTE NET-Called-Name 95 string +ATTRIBUTE NET-Namespace 96 string +ATTRIBUTE NET-Precedence 97 string +ATTRIBUTE NET-Presentation 98 string +ATTRIBUTE NET-Screening 99 string +ATTRIBUTE NET-Transfer-Capability 100 string +ATTRIBUTE NET-Transfer-Mode 101 string +ATTRIBUTE NET-Transfer-Rate 102 string +ATTRIBUTE NET-User-Rate 103 string + +# Generic time related attributes +ATTRIBUTE NET-Setup-Time 110 string +ATTRIBUTE NET-Alert-Time 111 string +ATTRIBUTE NET-Connect-Time 112 string +ATTRIBUTE NET-Disconnect-Time 113 string +ATTRIBUTE NET-Inbound-Seize-Time 114 string +ATTRIBUTE NET-Outbound-Seize-Time 115 string +ATTRIBUTE NET-Call-Duration 116 integer +ATTRIBUTE NET-Post-Dial-Delay 117 integer +ATTRIBUTE NET-Disconnect-Initiator 118 integer + +# SIP related +ATTRIBUTE NET-P-Asserted-ID 130 string +ATTRIBUTE NET-SIP-Diversion 131 string +ATTRIBUTE NET-Ingress-Local-Addr 132 string +ATTRIBUTE NET-Ingress-Remote-Addr 133 string +ATTRIBUTE NET-Egress-Local-Addr 134 string +ATTRIBUTE NET-Egress-Remote-Addr 135 string +ATTRIBUTE NET-Ingress-Net-Interface-Id 136 integer +ATTRIBUTE NET-Egress-Net-Interface-Id 137 integer +ATTRIBUTE NET-Refer-Call-Transfer-Id 138 string +ATTRIBUTE NET-Session-Forked-Call-Id 139 string +ATTRIBUTE NET-Redirect-Number 140 string +ATTRIBUTE NET-Redirect-Ip-Address 141 string +ATTRIBUTE NET-Session-Ingress-Realm 142 string +ATTRIBUTE NET-Session-Egress-Realm 143 string +ATTRIBUTE NET-Ingress-Signaling-Port-Num 144 integer +ATTRIBUTE NET-Egress-Signaling-Port-Num 145 integer +ATTRIBUTE NET-Transport-Type 146 integer +ATTRIBUTE NET-P-Preferred-ID 147 string +ATTRIBUTE NET-Replaced-Header 148 string + +# Generic parameters +ATTRIBUTE NET-Firmware-Version 160 string +ATTRIBUTE NET-Local-Time-Zone 161 string +ATTRIBUTE NET-Gw-Id 162 string +ATTRIBUTE NET-Time-And-Day 163 string +ATTRIBUTE NET-Log-Time 164 string + +END-VENDOR NET diff --git a/resources/protocols/radius/dictionary.netelastic b/resources/protocols/radius/dictionary.netelastic new file mode 100644 index 00000000..79dc52cd --- /dev/null +++ b/resources/protocols/radius/dictionary.netelastic @@ -0,0 +1,55 @@ +# -*- text -*- +# Copyright (C) 2022 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# Dictionary for NetElastic. +# +# $Id: 96cdef06c2492e3d28b70931357ab7b6c2074eca $ +# +############################################################################## + +VENDOR NetElastic 54268 + +BEGIN-VENDOR NetElastic + +ATTRIBUTE NetElastic-Input-Burst-Size 1 integer +ATTRIBUTE NetElastic-Input-Average-Rate 2 integer +ATTRIBUTE NetElastic-Input-Peak-Rate 3 integer +ATTRIBUTE NetElastic-Output-Burst-Size 4 integer +ATTRIBUTE NetElastic-Output-Average-Rate 5 integer +ATTRIBUTE NetElastic-Output-Peak-Rate 6 integer +ATTRIBUTE NetElastic-Remanent-Volume 15 integer +ATTRIBUTE NetElastic-ISP-ID 17 string +ATTRIBUTE NetElastic-PortalURL 27 string +ATTRIBUTE NetElastic-Qos-Profile-Name 31 string +ATTRIBUTE NetElastic-Lease-Time 74 integer +ATTRIBUTE NetElastic-Input-Peak-Burst-Size 77 integer +ATTRIBUTE NetElastic-Output-Peak-Burst-Size 78 integer +ATTRIBUTE NetElastic-Data-Filter 82 string +ATTRIBUTE NetElastic-Portal-Mode 85 integer +ATTRIBUTE NetElastic-Policy-Name 95 string +ATTRIBUTE NetElastic-Primary-DNS 135 ipaddr +ATTRIBUTE NetElastic-Secondary-DNS 136 ipaddr +ATTRIBUTE NetElastic-Domain-Name 138 string +ATTRIBUTE NetElastic-HTTP-Redirect-URL 140 string +ATTRIBUTE NetElastic-Acct-IPv6-Input-Octets 144 integer +ATTRIBUTE NetElastic-Acct-IPv6-Output-Octets 145 integer +ATTRIBUTE NetElastic-Acct-IPv6-Input-Packets 146 integer +ATTRIBUTE NetElastic-Acct-IPv6-Output-Packets 147 integer +ATTRIBUTE NetElastic-Acct-IPv6-Input-Gigawords 148 integer +ATTRIBUTE NetElastic-Acct-IPv6-Output-Gigawords 149 integer +ATTRIBUTE NetElastic-User-Mac 153 string +ATTRIBUTE NetElastic-Framed-IPv6-Address 158 ipv6addr +ATTRIBUTE NetElastic-NAT-Public-Address 161 ipaddr +ATTRIBUTE NetElastic-NAT-Start-Port 162 integer +ATTRIBUTE NetElastic-NAT-End-Port 163 integer +ATTRIBUTE NetElastic-Tariff-Input-Octets 247 string +ATTRIBUTE NetElastic-Tariff-Output-Octets 248 string +ATTRIBUTE NetElastic-Tariff-Input-Gigawords 249 string +ATTRIBUTE NetElastic-Tariff-Output-Gigawords 250 string +ATTRIBUTE NetElastic-Remanent-Volume-Type 251 integer +ATTRIBUTE NetElastic-Web-COA 252 integer + +END-VENDOR NetElastic diff --git a/resources/protocols/radius/dictionary.netscreen b/resources/protocols/radius/dictionary.netscreen index e650ad71..3419b5e1 100644 --- a/resources/protocols/radius/dictionary.netscreen +++ b/resources/protocols/radius/dictionary.netscreen @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # From: # http://www.netscreen.com/support/downloads/4.0_configuring_screenOS_for_NTdomain_v11.pdf diff --git a/resources/protocols/radius/dictionary.networkphysics b/resources/protocols/radius/dictionary.networkphysics index 9e318866..0c087dc9 100644 --- a/resources/protocols/radius/dictionary.networkphysics +++ b/resources/protocols/radius/dictionary.networkphysics @@ -1,8 +1,9 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # NetworkPhysics dictionary -# $Id: 156f35292abc5d27b4fa22f4ac727bbe81b0673c $ +# $Id: 7e09519d1a3497edbb99545a4dab8c15befc169f $ # VENDOR NetworkPhysics 7119 diff --git a/resources/protocols/radius/dictionary.nexans b/resources/protocols/radius/dictionary.nexans index e8f65205..656cec07 100644 --- a/resources/protocols/radius/dictionary.nexans +++ b/resources/protocols/radius/dictionary.nexans @@ -1,9 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # Nexans Active Networking Systems dictionary http://www.nexans.de/ans # -# Version: $Id: a72140d0a1785fc47e0a23e74d3312b6e7f51fe2 $ +# Version: $Id: a4f62103ea6504b8580edeab529c5643d1a89518 $ # # Hubert Theissen <h.theissen@nexans.com> # diff --git a/resources/protocols/radius/dictionary.nile b/resources/protocols/radius/dictionary.nile new file mode 100644 index 00000000..165b6c58 --- /dev/null +++ b/resources/protocols/radius/dictionary.nile @@ -0,0 +1,20 @@ +# -*- text -*- +# Copyright (C) 2022 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# https://nilesecure.co/ +# +# $Id: 95f9545fe57942108c76b406bb4daf5ab7c0e017 $ +# +############################################################################## + +VENDOR Nile 58313 +BEGIN-VENDOR Nile + +ATTRIBUTE Nile-Redirect-URL 1 string +ATTRIBUTE Nile-Netseg 2 string +ATTRIBUTE Nile-AVPair 3 string + +END-VENDOR Nile diff --git a/resources/protocols/radius/dictionary.nokia b/resources/protocols/radius/dictionary.nokia index ffe658c4..77cb9e41 100644 --- a/resources/protocols/radius/dictionary.nokia +++ b/resources/protocols/radius/dictionary.nokia @@ -1,9 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ###################################################################### # # Nokia dictionary -# $Id: a55f0b68b4adfea317f4e7b45ddc234a309add6b $ +# $Id: d522ff7d9bdff9dad68536b584b4b2a8c4a4e695 $ # ###################################################################### diff --git a/resources/protocols/radius/dictionary.nokia.conflict b/resources/protocols/radius/dictionary.nokia.conflict index 4215edd8..8b700a35 100644 --- a/resources/protocols/radius/dictionary.nokia.conflict +++ b/resources/protocols/radius/dictionary.nokia.conflict @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Nokia dictionary for attributes that conflict with other dictionaries. # -# $Id: 5a34a137f14a01216f1c89ff3709ad2763f0286c $ +# $Id: 5ff9fda0cb4bd3b4e0a6d1196a9d2341c227a21d $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.nomadix b/resources/protocols/radius/dictionary.nomadix index 36f72047..cae1cb1b 100644 --- a/resources/protocols/radius/dictionary.nomadix +++ b/resources/protocols/radius/dictionary.nomadix @@ -1,7 +1,8 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # -# Version: $Id: 9f90097e3c640a1e4aad2b0cb5ff91a59d890704 $ +# Version: $Id: 31938ba39e5980af917485e5e471c284c40c4c83 $ # VENDOR Nomadix 3309 # diff --git a/resources/protocols/radius/dictionary.nortel b/resources/protocols/radius/dictionary.nortel index 0e58bf3a..282d15a5 100644 --- a/resources/protocols/radius/dictionary.nortel +++ b/resources/protocols/radius/dictionary.nortel @@ -1,12 +1,14 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# Version $Id: 9f6ac833faf9e4badbc09b5b0d1980d86d0b0fd6 $ ############################################################################## # # Nortel Passport 8600 VSA's. # # http://www142.nortelnetworks.com/bvdoc/setips/july04/engineeringtipstricksv12.pdf # -# $Id: 922991260cb7c3fc61b0f41b59503c05fc2cf370 $ +# $Id: 9f6ac833faf9e4badbc09b5b0d1980d86d0b0fd6 $ # ############################################################################## @@ -17,6 +19,18 @@ ATTRIBUTE Nortel-User-Role 110 string ATTRIBUTE Nortel-Privilege-Level 166 integer +ATTRIBUTE Fabric-Attach-VLAN-Create 170 integer +ATTRIBUTE Fabric-Attach-VLAN-ISID 171 string +ATTRIBUTE Fabric-Attach-VLAN-PVID 172 integer + +ATTRIBUTE Fabric-Attach-Switch-Mode 180 integer +ATTRIBUTE Fabric-Attach-Client-Id 181 string +ATTRIBUTE Fabric-Attach-Client-Type 182 string +ATTRIBUTE Fabric-Attach-Client-PSK 183 integer +ATTRIBUTE Fabric-Attach-Client-Trust 184 integer +ATTRIBUTE Fabric-Attach-Client-Trusted-Binding 185 string +ATTRIBUTE Fabric-Attach-Service-Request 186 string + ATTRIBUTE Passport-Command-Scope 200 integer ATTRIBUTE Passport-Command-Impact 201 integer ATTRIBUTE Passport-Customer-Identifier 202 integer @@ -26,6 +40,9 @@ ATTRIBUTE Passport-Login-Directory 205 string ATTRIBUTE Passport-Timeout-Protocol 206 integer ATTRIBUTE Passport-Role 207 string +VALUE Fabric-Attach-VLAN-Create No 0 +VALUE Fabric-Attach-VLAN-Create Yes 1 + VALUE Nortel-Privilege-Level VoiceMailAdmin 0 VALUE Nortel-Privilege-Level ContactCenter 1 VALUE Nortel-Privilege-Level SBAInstaller 2 diff --git a/resources/protocols/radius/dictionary.ntua b/resources/protocols/radius/dictionary.ntua index d637869e..7b354236 100644 --- a/resources/protocols/radius/dictionary.ntua +++ b/resources/protocols/radius/dictionary.ntua @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# VENDOR NTUA 969 BEGIN-VENDOR NTUA diff --git a/resources/protocols/radius/dictionary.openser b/resources/protocols/radius/dictionary.openser index 9e4686cf..cff95a81 100644 --- a/resources/protocols/radius/dictionary.openser +++ b/resources/protocols/radius/dictionary.openser @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # OpenSER dictionary. @@ -13,7 +15,7 @@ # # http://www.openser.org/docs/openser-radius-1.0.x.html # -# $Id: 03051dd30d139189d6572c8ce78b13edf3aa3484 $ +# $Id: 86e7a2aba8334a16a1026050305cc5c56f79da12 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.openwifi b/resources/protocols/radius/dictionary.openwifi new file mode 100644 index 00000000..50f62a32 --- /dev/null +++ b/resources/protocols/radius/dictionary.openwifi @@ -0,0 +1,25 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# OpenWiFi +# +# $Id: 794ad6604766c76430f17deb3bda722122e07d99 $ +# +############################################################################## + +# +# Assigned to the Telecom Infra project, but used for OpenWifi +# +VENDOR OpenWiFi 58888 + +BEGIN-VENDOR OpenWiFi + +# +# As lowercase hex, with dashes between bytes. +# +ATTRIBUTE OpenWiFi-AP-MAC-Address 1 string + +END-VENDOR OpenWiFi diff --git a/resources/protocols/radius/dictionary.packeteer b/resources/protocols/radius/dictionary.packeteer index 76afa722..d452900d 100644 --- a/resources/protocols/radius/dictionary.packeteer +++ b/resources/protocols/radius/dictionary.packeteer @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Packeteer VSAs, who followed the Cisco way of putting everything @@ -7,7 +9,7 @@ # # Packeteer was acquired by Blue Coat in 2008. # -# $Id: 7594ada9e367d965bc981caa237838b46f1af2ec $ +# $Id: d538ac1c413fa7af0af1fe30d6e805bc54717eed $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.paloalto b/resources/protocols/radius/dictionary.paloalto index 2429c1da..69711d25 100644 --- a/resources/protocols/radius/dictionary.paloalto +++ b/resources/protocols/radius/dictionary.paloalto @@ -1,10 +1,13 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2021 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# Version $Id: 2025932cabed172377132d22b3dcbdef92725eb8 $ +# ############################################################################## # # Palo Alto Networks. # -# $Id: 0d2e46353ac931a0b901f6007b6dd0222875bb23 $ +# $Id: 2025932cabed172377132d22b3dcbdef92725eb8 $ # ############################################################################## @@ -17,5 +20,10 @@ ATTRIBUTE PaloAlto-Admin-Access-Domain 2 string ATTRIBUTE PaloAlto-Panorama-Admin-Role 3 string ATTRIBUTE PaloAlto-Panorama-Admin-Access-Domain 4 string ATTRIBUTE PaloAlto-User-Group 5 string +ATTRIBUTE PaloAlto-User-Domain 6 string +ATTRIBUTE PaloAlto-Client-Source-IP 7 string +ATTRIBUTE PaloAlto-Client-OS 8 string +ATTRIBUTE PaloAlto-Client-Hostname 9 string +ATTRIBUTE PaloAlto-GlobalProtect-Client-Version 10 string END-VENDOR PaloAlto diff --git a/resources/protocols/radius/dictionary.patton b/resources/protocols/radius/dictionary.patton index 2bbb4468..0448d220 100644 --- a/resources/protocols/radius/dictionary.patton +++ b/resources/protocols/radius/dictionary.patton @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # dictionary.patton # Dictionary for Patton IADs. @@ -8,18 +9,21 @@ # # Version: @(#)dictionary.patton 5.00 urtho 20-Jan-2010 # Version: @(#)dictionary.patton 1.00 urtho 08-Sep-2006 -# $Id: a2b6eb15b5593bec3a0530ac6a62d8655f03bc5b $ +# $Id: 66b41c7541b9190d149e946480b84f8f539ce584 $ VENDOR Patton 1768 BEGIN-VENDOR Patton ATTRIBUTE Patton-Protocol 16 string +ATTRIBUTE Patton-Group 17 string +ATTRIBUTE Patton-Web-Privilege-Level 18 string ATTRIBUTE Patton-Setup-Time 32 string ATTRIBUTE Patton-Connect-Time 33 string ATTRIBUTE Patton-Disconnect-Time 34 string ATTRIBUTE Patton-Disconnect-Cause 35 integer ATTRIBUTE Patton-Disconnect-Source 36 string +ATTRIBUTE Patton-Disconnect-Reason 37 string ATTRIBUTE Patton-Called-Unique-Id 48 string ATTRIBUTE Patton-Called-IP-Address 49 ipaddr ATTRIBUTE Patton-Called-Numbering-Plan 50 string diff --git a/resources/protocols/radius/dictionary.perle b/resources/protocols/radius/dictionary.perle index 39bee3ef..01242c63 100644 --- a/resources/protocols/radius/dictionary.perle +++ b/resources/protocols/radius/dictionary.perle @@ -1,3 +1,5 @@ +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Perle dictionary. # diff --git a/resources/protocols/radius/dictionary.pfsense b/resources/protocols/radius/dictionary.pfsense new file mode 100644 index 00000000..c211a6f7 --- /dev/null +++ b/resources/protocols/radius/dictionary.pfsense @@ -0,0 +1,18 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# +# dictionary.pfsense +# pfSense Captive Portal Dictionary +# +# https://github.com/pfsense/pfsense/blob/master/src/usr/share/doc/radius/dictionary.pfsense +# + +VENDOR pfSense 13644 + +BEGIN-VENDOR pfSense + +ATTRIBUTE pfSense-Bandwidth-Max-Up 1 integer +ATTRIBUTE pfSense-Bandwidth-Max-Down 2 integer +ATTRIBUTE pfSense-Max-Total-Octets 3 integer + +END-VENDOR pfSense diff --git a/resources/protocols/radius/dictionary.pica8 b/resources/protocols/radius/dictionary.pica8 new file mode 100644 index 00000000..7f69e349 --- /dev/null +++ b/resources/protocols/radius/dictionary.pica8 @@ -0,0 +1,20 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# Version $Id: e3a15aa75e95ac2ffb48855266fb4c5e01f9face $ +# +# Pica8 RADIUS attributes +# For general information please visit: +# http://www.pica8.com +# + +VENDOR Pica8 35098 + +BEGIN-VENDOR Pica8 + +ATTRIBUTE Pica8-AVPair 1 string +ATTRIBUTE Pica8-IP-Downloadable-ACL-Rule 2 string +ATTRIBUTE Pica8-IP-Downloadable-ACL-Name 3 string +ATTRIBUTE Pica8-Redirect-URL 4 string + +END-VENDOR Pica8 diff --git a/resources/protocols/radius/dictionary.propel b/resources/protocols/radius/dictionary.propel index 0e3815f2..5eed9386 100644 --- a/resources/protocols/radius/dictionary.propel +++ b/resources/protocols/radius/dictionary.propel @@ -1,9 +1,8 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # -# Found on the net. -# -# $Id: d0bd8659802146891a130a25bd5c257a350aeae4 $ +# $Id: d3eaac9e46b13bcab18631d6cf0d33a862a48bc2 $ # VENDOR Propel 14895 diff --git a/resources/protocols/radius/dictionary.prosoft b/resources/protocols/radius/dictionary.prosoft index 1c7b8c03..a492dd1d 100644 --- a/resources/protocols/radius/dictionary.prosoft +++ b/resources/protocols/radius/dictionary.prosoft @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Prosoft, as posted to the list. # -# $Id: 781a0cd32c589544853af7fa71cb9e7d7929ad36 $ +# $Id: 7b20339454785db192589f01c01f254131d24978 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.proxim b/resources/protocols/radius/dictionary.proxim index 3436a8ae..d32c5101 100644 --- a/resources/protocols/radius/dictionary.proxim +++ b/resources/protocols/radius/dictionary.proxim @@ -1,9 +1,10 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Dictionary for Proxim Wireless. # -# $Id: b2bf0f538aaafa3382d186617cdb90bf16227d3e $ +# $Id: 58f29d796a49375a117a4ea866a3b5d5e000e224 $ # VENDOR Proxim 841 diff --git a/resources/protocols/radius/dictionary.purewave b/resources/protocols/radius/dictionary.purewave index d194fcd8..b7f4ac60 100644 --- a/resources/protocols/radius/dictionary.purewave +++ b/resources/protocols/radius/dictionary.purewave @@ -1,9 +1,10 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Purewave Networks Base Station # -# $Id: 0ed5730e582e7f7106fb9c5db5dbb6c0b1e1e296 $ +# $Id: 7944e82fcd9563c0eaf9ce191e5409da131e28b6 $ # VENDOR Purewave 21074 diff --git a/resources/protocols/radius/dictionary.quiconnect b/resources/protocols/radius/dictionary.quiconnect index 3c6696ac..bbd1c686 100644 --- a/resources/protocols/radius/dictionary.quiconnect +++ b/resources/protocols/radius/dictionary.quiconnect @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Quiconnect VSA's. # -# $Id: 4ed346891295faefb5c7f451f36c0a7d8a8e577a $ +# $Id: 5504cc286d30772d34ff5192644c9a6bc854732a $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.quintum b/resources/protocols/radius/dictionary.quintum index f61c944a..c5d85e3e 100644 --- a/resources/protocols/radius/dictionary.quintum +++ b/resources/protocols/radius/dictionary.quintum @@ -1,12 +1,13 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # dictionary.quintum # # Copied mostly from the Cisco dictionary, by # Jeremy McNamara <jj@indie.org> # -# Version: $Id: 1e919243f377939a5523c7c9e28cc98bed30217f $ +# Version: $Id: 1750645cb859cebcf347608cc65e98e777fbb535 $ # VENDOR Quintum 6618 diff --git a/resources/protocols/radius/dictionary.rcntec b/resources/protocols/radius/dictionary.rcntec new file mode 100644 index 00000000..e1734ef2 --- /dev/null +++ b/resources/protocols/radius/dictionary.rcntec @@ -0,0 +1,19 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# Version $Id: a1cdae175b1c7b74f40216eb52d11f5b50af0eec $ +########################################################### +# Resilient Cloud Network Technologies (RCNTEC) +# Dictionary for RCNTEC's RPCM hardware, https://rpcm.pro +# Contributed by Sergey Minakov <ser@rcntec.com> +# +# +########################################################### + +VENDOR RCNTEC 46235 +BEGIN-VENDOR RCNTEC + +ATTRIBUTE RCNTEC-RPCM-Group 1 string +ATTRIBUTE RCNTEC-RPCM-Session-Expire 2 integer + +END-VENDOR RCNTEC diff --git a/resources/protocols/radius/dictionary.redcreek b/resources/protocols/radius/dictionary.redcreek index 021af51f..876afb45 100644 --- a/resources/protocols/radius/dictionary.redcreek +++ b/resources/protocols/radius/dictionary.redcreek @@ -1,8 +1,9 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # http://www.redcreek.com -# $Id: a5e286770d6c10293f0a8c22ebfb6c04a4ca9da9 $ +# $Id: d8a5f86907bb429a7d2ada787e1e0374562d6d2a $ # VENDOR RedCreek 1958 diff --git a/resources/protocols/radius/dictionary.rfc2865 b/resources/protocols/radius/dictionary.rfc2865 index 2edcb9f6..f6e51fff 100644 --- a/resources/protocols/radius/dictionary.rfc2865 +++ b/resources/protocols/radius/dictionary.rfc2865 @@ -1,9 +1,11 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 2865. # http://www.ietf.org/rfc/rfc2865.txt # -# $Id$ +# $Id: 6e2319a96710c2a341e24133abd81fde98a6eb55 $ # ATTRIBUTE User-Name 1 string ATTRIBUTE User-Password 2 string encrypt=1 @@ -30,7 +32,7 @@ ATTRIBUTE Framed-Route 22 string ATTRIBUTE Framed-IPX-Network 23 ipaddr ATTRIBUTE State 24 octets ATTRIBUTE Class 25 octets -ATTRIBUTE Vendor-Specific 26 octets +ATTRIBUTE Vendor-Specific 26 vsa ATTRIBUTE Session-Timeout 27 integer ATTRIBUTE Idle-Timeout 28 integer ATTRIBUTE Termination-Action 29 integer diff --git a/resources/protocols/radius/dictionary.rfc2866 b/resources/protocols/radius/dictionary.rfc2866 index a6d78ea6..34332e97 100644 --- a/resources/protocols/radius/dictionary.rfc2866 +++ b/resources/protocols/radius/dictionary.rfc2866 @@ -1,9 +1,11 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors# +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 2866. # http://www.ietf.org/rfc/rfc2866.txt # -# $Id$ +# $Id: 4b6bda40c1098b488c0f10414c287004790df486 $ # ATTRIBUTE Acct-Status-Type 40 integer ATTRIBUTE Acct-Delay-Time 41 integer @@ -22,6 +24,7 @@ ATTRIBUTE Acct-Link-Count 51 integer VALUE Acct-Status-Type Start 1 VALUE Acct-Status-Type Stop 2 +VALUE Acct-Status-Type Alive 3 # dup VALUE Acct-Status-Type Interim-Update 3 VALUE Acct-Status-Type Accounting-On 7 VALUE Acct-Status-Type Accounting-Off 8 diff --git a/resources/protocols/radius/dictionary.rfc2867 b/resources/protocols/radius/dictionary.rfc2867 index 515f6317..9a6cae9f 100644 --- a/resources/protocols/radius/dictionary.rfc2867 +++ b/resources/protocols/radius/dictionary.rfc2867 @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 2867. # http://www.ietf.org/rfc/rfc2867.txt # -# $Id: eb80d3c3f20d596758b768dd2c09cf0420ff71fb $ +# $Id: 821f860b452b3cfc6c7f7d0023601a3192c8f1b4 $ # ATTRIBUTE Acct-Tunnel-Connection 68 string ATTRIBUTE Acct-Tunnel-Packets-Lost 86 integer diff --git a/resources/protocols/radius/dictionary.rfc2868 b/resources/protocols/radius/dictionary.rfc2868 index 30ed8975..9bf5592f 100644 --- a/resources/protocols/radius/dictionary.rfc2868 +++ b/resources/protocols/radius/dictionary.rfc2868 @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 2868. # http://www.ietf.org/rfc/rfc2868.txt # -# $Id: 1d3e829f5248162add8f94227bcefd406d0305a8 $ +# $Id: 8535eef3c6d21b74d5642a3c1482124c84e61dbb $ # ATTRIBUTE Tunnel-Type 64 integer has_tag ATTRIBUTE Tunnel-Medium-Type 65 integer has_tag diff --git a/resources/protocols/radius/dictionary.rfc2869 b/resources/protocols/radius/dictionary.rfc2869 index 94f86f9a..1927f5a3 100644 --- a/resources/protocols/radius/dictionary.rfc2869 +++ b/resources/protocols/radius/dictionary.rfc2869 @@ -1,17 +1,19 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 2869. # http://www.ietf.org/rfc/rfc2869.txt # -# $Id$ +# $Id: 4dd40fef07deeb14e5dcce7434ffa9ac573d7107 $ # ATTRIBUTE Acct-Input-Gigawords 52 integer ATTRIBUTE Acct-Output-Gigawords 53 integer ATTRIBUTE Event-Timestamp 55 date -ATTRIBUTE ARAP-Password 70 octets # 16 octets of data -ATTRIBUTE ARAP-Features 71 octets # 14 octets of data +ATTRIBUTE ARAP-Password 70 octets[16] +ATTRIBUTE ARAP-Features 71 octets[14] ATTRIBUTE ARAP-Zone-Access 72 integer ATTRIBUTE ARAP-Security 73 integer ATTRIBUTE ARAP-Security-Data 74 string @@ -19,10 +21,10 @@ ATTRIBUTE Password-Retry 75 integer ATTRIBUTE Prompt 76 integer ATTRIBUTE Connect-Info 77 string ATTRIBUTE Configuration-Token 78 string -ATTRIBUTE EAP-Message 79 octets +ATTRIBUTE EAP-Message 79 octets concat ATTRIBUTE Message-Authenticator 80 octets -ATTRIBUTE ARAP-Challenge-Response 84 octets # 8 octets of data +ATTRIBUTE ARAP-Challenge-Response 84 octets[8] ATTRIBUTE Acct-Interim-Interval 85 integer # 86: RFC 2867 ATTRIBUTE NAS-Port-Id 87 string diff --git a/resources/protocols/radius/dictionary.rfc3162 b/resources/protocols/radius/dictionary.rfc3162 index 7f462625..79e5c552 100644 --- a/resources/protocols/radius/dictionary.rfc3162 +++ b/resources/protocols/radius/dictionary.rfc3162 @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 3162. # http://www.ietf.org/rfc/rfc3162.txt # -# $Id: a6c41260ad6ee691a01b243249a7dfb5491540fa $ +# $Id: e90e387d9e2335aad6e17422055e7a0560dacb99 $ # ATTRIBUTE NAS-IPv6-Address 95 ipv6addr ATTRIBUTE Framed-Interface-Id 96 ifid diff --git a/resources/protocols/radius/dictionary.rfc3576 b/resources/protocols/radius/dictionary.rfc3576 index bef0947b..9bf142ec 100644 --- a/resources/protocols/radius/dictionary.rfc3576 +++ b/resources/protocols/radius/dictionary.rfc3576 @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 3576. # http://www.ietf.org/rfc/rfc3576.txt # -# $Id: 6ac7c4c110d6e4fd80cf22e415494d34f8b2308a $ +# $Id: 9ad092003cb0a889c0a26d80fbf594c2a42921a3 $ # ATTRIBUTE Error-Cause 101 integer diff --git a/resources/protocols/radius/dictionary.rfc3580 b/resources/protocols/radius/dictionary.rfc3580 index e456b55f..97e92991 100644 --- a/resources/protocols/radius/dictionary.rfc3580 +++ b/resources/protocols/radius/dictionary.rfc3580 @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 3580. # http://www.ietf.org/rfc/rfc3580.txt # -# $Id: e20df23cf3c81662ed2a0dbf194b42170e88e742 $ +# $Id: 234076858412d1fdf138189ee799d5c88d779d42 $ # VALUE Acct-Terminate-Cause Supplicant-Restart 19 VALUE Acct-Terminate-Cause Reauthentication-Failure 20 diff --git a/resources/protocols/radius/dictionary.rfc4072 b/resources/protocols/radius/dictionary.rfc4072 index b34aa3c4..d6abd58a 100644 --- a/resources/protocols/radius/dictionary.rfc4072 +++ b/resources/protocols/radius/dictionary.rfc4072 @@ -1,9 +1,11 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 4072 # http://www.ietf.org/rfc/rfc4072.txt # -# $Id$ +# $Id: 3bb543f2c9080b567d3ecc077f1d556e1ff87cca $ # -ATTRIBUTE EAP-Key-Name 102 string +ATTRIBUTE EAP-Key-Name 102 octets diff --git a/resources/protocols/radius/dictionary.rfc4372 b/resources/protocols/radius/dictionary.rfc4372 index 5cfd9111..57355b43 100644 --- a/resources/protocols/radius/dictionary.rfc4372 +++ b/resources/protocols/radius/dictionary.rfc4372 @@ -1,8 +1,10 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 4372. # http://www.ietf.org/rfc/rfc4372.txt # -# $Id$ +# $Id: c7a4ea373b65f5942f8785eca748d2e8b8e72919 $ # -ATTRIBUTE Chargeable-User-Identity 89 string +ATTRIBUTE Chargeable-User-Identity 89 octets diff --git a/resources/protocols/radius/dictionary.rfc4603 b/resources/protocols/radius/dictionary.rfc4603 index 535301d1..4f299bdc 100644 --- a/resources/protocols/radius/dictionary.rfc4603 +++ b/resources/protocols/radius/dictionary.rfc4603 @@ -1,11 +1,13 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Attributes and values defined in RFC 4603. # http://www.ietf.org/rfc/rfc4603.txt # -# $Id: 9e77c74791920f192e4d95b0600c99659af03962 $ +# $Id: f7ab4955af90a78ba08114ee4661597b84638496 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.rfc4675 b/resources/protocols/radius/dictionary.rfc4675 index ba7e466c..4c951524 100644 --- a/resources/protocols/radius/dictionary.rfc4675 +++ b/resources/protocols/radius/dictionary.rfc4675 @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 4675. # http://www.ietf.org/rfc/rfc4675.txt # -# $Id: d615722b7d763b344558eac17b12a6a607014b0e $ +# $Id: 6c3b64de26aee6d6dcf601b705e1df48de3cbcb3 $ # # diff --git a/resources/protocols/radius/dictionary.rfc4679 b/resources/protocols/radius/dictionary.rfc4679 index 1861e667..dc0016db 100644 --- a/resources/protocols/radius/dictionary.rfc4679 +++ b/resources/protocols/radius/dictionary.rfc4679 @@ -1,9 +1,11 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 4679. # http://www.ietf.org/rfc/rfc4679.txt # -# $Id$ +# $Id: 86d7f2756b386464839e43c0a851f46fe4679403 $ # VENDOR ADSL-Forum 3561 @@ -11,11 +13,23 @@ VENDOR ADSL-Forum 3561 BEGIN-VENDOR ADSL-Forum # +# Glue attribute to allow decoding of ADSL-Form vendor specific +# DHCP options. +# +ATTRIBUTE ADSL-Forum-DHCP-Vendor-Specific 255 tlv +BEGIN-TLV ADSL-Forum-DHCP-Vendor-Specific + ATTRIBUTE ADSL-Forum-Device-Manufacturer-OUI 1 octets + ATTRIBUTE ADSL-Forum-Device-Serial-Number 2 string + ATTRIBUTE ADSL-Forum-Device-Product-Class 3 string + ATTRIBUTE ADSL-Forum-Gateway-Manufacturer-OUI 4 octets +END-TLV ADSL-Forum-DHCP-Vendor-Specific + +# # The first two attributes are prefixed with "ADSL-" because of # conflicting names in dictionary.redback. # -ATTRIBUTE ADSL-Agent-Circuit-Id 1 string -ATTRIBUTE ADSL-Agent-Remote-Id 2 string +ATTRIBUTE ADSL-Agent-Circuit-Id 1 octets +ATTRIBUTE ADSL-Agent-Remote-Id 2 octets ATTRIBUTE Actual-Data-Rate-Upstream 129 integer ATTRIBUTE Actual-Data-Rate-Downstream 130 integer ATTRIBUTE Minimum-Data-Rate-Upstream 131 integer @@ -57,6 +71,6 @@ ATTRIBUTE Access-Loop-Encapsulation 144 octets # 3 # If this attribute exists, it means that IFW has been performed # for the subscribers session. # -ATTRIBUTE IWF-Session 252 octets # 0 +ATTRIBUTE IWF-Session 254 octets # 0 END-VENDOR ADSL-Forum diff --git a/resources/protocols/radius/dictionary.rfc4818 b/resources/protocols/radius/dictionary.rfc4818 index 09f074c6..799942b2 100644 --- a/resources/protocols/radius/dictionary.rfc4818 +++ b/resources/protocols/radius/dictionary.rfc4818 @@ -1,11 +1,13 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Attributes and values defined in RFC 4818. # http://www.ietf.org/rfc/rfc4818.txt # -# $Id: c5d33283ab57100040546182eba4b2b9ef0e9ebb $ +# $Id: cc56252f267a6932171feb5fddc44218ade35841 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.rfc4849 b/resources/protocols/radius/dictionary.rfc4849 index 1ef7fa64..750c4e7d 100644 --- a/resources/protocols/radius/dictionary.rfc4849 +++ b/resources/protocols/radius/dictionary.rfc4849 @@ -1,9 +1,10 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 4849. # http://www.ietf.org/rfc/rfc4849.txt # -# $Id: 1b762855b6cfbcce6dee475eb74c6219b4cfa287 $ +# $Id: 3ddb0ef32d29537c4302009d77acf784db8dc7ff $ # ATTRIBUTE NAS-Filter-Rule 92 string diff --git a/resources/protocols/radius/dictionary.rfc5090 b/resources/protocols/radius/dictionary.rfc5090 index 771dcf7b..e2285a6c 100644 --- a/resources/protocols/radius/dictionary.rfc5090 +++ b/resources/protocols/radius/dictionary.rfc5090 @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 5090. # http://www.ietf.org/rfc/rfc5090.txt # -# $Id: a5a71d9160084d5febd09387d6bcc25d6a86435b $ +# $Id: 2531b26e966cba82e4621c3486793c7d98880270 $ # ATTRIBUTE Digest-Response 103 string ATTRIBUTE Digest-Realm 104 string diff --git a/resources/protocols/radius/dictionary.rfc5176 b/resources/protocols/radius/dictionary.rfc5176 index fbe97d66..2eab2804 100644 --- a/resources/protocols/radius/dictionary.rfc5176 +++ b/resources/protocols/radius/dictionary.rfc5176 @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 5176. # http://www.ietf.org/rfc/rfc5176.txt # -# $Id: 81a0f02e930fe833a42b587a1b45fa3a69ee7e95 $ +# $Id: 118fa0781d9e96721c7181fc948e1f1b1a068cd9 $ # VALUE Error-Cause Invalid-Attribute-Value 407 VALUE Error-Cause Multiple-Session-Selection-Unsupported 508 diff --git a/resources/protocols/radius/dictionary.rfc5447 b/resources/protocols/radius/dictionary.rfc5447 index 978ab4cc..13cbd5ce 100644 --- a/resources/protocols/radius/dictionary.rfc5447 +++ b/resources/protocols/radius/dictionary.rfc5447 @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 5447. # http://www.ietf.org/rfc/rfc5447.txt # -# $Id: 38c5d63ef5d183f6c477801b42410e92e8d89eef $ +# $Id: f54758a3e141e0911cad51b09dae305d69c23cb7 $ # # 64-bit bit field diff --git a/resources/protocols/radius/dictionary.rfc5580 b/resources/protocols/radius/dictionary.rfc5580 index 374710e9..36aa2c8f 100644 --- a/resources/protocols/radius/dictionary.rfc5580 +++ b/resources/protocols/radius/dictionary.rfc5580 @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 5580. # http://www.ietf.org/rfc/rfc5580.txt # -# $Id: 964ba2bab9bed5d7070865f5335fa09967190f90 $ +# $Id: 07de61e865e7a2d0c93592cafdb26eafb407b28b $ # # One ASCII character of Namespace ID diff --git a/resources/protocols/radius/dictionary.rfc5607 b/resources/protocols/radius/dictionary.rfc5607 index b6183542..4023aae7 100644 --- a/resources/protocols/radius/dictionary.rfc5607 +++ b/resources/protocols/radius/dictionary.rfc5607 @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 5607. # http://www.ietf.org/rfc/rfc5607.txt # -# $Id: 4e621567b7ddbe7136ba6640a2dd9a1c47933aec $ +# $Id: ef47c5d8d7daa7631f698db394d2478f222f2472 $ # VALUE Service-Type Framed-Management 18 diff --git a/resources/protocols/radius/dictionary.rfc5904 b/resources/protocols/radius/dictionary.rfc5904 index 62b7431f..ca09e695 100644 --- a/resources/protocols/radius/dictionary.rfc5904 +++ b/resources/protocols/radius/dictionary.rfc5904 @@ -1,14 +1,16 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 5904. # http://www.ietf.org/rfc/rfc5904.txt # -# $Id$ +# $Id: 7f2cf2d309f26b11c96ed6f4270d4bd820e436d7 $ # -# The next two attributes are continued, like EAP-Message/ -ATTRIBUTE PKM-SS-Cert 137 octets -ATTRIBUTE PKM-CA-Cert 138 octets +# The next two attributes are continued, like EAP-Message +ATTRIBUTE PKM-SS-Cert 137 octets concat +ATTRIBUTE PKM-CA-Cert 138 octets concat # 28 bytes of data, 7 integers ATTRIBUTE PKM-Config-Settings 139 octets diff --git a/resources/protocols/radius/dictionary.rfc6519 b/resources/protocols/radius/dictionary.rfc6519 index 50f8c990..3691a8b5 100644 --- a/resources/protocols/radius/dictionary.rfc6519 +++ b/resources/protocols/radius/dictionary.rfc6519 @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 6519. # http://www.ietf.org/rfc/rfc6519.txt # -# $Id: 8b30b3953c4d225dc05e3eccc6697888747ff2f6 $ +# $Id: 0a0bc3244a1178219123520c2ed538cd456c437d $ # -ATTRIBUTE DS-Lite-Tunnel-Name 144 string +ATTRIBUTE DS-Lite-Tunnel-Name 144 octets diff --git a/resources/protocols/radius/dictionary.rfc6572 b/resources/protocols/radius/dictionary.rfc6572 index 23b223b4..5979da7e 100644 --- a/resources/protocols/radius/dictionary.rfc6572 +++ b/resources/protocols/radius/dictionary.rfc6572 @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 6572. # http://www.ietf.org/rfc/rfc6572.txt # -# $Id: 7ec81e55e034a3a823350f02eeed9d407665d927 $ +# $Id: 65cc95bae67e1047d13a371748e9cdb6d45cc779 $ # ATTRIBUTE Mobile-Node-Identifier 145 octets diff --git a/resources/protocols/radius/dictionary.rfc6677 b/resources/protocols/radius/dictionary.rfc6677 index 148f1a12..923e241b 100644 --- a/resources/protocols/radius/dictionary.rfc6677 +++ b/resources/protocols/radius/dictionary.rfc6677 @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 6677 # http://www.ietf.org/rfc/rfc6677.txt diff --git a/resources/protocols/radius/dictionary.rfc6911 b/resources/protocols/radius/dictionary.rfc6911 index 7d918ac2..ccf6aa45 100644 --- a/resources/protocols/radius/dictionary.rfc6911 +++ b/resources/protocols/radius/dictionary.rfc6911 @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 6911 # http://www.ietf.org/rfc/rfc6911.txt diff --git a/resources/protocols/radius/dictionary.rfc6929 b/resources/protocols/radius/dictionary.rfc6929 index 428764a5..a4ad990b 100644 --- a/resources/protocols/radius/dictionary.rfc6929 +++ b/resources/protocols/radius/dictionary.rfc6929 @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 6929 # http://www.ietf.org/rfc/rfc6929.txt diff --git a/resources/protocols/radius/dictionary.rfc6930 b/resources/protocols/radius/dictionary.rfc6930 index 12d1d68b..01280460 100644 --- a/resources/protocols/radius/dictionary.rfc6930 +++ b/resources/protocols/radius/dictionary.rfc6930 @@ -1,11 +1,14 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 6930 # http://www.ietf.org/rfc/rfc6930.txt # ATTRIBUTE IPv6-6rd-Configuration 173 tlv -ATTRIBUTE IPv6-6rd-IPv4MaskLen 173.1 integer -ATTRIBUTE IPv6-6rd-Prefix 173.2 ipv6prefix -ATTRIBUTE IPv6-6rd-BR-IPv4-Address 173.3 ipaddr +BEGIN-TLV IPv6-6rd-Configuration + ATTRIBUTE IPv6-6rd-IPv4MaskLen 1 integer + ATTRIBUTE IPv6-6rd-Prefix 2 ipv6prefix + ATTRIBUTE IPv6-6rd-BR-IPv4-Address 3 ipaddr +END-TLV IPv6-6rd-Configuration diff --git a/resources/protocols/radius/dictionary.rfc7055 b/resources/protocols/radius/dictionary.rfc7055 index 42ff5364..f0400cd2 100644 --- a/resources/protocols/radius/dictionary.rfc7055 +++ b/resources/protocols/radius/dictionary.rfc7055 @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 7055 # http://www.ietf.org/rfc/rfc7055.txt diff --git a/resources/protocols/radius/dictionary.rfc7155 b/resources/protocols/radius/dictionary.rfc7155 index dd48edcd..9aa64dbb 100644 --- a/resources/protocols/radius/dictionary.rfc7155 +++ b/resources/protocols/radius/dictionary.rfc7155 @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 7155 # http://www.ietf.org/rfc/rfc7155.txt diff --git a/resources/protocols/radius/dictionary.rfc7268 b/resources/protocols/radius/dictionary.rfc7268 index 5ed2ac59..71ab9951 100644 --- a/resources/protocols/radius/dictionary.rfc7268 +++ b/resources/protocols/radius/dictionary.rfc7268 @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 7268 # http://www.ietf.org/rfc/rfc7268.txt # -# $Id: e01186a235cde7d51fe1e271c5096da01faa5f2e $ +# $Id: 8ac2b3442e2b0ba4732d43585f8c1daeb6eea3e9 $ # ATTRIBUTE Allowed-Called-Station-Id 174 string diff --git a/resources/protocols/radius/dictionary.rfc7499 b/resources/protocols/radius/dictionary.rfc7499 index b025b5c5..b70b2f36 100644 --- a/resources/protocols/radius/dictionary.rfc7499 +++ b/resources/protocols/radius/dictionary.rfc7499 @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 7499. # http://www.ietf.org/rfc/rfc7499.txt # -# $Id: 47cfd30f1d036259d0ecb809d442c38efe21493a $ +# $Id: 2231b8faec5aea6c785765e8ec830a05815a66e4 $ # ATTRIBUTE Frag-Status 241.1 integer diff --git a/resources/protocols/radius/dictionary.rfc7930 b/resources/protocols/radius/dictionary.rfc7930 index f17e5024..0b4667b9 100644 --- a/resources/protocols/radius/dictionary.rfc7930 +++ b/resources/protocols/radius/dictionary.rfc7930 @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Attributes and values defined in RFC 7930 # http://www.ietf.org/rfc/rfc7930.txt diff --git a/resources/protocols/radius/dictionary.rfc8045 b/resources/protocols/radius/dictionary.rfc8045 new file mode 100644 index 00000000..9cafb3df --- /dev/null +++ b/resources/protocols/radius/dictionary.rfc8045 @@ -0,0 +1,65 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# Version $Id: 51fd76e85db92ccd83252b0fd81b4e31457476c9 $ +# +# Attributes and values defined in RFC 8045 +# http://www.ietf.org/rfc/rfc8045.txt +# + +ATTRIBUTE IP-Port-Limit-Info 241.5 tlv +ATTRIBUTE IP-Port-Range 241.6 tlv +ATTRIBUTE IP-Port-Forwarding-Map 241.7 tlv + +# +# These attributes can appear in all of the above TLVs. There is +# currently no way to describe this using the existing dictionary +# format. +# +ATTRIBUTE IP-Port-Type 241.5.1 integer +ATTRIBUTE IP-Port-Limit 241.5.2 integer +ATTRIBUTE IP-Port-Ext-IPv4-Addr 241.5.3 ipaddr +ATTRIBUTE IP-Port-Int-IPv4-Addr 241.5.4 ipaddr +ATTRIBUTE IP-Port-Int-IPv6-Addr 241.5.5 ipv6addr +ATTRIBUTE IP-Port-Int-Port 241.5.6 integer +ATTRIBUTE IP-Port-Ext-Port 241.5.7 integer +ATTRIBUTE IP-Port-Alloc 241.5.8 integer +ATTRIBUTE IP-Port-Range-Start 241.5.9 integer +ATTRIBUTE IP-Port-Range-End 241.5.10 integer +ATTRIBUTE IP-Port-Local-Id 241.5.11 string + +VALUE IP-Port-Alloc Reserved 0 +VALUE IP-Port-Alloc Allocation 1 +VALUE IP-Port-Alloc Deallocation 2 + +ATTRIBUTE IP-Port-Range-Type 241.6.1 integer +ATTRIBUTE IP-Port-Range-Limit 241.6.2 integer +ATTRIBUTE IP-Port-Range-Ext-IPv4-Addr 241.6.3 ipaddr +ATTRIBUTE IP-Port-Range-Int-IPv4-Addr 241.6.4 ipaddr +ATTRIBUTE IP-Port-Range-Int-IPv6-Addr 241.6.5 ipv6addr +ATTRIBUTE IP-Port-Range-Int-Port 241.6.6 integer +ATTRIBUTE IP-Port-Range-Ext-Port 241.6.7 integer +ATTRIBUTE IP-Port-Range-Alloc 241.6.8 integer +ATTRIBUTE IP-Port-Range-Range-Start 241.6.9 integer +ATTRIBUTE IP-Port-Range-Range-End 241.6.10 integer +ATTRIBUTE IP-Port-Range-Local-Id 241.6.11 string + +VALUE IP-Port-Range-Alloc Reserved 0 +VALUE IP-Port-Range-Alloc Allocation 1 +VALUE IP-Port-Range-Alloc Deallocation 2 + +ATTRIBUTE IP-Port-Map-Type 241.7.1 integer +ATTRIBUTE IP-Port-Map-Limit 241.7.2 integer +ATTRIBUTE IP-Port-Map-Ext-IPv4-Addr 241.7.3 ipaddr +ATTRIBUTE IP-Port-Map-Int-IPv4-Addr 241.7.4 ipaddr +ATTRIBUTE IP-Port-Map-Int-IPv6-Addr 241.7.5 ipv6addr +ATTRIBUTE IP-Port-Map-Int-Port 241.7.6 integer +ATTRIBUTE IP-Port-Map-Ext-Port 241.7.7 integer +ATTRIBUTE IP-Port-Map-Alloc 241.7.8 integer +ATTRIBUTE IP-Port-Map-Range-Start 241.7.9 integer +ATTRIBUTE IP-Port-Map-Range-End 241.7.10 integer +ATTRIBUTE IP-Port-Map-Local-Id 241.7.11 string + +VALUE IP-Port-Map-Alloc Reserved 0 +VALUE IP-Port-Map-Alloc Allocation 1 +VALUE IP-Port-Map-Alloc Deallocation 2 diff --git a/resources/protocols/radius/dictionary.rfc8559 b/resources/protocols/radius/dictionary.rfc8559 new file mode 100644 index 00000000..196b19d8 --- /dev/null +++ b/resources/protocols/radius/dictionary.rfc8559 @@ -0,0 +1,9 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +# Attributes and values defined in RFC 8559 +# http://www.ietf.org/rfc/rfc8559.txt +# + +ATTRIBUTE Operator-NAS-Identifier 241.8 octets diff --git a/resources/protocols/radius/dictionary.riverbed b/resources/protocols/radius/dictionary.riverbed index 75601c07..6d304f85 100644 --- a/resources/protocols/radius/dictionary.riverbed +++ b/resources/protocols/radius/dictionary.riverbed @@ -1,12 +1,14 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Riverbed VSAs # # https://support.riverbed.com/bin/support/static/doc/steelhead/8.5.2/html/sh_8.5.2_dg/wwhelp/wwhimpl/common/html/wwhelp.htm#href=radius_tacacs.22.04.html&single=true # -# $Id: 43c435316527edf2b14e085507294f75983d70b8 $ +# $Id: 8d3b50196ca83a63ef9d893c1460d3929bdb1b0d $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.riverstone b/resources/protocols/radius/dictionary.riverstone index 92006d18..886e04fd 100644 --- a/resources/protocols/radius/dictionary.riverstone +++ b/resources/protocols/radius/dictionary.riverstone @@ -1,11 +1,13 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Riverstone Networks' RADIUS VSAs # *** For RapidOS Versions 9.1 and above ONLY *** # -# $Id: e4e5655bbc9cf5854c1c716d64bef23bb3b7c5c3 $ +# $Id: d941b26c5da689b591f9a7295b0e85e313b7d3ea $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.roaringpenguin b/resources/protocols/radius/dictionary.roaringpenguin index 81086fe2..7a0b1d6f 100644 --- a/resources/protocols/radius/dictionary.roaringpenguin +++ b/resources/protocols/radius/dictionary.roaringpenguin @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Roaring Penguin attributes # -# $Id: 294a4573a69d7a09272a91141c8af4bf17d8db59 $ +# $Id: 95cba28a1b81921efc90c681639709f602f94a69 $ # ############################################################################## @@ -14,7 +16,8 @@ BEGIN-VENDOR Roaring-Penguin # Upstream speed limit in kb/s ATTRIBUTE RP-Upstream-Speed-Limit 1 integer - # Downstream speed limit in kb/s + +# Downstream speed limit in kb/s ATTRIBUTE RP-Downstream-Speed-Limit 2 integer # Send a HURL diff --git a/resources/protocols/radius/dictionary.ruckus b/resources/protocols/radius/dictionary.ruckus index 37e0848e..b695c37e 100644 --- a/resources/protocols/radius/dictionary.ruckus +++ b/resources/protocols/radius/dictionary.ruckus @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Ruckus Wireless, Inc. dictionary # @@ -28,6 +29,7 @@ ATTRIBUTE Ruckus-Accept-Enhancement-Reason 12 integer ATTRIBUTE Ruckus-Sta-Inner-Id 13 string ATTRIBUTE Ruckus-BSSID 14 octets +ATTRIBUTE Ruckus-FlexAuth-AVP 20 string ATTRIBUTE Ruckus-Triplets 101 octets ATTRIBUTE Ruckus-IMSI 102 octets @@ -65,36 +67,52 @@ ATTRIBUTE Ruckus-Eth-Profile-Id 133 integer ATTRIBUTE Ruckus-Zone-Name 134 string ATTRIBUTE Ruckus-Wlan-Name 135 string ATTRIBUTE Ruckus-AP-Roamed 136 integer -ATTRIBUTE Ruckus-Read-Preference 137 string +ATTRIBUTE Ruckus-Read-Preference 137 octets ATTRIBUTE Ruckus-Client-Host-Name 138 string ATTRIBUTE Ruckus-Client-Os-Type 139 string ATTRIBUTE Ruckus-Client-Os-Class 140 string ATTRIBUTE Ruckus-Vlan-Pool 141 string -ATTRIBUTE Ruckus-Dpsk 142 octets + +# 0x00 + (PBKDF2(HMAC−SHA1, passphrase, ssid, 4096, 256)) +# for a length of 33 octets. +ATTRIBUTE Ruckus-DPSK 142 octets ATTRIBUTE Ruckus-CP-Token 143 string ATTRIBUTE Ruckus-Max-DL-UL-Quota 144 integer ATTRIBUTE Ruckus-Traffic-Class-Attribute-Ids 145 string ATTRIBUTE Ruckus-TC-Attr-Ids-With-Quota 146 tlv -ATTRIBUTE Ruckus-TC-Name-Quota 146.1 string -ATTRIBUTE Ruckus-TC-Quota 146.2 octets +BEGIN-TLV Ruckus-TC-Attr-Ids-With-Quota + ATTRIBUTE Ruckus-TC-Name-Quota 1 string + ATTRIBUTE Ruckus-TC-Quota 2 octets +END-TLV Ruckus-TC-Attr-Ids-With-Quota + ATTRIBUTE Ruckus-Nat-Pool-Name 147 string ATTRIBUTE Ruckus-Sta-SVlan-Id 148 integer ATTRIBUTE Ruckus-TC-Acct-Ctrs 149 tlv -ATTRIBUTE Ruckus-Acct-Ctrs_TC-Name 149.1 string -ATTRIBUTE Ruckus-Acct-Ctrs_Input-Octets 149.2 octets -ATTRIBUTE Ruckus-Acct-Ctrs_Output-Octets 149.3 octets -ATTRIBUTE Ruckus-Acct-Ctrs_Input-Packets 149.4 octets -ATTRIBUTE Ruckus-Acct-Ctrs_Output-Packets 149.5 octets +BEGIN-TLV Ruckus-TC-Acct-Ctrs + ATTRIBUTE Ruckus-Acct-Ctrs_TC-Name 1 string + ATTRIBUTE Ruckus-Acct-Ctrs_Input-Octets 2 integer + ATTRIBUTE Ruckus-Acct-Ctrs_Output-Octets 3 integer + ATTRIBUTE Ruckus-Acct-Ctrs_Input-Packets 4 integer + ATTRIBUTE Ruckus-Acct-Ctrs_Output-Packets 5 integer +END-TLV Ruckus-TC-Acct-Ctrs ATTRIBUTE Ruckus-AAA-Id 152 string ATTRIBUTE Ruckus-DPSK-Params 153 tlv -ATTRIBUTE Ruckus-DPSK-AKM-Suite 153.1 octets -ATTRIBUTE Ruckus-DPSK-Cipher 153.2 byte -ATTRIBUTE Ruckus-DPSK-Anonce 153.3 octets -ATTRIBUTE Ruckus-DPSK-EAPOL-Key-Frame 153.4 octets - +BEGIN-TLV Ruckus-DPSK-Params + ATTRIBUTE Ruckus-DPSK-AKM-Suite 1 octets + ATTRIBUTE Ruckus-DPSK-Cipher 2 byte + ATTRIBUTE Ruckus-DPSK-Anonce 3 octets + ATTRIBUTE Ruckus-DPSK-EAPOL-Key-Frame 4 octets +END-TLV Ruckus-DPSK-Params +ATTRIBUTE Ruckus-Cluster-Name 154 string +ATTRIBUTE Ruckus-Domain-Name 155 string +ATTRIBUTE Ruckus-Client-Device-Type 156 string ATTRIBUTE Ruckus-Vlan-Name 157 string +# Ruckus SmartCell Insight Attributes +ATTRIBUTE Ruckus-SCI-Role 200 string +ATTRIBUTE Ruckus-SCI-Resource-Group 201 string + # # Integer Translations # @@ -149,4 +167,3 @@ VALUE Ruckus-Accounting-Status Accounting-On 1 VALUE Ruckus-Accounting-Status Accounting-Off 0 END-VENDOR Ruckus - diff --git a/resources/protocols/radius/dictionary.ruggedcom b/resources/protocols/radius/dictionary.ruggedcom index 8011d0d1..0f839fcd 100644 --- a/resources/protocols/radius/dictionary.ruggedcom +++ b/resources/protocols/radius/dictionary.ruggedcom @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # VENDOR RuggedCom 15004 diff --git a/resources/protocols/radius/dictionary.sangoma b/resources/protocols/radius/dictionary.sangoma index 1f7bc2a7..fffb338a 100644 --- a/resources/protocols/radius/dictionary.sangoma +++ b/resources/protocols/radius/dictionary.sangoma @@ -1,4 +1,6 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # dictionary.sangoma # diff --git a/resources/protocols/radius/dictionary.sg b/resources/protocols/radius/dictionary.sg index 2e12c9f9..0e1f6804 100644 --- a/resources/protocols/radius/dictionary.sg +++ b/resources/protocols/radius/dictionary.sg @@ -1,11 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # SG-1 System by Runcom Technologies Ltd. # # ftp://ftp.3gpp.org/specs/2002-06/R1999/29_series/29061-3a0.zip # -# $Id: 9cfd6cdde7ce8692a691cbe4232997d7c486502b $ +# $Id: 2fde048e5e02d46378956525f83dfd20f737c69b $ # VENDOR SG 2454 diff --git a/resources/protocols/radius/dictionary.shasta b/resources/protocols/radius/dictionary.shasta index 0aa58931..87b3ff3d 100644 --- a/resources/protocols/radius/dictionary.shasta +++ b/resources/protocols/radius/dictionary.shasta @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # dictionary.shasta # diff --git a/resources/protocols/radius/dictionary.shiva b/resources/protocols/radius/dictionary.shiva index 984d4fc5..697a0101 100644 --- a/resources/protocols/radius/dictionary.shiva +++ b/resources/protocols/radius/dictionary.shiva @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Shiva dictionary. # @@ -15,7 +16,7 @@ # the main dictionary file. # # Version: 1.00 27-Apr-1999 contributed by Alan DeKok -# $Id: b2a3c3d432e02650d9452962536e15de7021fdb8 $ +# $Id: 08da819a7a8505393ffa9b31b06329a5580b39b9 $ # VENDOR Shiva 166 diff --git a/resources/protocols/radius/dictionary.siemens b/resources/protocols/radius/dictionary.siemens index 26ed8ecd..b9e60f06 100644 --- a/resources/protocols/radius/dictionary.siemens +++ b/resources/protocols/radius/dictionary.siemens @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Siemens # -# $Id: 77e489820682987a2365985d33462fd73f34c11b $ +# $Id: 5d04502fd57a1deee75366fe53cb7c9ce4197c9d $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.slipstream b/resources/protocols/radius/dictionary.slipstream index fa16ae1b..f39842b0 100644 --- a/resources/protocols/radius/dictionary.slipstream +++ b/resources/protocols/radius/dictionary.slipstream @@ -1,12 +1,14 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # For Slipstream dialup accelerator servers # Created based on # slipstream_sp_6.0_installation_and_configuration_guide.pdf # -# $Id: 0d273ad347f117349d84e9c67d7b300564faa163 $ +# $Id: 62746621aae00bf8260fdfa3d176a4ae33e3d12b $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.smartsharesystems b/resources/protocols/radius/dictionary.smartsharesystems new file mode 100644 index 00000000..aa9fcee2 --- /dev/null +++ b/resources/protocols/radius/dictionary.smartsharesystems @@ -0,0 +1,33 @@ +# -*- text -*- +# SPDX-License-Identifier: CC-BY-4.0 +# Copyright (C) 2023 SmartShare Systems +# +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +# Please contact SmartShare Systems directly if you need a copy under a different license. +# +# Version $Id: f955337d31c1bea1ccf84946678d3070b5a006a6 $ + +############################################################################## +# +# SmartShare Systems Vendor-Specific Attributes +# dictionary.smartsharesystems +# https://www.smartsharesystems.com/ +# +############################################################################## + +VENDOR SmartShareSystems 30585 + +BEGIN-VENDOR SmartShareSystems + +# The globally unique identity (e.g. hardware serial number) of the Proxy (instance) forwarding the packet, +# in ASCII format (upper case only). +ATTRIBUTE SSS-Proxy-Id 2 string + +# The FQDN (Fully Qualified Domain Name) of the Proxy (cluster) forwarding the packet. +ATTRIBUTE SSS-Proxy-Identifier 3 string + +# Location of the Proxy (cluster) forwarding the packet, in free form UTF-8 format. +ATTRIBUTE SSS-Proxy-Location 4 string + +END-VENDOR SmartShareSystems diff --git a/resources/protocols/radius/dictionary.sofaware b/resources/protocols/radius/dictionary.sofaware index 65554e4e..23d96378 100644 --- a/resources/protocols/radius/dictionary.sofaware +++ b/resources/protocols/radius/dictionary.sofaware @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Sofaware VPN-1 Edge from Sofaware (Check Point appliance). @@ -21,7 +23,7 @@ # SofaWare-UFP : "true" / "false" # The user can /cannot overwrite the URL Filtering policy # -# $Id: 0c4f2369af125270e60fb160c820f669fc4f74f2 $ +# $Id: 0eec6e9d26fcd9d969e881fd9b86b142529ce44d $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.softbank b/resources/protocols/radius/dictionary.softbank new file mode 100644 index 00000000..46e004d6 --- /dev/null +++ b/resources/protocols/radius/dictionary.softbank @@ -0,0 +1,32 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors# +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################# +# +# Softbank VSAs +# +# $Id: 9ee8c0361f6dc7b94386c9cec0c78286454f35eb $ +# +############################################################################## + +VENDOR SoftBank 22197 + +BEGIN-VENDOR SoftBank + +ATTRIBUTE SoftBank-BB-Unit-MAC 1 string +ATTRIBUTE SoftBank-BB-Unit-Manufacturer 2 string +ATTRIBUTE SoftBank-BB-Unit-Model 3 string +ATTRIBUTE SoftBank-BB-Unit-HW-Revision 4 string + +ATTRIBUTE SoftBank-TFTP-Config-Server 185 ipaddr +ATTRIBUTE SoftBank-TFTP-Config-File 186 string +ATTRIBUTE SoftBank-DNS-IPv6-Primary 198 ipv6addr +ATTRIBUTE SoftBank-DNS-IPv6-Secondary 199 ipv6addr +ATTRIBUTE SoftBank-Syslog-Server 201 ipv6addr +ATTRIBUTE SoftBank-SNTP-Server 203 ipv6addr +ATTRIBUTE SoftBank-IPv4-Tunnel-Local-Address 204 ipaddr +ATTRIBUTE SoftBank-IPv4-Tunnel-Endpoint 207 ipv6addr +ATTRIBUTE SoftBank-RouteInfo-Server 215 string + +END-VENDOR SoftBank diff --git a/resources/protocols/radius/dictionary.sonicwall b/resources/protocols/radius/dictionary.sonicwall index bdc57f3b..22e67465 100644 --- a/resources/protocols/radius/dictionary.sonicwall +++ b/resources/protocols/radius/dictionary.sonicwall @@ -1,9 +1,10 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Sonicwall Firewall dictionary # -# $Id: c2cf40b83991aa7024ca9ce66e0c94f09eda9da3 $ +# $Id: 8f4cb0cba7046a6b269a44a806a30353496bfab9 $ # VENDOR SonicWall 8741 diff --git a/resources/protocols/radius/dictionary.springtide b/resources/protocols/radius/dictionary.springtide index 23f1894a..e4fd4af8 100644 --- a/resources/protocols/radius/dictionary.springtide +++ b/resources/protocols/radius/dictionary.springtide @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # SpringTide VSAs # -# $Id: b12c193ab3a006c8962164ba122b44f133108ee8 $ +# $Id: 8a08bfa59b7fd6bee0d8e5369da201942288ecdf $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.starent b/resources/protocols/radius/dictionary.starent index 12f6405e..6caea74e 100644 --- a/resources/protocols/radius/dictionary.starent +++ b/resources/protocols/radius/dictionary.starent @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Starent dictionary @@ -288,6 +290,14 @@ ATTRIBUTE SN-WiMAX-Auth-Only 306 integer ATTRIBUTE SN-TrafficSelector-Class 307 integer ATTRIBUTE SN-DHCP-Options 309 octets ATTRIBUTE SN-Handoff-Indicator 310 integer +ATTRIBUTE SN-User-Privilege 313 integer +ATTRIBUTE SN-IPv6-Alloc-Method 314 integer +ATTRIBUTE SN-Congestion-Mgmt-Policy 315 string +ATTRIBUTE SN-WSG-MIP-Required 316 integer +ATTRIBUTE SN-WSG-MIP-Release-TIA 317 integer +ATTRIBUTE SN-WSG-MIP-Simple-IP-Fallback 318 integer +ATTRIBUTE SN-WLAN-AP-Identifier 319 octets +ATTRIBUTE SN-WLAN-UE-Identifier 320 octets ATTRIBUTE SNA-PPP-Ctrl-Input-Octets 1001 integer ATTRIBUTE SNA-PPP-Ctrl-Output-Octets 1002 integer @@ -1267,7 +1277,7 @@ VALUE SN-Subscriber-Accounting GTPP 2 VALUE SN-Subscriber-Acct-Interim Normal 0 VALUE SN-Subscriber-Acct-Interim Suppress 1 -VALUE SN-Subscriber-Acct-Mode flow-based-auxilliary 0 +VALUE SN-Subscriber-Acct-Mode flow-based-auxiliary 0 VALUE SN-Subscriber-Acct-Mode flow-based-all 1 VALUE SN-Subscriber-Acct-Mode flow-based-none 2 VALUE SN-Subscriber-Acct-Mode session-based 3 @@ -1351,4 +1361,23 @@ VALUE SN-Visiting-Sub-Use-GGSN Accept 1 VALUE SN-WiMAX-Auth-Only Disabled 0 VALUE SN-WiMAX-Auth-Only Enabled 1 +VALUE SN-User-Privilege Administrative 6 +VALUE SN-User-Privilege NAS_Prompt 7 +VALUE SN-User-Privilege Inspector 19650516 +VALUE SN-User-Privilege Security_Admin 19660618 + +VALUE SN-IPv6-Alloc-Method Alloc_Local_Pool 0 +VALUE SN-IPv6-Alloc-Method Alloc_Dhcp_Client 1 +VALUE SN-IPv6-Alloc-Method Alloc_No_Alloc 2 +VALUE SN-IPv6-Alloc-Method Alloc_Static_Alloc 3 + +VALUE SN-WSG-MIP-Required No 0 +VALUE SN-WSG-MIP-Required Yes 1 + +VALUE SN-WSG-MIP-Release-TIA No 0 +VALUE SN-WSG-MIP-Release-TIA Yes 1 + +VALUE SN-WSG-MIP-Simple-IP-Fallback No 0 +VALUE SN-WSG-MIP-Simple-IP-Fallback Yes 1 + END-VENDOR Starent diff --git a/resources/protocols/radius/dictionary.starent.vsa1 b/resources/protocols/radius/dictionary.starent.vsa1 index e8c9ccce..c1af5675 100644 --- a/resources/protocols/radius/dictionary.starent.vsa1 +++ b/resources/protocols/radius/dictionary.starent.vsa1 @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Starent dictionary @@ -1116,7 +1118,7 @@ VALUE SN1-Subscriber-Accounting GTPP 2 VALUE SN1-Subscriber-Acct-Interim Normal 0 VALUE SN1-Subscriber-Acct-Interim Suppress 1 -VALUE SN1-Subscriber-Acct-Mode flow-based-auxilliary 0 +VALUE SN1-Subscriber-Acct-Mode flow-based-auxiliary 0 VALUE SN1-Subscriber-Acct-Mode flow-based-all 1 VALUE SN1-Subscriber-Acct-Mode flow-based-none 2 VALUE SN1-Subscriber-Acct-Mode session-based 3 diff --git a/resources/protocols/radius/dictionary.surfnet b/resources/protocols/radius/dictionary.surfnet index 94052253..53552d78 100644 --- a/resources/protocols/radius/dictionary.surfnet +++ b/resources/protocols/radius/dictionary.surfnet @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Surfnet # -# $Id: a6c0e4f9c83b588adec2998cb80513594abecada $ +# $Id: b7ac15819550abd0815d8e4ba4320acc0e447625 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.t_systems_nova b/resources/protocols/radius/dictionary.t_systems_nova index c0b5987a..59a03290 100644 --- a/resources/protocols/radius/dictionary.t_systems_nova +++ b/resources/protocols/radius/dictionary.t_systems_nova @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # T-Systems-Nova # -# $Id: e78c33d89264af9b9c459e40343025b4e5c483ed $ +# $Id: 009746a3c1bfd19fab7f1e2b30146ee7ef7da0a6 $ # ############################################################################## VENDOR T-Systems-Nova 16787 diff --git a/resources/protocols/radius/dictionary.telebit b/resources/protocols/radius/dictionary.telebit index b7ed4d25..dbd71236 100644 --- a/resources/protocols/radius/dictionary.telebit +++ b/resources/protocols/radius/dictionary.telebit @@ -1,11 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Telebit dictionary # # Telebit was acquired by Cisco in 1996. # -# $Id: f5d82ecb9ecbdc01f7ad770aa838782919238443 $ +# $Id: fc36c278ac3c0801b4f1f64df41617283732aa48 $ # VENDOR Telebit 117 diff --git a/resources/protocols/radius/dictionary.telkom b/resources/protocols/radius/dictionary.telkom index 95c47740..1a03a1ec 100644 --- a/resources/protocols/radius/dictionary.telkom +++ b/resources/protocols/radius/dictionary.telkom @@ -1,12 +1,14 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -############################################################################## +# Copyright (C) 2019 The FreeRADIUS Server project and contributors# +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################# # # Telkom SA - RADIUS dictionary # Used to convey Telkom Specific Information in proxied requests # EDS 20031007 eddie@saix.net # -# $Id: 687677cbbf9eb3d9cfa1ca955d92bfb027ad7f51 $ +# $Id: af17e6ded0f757fb26cc8b9c8f7670ee996c90ba $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.telrad b/resources/protocols/radius/dictionary.telrad new file mode 100644 index 00000000..e8000142 --- /dev/null +++ b/resources/protocols/radius/dictionary.telrad @@ -0,0 +1,27 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# If the WiMAX format isn't crazy enough, why not have other vendors +# do the same thing? +# +VENDOR Telrad 5323 format=1,1,c + +BEGIN-VENDOR Telrad + +ATTRIBUTE Telrad-TSDF-Table 1 tlv +BEGIN-TLV Telrad-TSDF-Table +ATTRIBUTE Telrad-Item-Identity 1 byte +ATTRIBUTE Telrad-Reference-VPWS-PDN-Name 2 octets +ATTRIBUTE Telrad-TSDF-Parameters 3 tlv +BEGIN-TLV Telrad-TSDF-Parameters + ATTRIBUTE Telrad-C-VLAN-ID 1 integer + ATTRIBUTE Telrad-C-VLAN-ID-Retag 2 integer + ATTRIBUTE Telrad-S-VLAN-ID 3 integer + ATTRIBUTE Telrad-Reference-QOS-Profile-Name 4 string +END-TLV Telrad-TSDF-Parameters +END-TLV Telrad-TSDF-Table + +END-VENDOR Telrad diff --git a/resources/protocols/radius/dictionary.terena b/resources/protocols/radius/dictionary.terena index 0e3a3968..1b6d0324 100644 --- a/resources/protocols/radius/dictionary.terena +++ b/resources/protocols/radius/dictionary.terena @@ -1,11 +1,13 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors# +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # For TERENA VSA's # # The reference for these values is: # http://www.terena.org/activities/tf-emc2/oid.html # -# $Id: 9637e3debc73eff0332bc198837db24ea2935b5f $ +# $Id: 7b7b857f39df8b91da11af3ce9d701dea1454d20 $ # VENDOR TERENA 25178 diff --git a/resources/protocols/radius/dictionary.tplink b/resources/protocols/radius/dictionary.tplink new file mode 100644 index 00000000..389d0c83 --- /dev/null +++ b/resources/protocols/radius/dictionary.tplink @@ -0,0 +1,19 @@ +# -*- text -*- +# Copyright (C) 2023 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# Version $Id: f4a83a5d7614d3451f385529b3c89575782719c5 $ +VENDOR TPLink 11863 + +BEGIN-VENDOR TPLink + +ATTRIBUTE TPLink-Recv-limit 1 integer +ATTRIBUTE TPLink-Xmit-limit 2 integer +ATTRIBUTE TPLink-Authentication-FindKey 3 octets +ATTRIBUTE TPLink-Authentication-FoundKey 4 octets +ATTRIBUTE TPLink-User-Command 5 string +ATTRIBUTE TPLink-Site 6 string +ATTRIBUTE TPLink-Omada 7 string +ATTRIBUTE TPLink-Redirect-Url 8 string +ATTRIBUTE TPLink-Portal-Access-Status 9 integer + +END-VENDOR TPLink diff --git a/resources/protocols/radius/dictionary.travelping b/resources/protocols/radius/dictionary.travelping index 6d904a58..cee42195 100644 --- a/resources/protocols/radius/dictionary.travelping +++ b/resources/protocols/radius/dictionary.travelping @@ -1,5 +1,6 @@ # # dictionary.travelping +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # VENDOR Travelping 18681 diff --git a/resources/protocols/radius/dictionary.tripplite b/resources/protocols/radius/dictionary.tripplite new file mode 100644 index 00000000..181eec3b --- /dev/null +++ b/resources/protocols/radius/dictionary.tripplite @@ -0,0 +1,63 @@ +# -*- text -*- +# # Copyright (C) 2019 The FreeRADIUS Server project and contributors +# # This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# # Version $Id: 00757cd5a08021ad9683432f9eb9adf27898778a $ +# # +# # Attributes and values defined in RFC 8045 +# # http://www.ietf.org/rfc/rfc8045.txt +# # +############################################################################## +## +## TrippLite attributes +## +## $Id: 00757cd5a08021ad9683432f9eb9adf27898778a $ +## +############################################################################### + +VENDOR TrippLite 850 + +BEGIN-VENDOR TrippLite + +# +## Access is granted to the various facilities within the PowerAlert software +## by means of the TrippLite-Authorization attribute, which is a comma-delimited +## string of facility-code to access-level pairs. +## +## Facility Codes: default, security, networksettings, systemsettings, systreminfo, +## logging, devicestatus, devicecontrols, deviceevents, +## deviceloads, actions, schedules, discovery +## +## Access Levels: none (or 0), ro (or 1), rw (or 2) +## +## Example: default=rw,security=none,systemsettings=ro +## +## - The default access for all non-specified facilitys is read/write +## - The user has no access to the security facility +## + +ATTRIBUTE TrippLite-Authorization 1 string + +# +## Comma-delimited string of outlet security realms from 1 through 32 to which +## an otherwise restricted user has read-write access. +## +## Example: 1-5,10,15 +## +## - User has read-write access to realms 1, 2, 3, 4 and 5 +## - User has read-write access to realms 10 and 15 +## + +ATTRIBUTE TrippLite-Outlet-Realms 2 string + +# +## Simple message, usually sent as part of accounting +## + +ATTRIBUTE TrippLite-Message 3 string + +# +## PADM20 user role. Role with same name should exists on the device. +## +ATTRIBUTE TrippLite-User-Role 4 string + +END-VENDOR TrippLite diff --git a/resources/protocols/radius/dictionary.tropos b/resources/protocols/radius/dictionary.tropos index 27f918cc..bbf0791d 100644 --- a/resources/protocols/radius/dictionary.tropos +++ b/resources/protocols/radius/dictionary.tropos @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # See support@tropos.com # -# $Id: 48341843dc855336bc811b8cb4bdca2f693934bf $ +# $Id: bde1b342439b22ccd170176cbfb59890dcf5f47c $ # ############################################################################## VENDOR Tropos 14529 diff --git a/resources/protocols/radius/dictionary.ukerna b/resources/protocols/radius/dictionary.ukerna index e1359178..1969ddf4 100644 --- a/resources/protocols/radius/dictionary.ukerna +++ b/resources/protocols/radius/dictionary.ukerna @@ -1,28 +1,39 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # GSS-EAP VSAs # -# $Id: dbf19e8427b2a4ab96d6b6b21e4295ec09f73c3c $ +# $Id: fddb1f4243501a70a9bda7186914846b328f5e0e $ # VENDOR UKERNA 25622 BEGIN-VENDOR UKERNA +# Previously-vendor-defined IANA attributes ATTRIBUTE UKERNA-GSS-Acceptor-Service-Name 128 string ATTRIBUTE UKERNA-GSS-Acceptor-Host-Name 129 string ATTRIBUTE UKERNA-GSS-Acceptor-Service-Specific 130 string ATTRIBUTE UKERNA-GSS-Acceptor-Realm-Name 131 string + +# ABFAB-specific attributes for attributes and unlang recipe items ATTRIBUTE SAML-AAA-Assertion 132 string ATTRIBUTE EAP-Channel-Binding-Message 135 octets ATTRIBUTE Trust-Router-COI 136 string ATTRIBUTE Trust-Router-APC 137 string + +# ABFAB-specific TargetedIds for the three realms of 'influence' ATTRIBUTE Moonshot-Host-TargetedId 138 string ATTRIBUTE Moonshot-Realm-TargetedId 139 string ATTRIBUTE Moonshot-TR-COI-TargetedId 140 string + +# ABFAB-specific attributes for the unlang generation of the above ATTRIBUTE Moonshot-MSTID-GSS-Acceptor 141 string ATTRIBUTE Moonshot-MSTID-Namespace 142 string ATTRIBUTE Moonshot-MSTID-TargetedId 143 string + +# ABFAB-specific OTP token value ATTRIBUTE Moonshot-OTP-Secret 144 string + END-VENDOR UKERNA diff --git a/resources/protocols/radius/dictionary.unix b/resources/protocols/radius/dictionary.unix index d2f00596..c6c4f028 100644 --- a/resources/protocols/radius/dictionary.unix +++ b/resources/protocols/radius/dictionary.unix @@ -1,9 +1,10 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Allegedly for ProFTPd. # -# $Id: 06d3634eba2d4830db1597c193c7b804852ef1be $ +# $Id: fe5b09aa1a788cb96b90eb2f8d4e4b0439776de7 $ # VENDOR Unix 4 diff --git a/resources/protocols/radius/dictionary.usr b/resources/protocols/radius/dictionary.usr index 7bf9942a..9cd0ac57 100644 --- a/resources/protocols/radius/dictionary.usr +++ b/resources/protocols/radius/dictionary.usr @@ -1,56 +1,16 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # dictionary.usr USR Robotics dictionary. # # Taken from the dictionary included with the USR RADIUS server, # and adjusted a bit. # -# Version: $Id$ +# Version: $Id: 4847f84c69457b3025e47621bb228cddce924f66 $ # # -# USR specific attributes -# -# Prompt value should be 1 for echo, 0 for no echo, default 1. -#ATTRIBUTE Prompt 64 integer -ATTRIBUTE Multi-Link-Flag 126 integer -ATTRIBUTE Char-Noecho 250 integer - -# -# USR specific Integer Translations -# - -#Taken from the website: -#https://bitbucket.org/02strich/openvpn-auth-radius/src/b52f7f5e1acd/RadiusClass/utilities/dictionary -# - -VALUE Termination-Action Manage-Resources 2 - -VALUE Acct-Status-Type Modem-Start 4 -VALUE Acct-Status-Type Modem-Stop 5 -VALUE Acct-Status-Type Cancel 6 - -VALUE Multi-Link-Flag True 1 -VALUE Multi-Link-Flag False 0 - -# USR specific Authentication Types - -# -# These are commented out because the conflict with the standard -# definitions. -# -#VALUE Acct-Authentic None 0 -#VALUE Acct-Authentic Remote 3 -#VALUE Acct-Authentic RADIUS 4 -#VALUE Acct-Authentic MNET 5 -#VALUE Acct-Authentic KCHAP 6 -#VALUE Acct-Authentic TACACS 7 -#VALUE Acct-Authentic Realm 8 -#VALUE Acct-Authentic Local 9 -#VALUE Acct-Authentic File 10 -#VALUE Acct-Authentic Local-VPN 11 - -# # USR Extensions: USR Vendor-Specific stuff. # # For now in NMC format (whatever that stands for), though the @@ -314,8 +274,6 @@ ATTRIBUTE USR-Routing-Protocol 0x9826 integer ATTRIBUTE USR-Modem-Group 0x9827 integer ATTRIBUTE USR-Modem-Training-Time 0x9842 integer ATTRIBUTE USR-Interface-Index 0x9843 integer -ATTRIBUTE USR-Multicast-Proxy 0x984d integer -ATTRIBUTE USR-Multicast-Forwarding 0x9850 integer ATTRIBUTE USR-MP-MRRU 0x982f integer ATTRIBUTE USR-SAP-Filter-In 0x9002 string @@ -385,15 +343,7 @@ ATTRIBUTE USR-IGMP-Query-Interval 0x9851 integer ATTRIBUTE USR-IGMP-Maximum-Response-Time 0x9852 integer ATTRIBUTE USR-IGMP-Robustness 0x9853 integer ATTRIBUTE USR-IGMP-Version 0x9854 integer -ATTRIBUTE USR-Call-Arrival-Time 0x9858 integer -ATTRIBUTE USR-Call-End-Time 0x9859 integer ATTRIBUTE USR-Callback-Type 0x986a integer -ATTRIBUTE USR-Pre-shared-MN-Key 0x9873 integer -ATTRIBUTE USR-MIP-NAI 0x9874 string -ATTRIBUTE USR-Agent 0x9876 integer -ATTRIBUTE USR-Mobile-Session-ID 0x9885 integer -ATTRIBUTE USR-Mobile-Accounting-Type 0x9886 integer - ATTRIBUTE USR-Request-Type 0xf001 integer ATTRIBUTE USR-RMMIE-Num-Of-Updates 0x01ce integer ATTRIBUTE USR-RMMIE-Manufacturer-ID 0x01df integer @@ -463,52 +413,51 @@ ATTRIBUTE USR-Dvmrp-Retransmit-Prunes 0x987b integer ATTRIBUTE USR-Dvmrp-Non-Pruners 0x987c integer ATTRIBUTE USR-Dvmrp-Route-Transit 0x987d integer ATTRIBUTE USR-Dvmrp-Input-Filter 0x987e string -ATTRIBUTE USR-Dvmrp-Output-Filter 0x9880 string -ATTRIBUTE USR-Policy-Access 0x9881 integer -ATTRIBUTE USR-Policy-Configuration 0x9882 integer -ATTRIBUTE USR-Policy-Filename 0x9883 string -ATTRIBUTE USR-Policy-Type 0x9884 integer -ATTRIBUTE USR-Mobile-Session-ID 0x9885 integer -ATTRIBUTE USR-Mobile-Accounting-Type 0x9886 integer -ATTRIBUTE USR-Mobile-Service-Option 0x9887 integer -ATTRIBUTE USR-Wallclock-Timestamp 0x9888 integer -ATTRIBUTE USR-Dvmrp-Initial-Flooding 0x988a integer -ATTRIBUTE USR-HARC-Disconnect-Code 0x988b integer -ATTRIBUTE USR-Telnet-Options 0x988c integer -ATTRIBUTE USR-CDMA-PktData-Network-ID 0x988d integer +ATTRIBUTE USR-Dvmrp-Output-Filter 0x9880 string +ATTRIBUTE USR-Policy-Access 0x9881 integer +ATTRIBUTE USR-Policy-Configuration 0x9882 integer +ATTRIBUTE USR-Policy-Filename 0x9883 string +ATTRIBUTE USR-Policy-Type 0x9884 integer +ATTRIBUTE USR-Mobile-Session-ID 0x9885 integer +ATTRIBUTE USR-Mobile-Accounting-Type 0x9886 integer +ATTRIBUTE USR-Mobile-Service-Option 0x9887 integer +ATTRIBUTE USR-Wallclock-Timestamp 0x9888 integer +ATTRIBUTE USR-Dvmrp-Initial-Flooding 0x988a integer +ATTRIBUTE USR-Telnet-Options 0x988c integer +ATTRIBUTE USR-CDMA-PktData-Network-ID 0x988d integer ATTRIBUTE USR-Auth-Next-Server-Address 0x988e ipaddr -ATTRIBUTE USR-User-PPP-AODI-Type 0x988f integer +ATTRIBUTE USR-User-PPP-AODI-Type 0x988f integer ATTRIBUTE USR-MLPPP-Fragmentation-Threshld 0x9890 integer ATTRIBUTE USR-Unnumbered-Local-IP-Address 0x9891 ipaddr -ATTRIBUTE USR-Traffic-Threshold 0x9892 integer -ATTRIBUTE USR-Keep-Alive-Interval 0x9893 integer -ATTRIBUTE Virtual-Server-ID 0x9894 integer -ATTRIBUTE USR-X25-Trunk-Profile 0x9895 string +ATTRIBUTE USR-Traffic-Threshold 0x9892 integer +ATTRIBUTE USR-Keep-Alive-Interval 0x9893 integer +ATTRIBUTE Virtual-Server-ID 0x9894 integer +ATTRIBUTE USR-X25-Trunk-Profile 0x9895 string ATTRIBUTE USR-X25-Acct-Input-Segment-Count 0x9896 integer ATTRIBUTE USR-X25-Acct-Output-Segment-Coun 0x9897 integer -ATTRIBUTE USR-X25-Acct-Segment-Size 0x9898 integer +ATTRIBUTE USR-X25-Acct-Segment-Size 0x9898 integer ATTRIBUTE USR-X25-Acct-Termination-Code 0x9899 integer ATTRIBUTE USR-X25-SVC-Logical-Channel-Numb 0x989a integer ATTRIBUTE USR-Nailed-B-Channel-Indicator 0x989b integer -ATTRIBUTE USR-X25-SVC-Call-Attributes 0x989c integer -ATTRIBUTE USR-Init-Reg-Server-Addr 0x989d ipaddr -ATTRIBUTE USR-Re-Reg-Server-Addr 0x989e ipaddr -ATTRIBUTE USR-Bytes-TX-Remain 0x989f integer -ATTRIBUTE USR-Bytes-RX-Remain 0x98a0 integer -ATTRIBUTE USR-Session-Time-Remain 0x98a1 integer -ATTRIBUTE USR-Pre-Paid-Enabled 0x98a2 integer -ATTRIBUTE USR-Reg-Server-Prov-Timeout 0x98a3 integer -ATTRIBUTE USR-Redirect 0x98a4 integer -ATTRIBUTE USR-VLAN-Tag 0x98a5 integer -ATTRIBUTE USR-Rad-IP-Pool-Definition 0x98a6 string +ATTRIBUTE USR-X25-SVC-Call-Attributes 0x989c integer +ATTRIBUTE USR-Init-Reg-Server-Addr 0x989d ipaddr +ATTRIBUTE USR-Re-Reg-Server-Addr 0x989e ipaddr +ATTRIBUTE USR-Bytes-TX-Remain 0x989f integer +ATTRIBUTE USR-Bytes-RX-Remain 0x98a0 integer +ATTRIBUTE USR-Session-Time-Remain 0x98a1 integer +ATTRIBUTE USR-Pre-Paid-Enabled 0x98a2 integer +ATTRIBUTE USR-Reg-Server-Prov-Timeout 0x98a3 integer +ATTRIBUTE USR-Redirect 0x98a4 integer +ATTRIBUTE USR-VLAN-Tag 0x98a5 integer +ATTRIBUTE USR-Rad-IP-Pool-Definition 0x98a6 string ATTRIBUTE USR-Rad-NMC-Call-Progress-Status 0x98a7 integer -ATTRIBUTE USR-Rad-NMC-Blocks_RX 0x98a8 integer -ATTRIBUTE USR-Total-Bytes-Remain 0x98b8 integer -ATTRIBUTE USR-Forward-Rate-Limit 0x98b9 integer -ATTRIBUTE USR-Reverse-Rate-Limit 0x98bc integer +ATTRIBUTE USR-Rad-NMC-Blocks_RX 0x98a8 integer +ATTRIBUTE USR-Total-Bytes-Remain 0x98b8 integer +ATTRIBUTE USR-Forward-Rate-Limit 0x98b9 integer +ATTRIBUTE USR-Reverse-Rate-Limit 0x98bc integer -ATTRIBUTE USR-NAS-Type 0xf002 integer -ATTRIBUTE USR-Auth-Mode 0xf003 integer +ATTRIBUTE USR-NAS-Type 0xf002 integer +ATTRIBUTE USR-Auth-Mode 0xf003 integer # # Integer Translations # @@ -1669,7 +1618,7 @@ VALUE CW-Trans-Cld-Party-E164-Type Subscriber-Number 5 VALUE CW-Trans-Cld-Party-E164-Type Abbreviated-Number 6 VALUE CW-Trans-Cld-Party-E164-Type Reserved 7 -VALUE USR-Pre-Paid-Enabled Phase2-active-Time-counted 1 -VALUE USR-Pre-Paid-Enabled Phase2-Transfer/Reciev-Packet-counted 2 -VALUE USR-Pre-Paid-Enabled Phase2-Total-Packet-counted 3 +VALUE USR-Pre-Paid-Enabled Phase2-active-Time-counted 1 +VALUE USR-Pre-Paid-Enabled Phase2-Transfer/Reciev-Packet-counted 2 +VALUE USR-Pre-Paid-Enabled Phase2-Total-Packet-counted 3 END-VENDOR USR diff --git a/resources/protocols/radius/dictionary.usr.illegal b/resources/protocols/radius/dictionary.usr.illegal new file mode 100644 index 00000000..e3b55c49 --- /dev/null +++ b/resources/protocols/radius/dictionary.usr.illegal @@ -0,0 +1,49 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# USE dictionary that illegally uses the RFC space. +# +# $Id: b75176732fd503a902a9ba17ab33000a9c417c86 $ +# +############################################################################## +# +# USR specific attributes +# +# Prompt value should be 1 for echo, 0 for no echo, default 1. +#ATTRIBUTE Prompt 64 integer +ATTRIBUTE Multi-Link-Flag 126 integer +ATTRIBUTE Char-Noecho 250 integer + +# +# USR specific Integer Translations +# + +VALUE Termination-Action Manage-Resources 2 + +VALUE Acct-Status-Type Modem-Start 4 +VALUE Acct-Status-Type Modem-Stop 5 +VALUE Acct-Status-Type Cancel 6 + +VALUE Multi-Link-Flag True 1 +VALUE Multi-Link-Flag False 0 + +# USR specific Authentication Types + +# +# These are commented out because the conflict with the standard +# definitions. +# +#VALUE Acct-Authentic None 0 +#VALUE Acct-Authentic Remote 3 +#VALUE Acct-Authentic RADIUS 4 +#VALUE Acct-Authentic MNET 5 +#VALUE Acct-Authentic KCHAP 6 +#VALUE Acct-Authentic TACACS 7 +#VALUE Acct-Authentic Realm 8 +#VALUE Acct-Authentic Local 9 +#VALUE Acct-Authentic File 10 +#VALUE Acct-Authentic Local-VPN 11 + diff --git a/resources/protocols/radius/dictionary.utstarcom b/resources/protocols/radius/dictionary.utstarcom index ae9e2615..36223b51 100644 --- a/resources/protocols/radius/dictionary.utstarcom +++ b/resources/protocols/radius/dictionary.utstarcom @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # UT Starcom (China) # -# $Id: 00e5be1c628e54afc635988a39dfd8daeadf59ae $ +# $Id: 152d5c1d01342429ecfbc78324d63ae744a9d89f $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.valemount b/resources/protocols/radius/dictionary.valemount index 94be0612..0bbfc080 100644 --- a/resources/protocols/radius/dictionary.valemount +++ b/resources/protocols/radius/dictionary.valemount @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Valemount Networks Corporation specific radius attributes # networks@valemount.com # -# $Id: 471d81cdcd882fde3a99b1ae3e1886e9a8936ccb $ +# $Id: aeb61ba17b192c86d6a6fece6af09c1849f9cca0 $ # VENDOR ValemountNetworks 16313 diff --git a/resources/protocols/radius/dictionary.vasexperts b/resources/protocols/radius/dictionary.vasexperts new file mode 100644 index 00000000..6a33e6df --- /dev/null +++ b/resources/protocols/radius/dictionary.vasexperts @@ -0,0 +1,93 @@ +# -*- text -*- +# Copyright (C) 2020 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# Version $Id: a4c3a0511b5a33ac90ae0ac6e64199a03e5a4dc4 $ +# +# VAS Experts dictionary +# +VENDOR VasExperts 43823 + +BEGIN-VENDOR VasExperts + +ATTRIBUTE VasExperts-Policing-Profile 1 string +ATTRIBUTE VasExperts-Service-Profile 2 string +ATTRIBUTE VasExperts-Enable-Service 3 string +ATTRIBUTE VasExperts-Multi-IP-User 4 integer +ATTRIBUTE VasExperts-UserName 5 string +ATTRIBUTE VasExperts-Service-Type 6 integer +ATTRIBUTE VasExperts-Restrict-User 7 integer +ATTRIBUTE VasExperts-Enable-Interconnect 8 integer +ATTRIBUTE VasExperts-OutVLAN 9 integer +ATTRIBUTE VasExperts-Command-Code 10 integer # CoA command code +ATTRIBUTE VasExperts-OutMAC 11 string + +VALUE VasExperts-Service-Type Auth 0 # L3-authorization, known IP +VALUE VasExperts-Service-Type DHCP 1 # DHCP +VALUE VasExperts-Service-Type PAP 2 # PAP authorization +VALUE VasExperts-Service-Type CHAP 3 # CHAP authorization +VALUE VasExperts-Service-Type MS_CHAPv2 4 # MS-CHAPv2 authorization +VALUE VasExperts-Service-Type MAC_QinQ 5 # MAC/QinQ authorization +VALUE VasExperts-Service-Type ARP 6 # ARP +VALUE VasExperts-Service-Type DHCPv6 7 # DHCPv6 + +VALUE VasExperts-Command-Code Check-Acct 1 # Check Accounting session for Framed-IP-Address + +# Accounting +ATTRIBUTE VasExperts-Acct-Traffic-Class-Name 16 string +ATTRIBUTE VasExperts-Acct-Traffic-Class-Input-Octets 17 integer64 +ATTRIBUTE VasExperts-Acct-Traffic-Class-Output-Octets 18 integer64 +ATTRIBUTE VasExperts-Acct-Traffic-Class-Input-Packets 19 integer64 +ATTRIBUTE VasExperts-Acct-Traffic-Class-Output-Packets 20 integer64 +ATTRIBUTE VasExperts-NAT-IP 21 ipaddr # NAT 1:1 white address + +# DHCP -> Radius attributes +ATTRIBUTE VasExperts-DHCP-Hostname 32 octets # DHCP Opt12 +ATTRIBUTE VasExperts-DHCP-ClientId 33 octets # DHCP Opt61 +ATTRIBUTE VasExperts-DHCP-ClassId 34 octets # DHCP Opt60 +ATTRIBUTE VasExperts-DHCP-RelayInfo 35 octets # DHCP Opt82 +ATTRIBUTE VasExperts-DHCP-ClientIP 36 ipaddr # DHCP Opt50 +ATTRIBUTE VasExperts-DHCP-Request 37 integer +ATTRIBUTE VasExperts-DHCP-RelayRemoteId 38 octets # DHCP Opt82 subopt 2 +ATTRIBUTE VasExperts-DHCP-RelayCircuitId 39 octets # DHCP Opt82 subopt 1 + +VALUE VasExperts-DHCP-Request Discover 0 +VALUE VasExperts-DHCP-Request Inform 1 +VALUE VasExperts-DHCP-Request Request 2 + +# Radius -> DHCP (Access-Accept, Access-Reject) +ATTRIBUTE VasExperts-DHCP-Option 40 octets # Any DHCP option in binary form +ATTRIBUTE VasExperts-DHCP-DNS 41 ipaddr # DNS IP address +ATTRIBUTE VasExperts-DHCP-Gateway 42 ipaddr # Gateway IP address +ATTRIBUTE VasExperts-BOOTP-SName 43 string # BOOTP SName +ATTRIBUTE VasExperts-BOOTP-File 44 string # BOOTP File +ATTRIBUTE VasExperts-DHCP-Option-IP 45 string # IPv4 option: "opt:192.168.6.90", for example: "42:192.168.6.90" +ATTRIBUTE VasExperts-DHCP-Option-Num 46 string # Numeric option: "opt:1500", for example: "58:3600" +ATTRIBUTE VasExperts-DHCP-Option-String 47 string # String option: "opt:text", for example: "56:Hello from DHCP!" +ATTRIBUTE VasExperts-DHCP-Option-Bin 48 string # Binary option in hex form: "opt:xxxxxxxx", for example: "58:100E" + +ATTRIBUTE VasExperts-ARP-SourceIP 60 ipaddr # ARP source IP +ATTRIBUTE VasExperts-ARP-TargetIP 61 ipaddr # ARP target IP + +# DHCPv6 -> Radius attributes +ATTRIBUTE VasExperts-DHCPv6-Request 70 integer # DHCPv6 request type +ATTRIBUTE VasExperts-DHCPv6-UserClass 71 octets # DHCPv6 User Class option +ATTRIBUTE VasExperts-DHCPv6-VendorClass 72 octets # DHCPv6 Vendor Class option +ATTRIBUTE VasExperts-DHCPv6-RemoteId 73 octets # DHCPv6 RemoteId option [RFC 4649] +ATTRIBUTE VasExperts-DHCPv6-SubsId 74 octets # DHCPv6 SubscriberId option [RFC 4580] +ATTRIBUTE VasExperts-DHCPv6-Delegated 75 integer # DHCPv6 flag: (1) - CPE requests delegated prefix, (0) - does not + +# Radius -> DHCPv6 attributes +ATTRIBUTE VasExperts-DHCP-Option-IPv6 80 string # IPv6 option: "opt:2001:fde3::709", for example: "22:2001:fde3::709" +ATTRIBUTE VasExperts-DHCP-Option-IPv6-Prefix 81 string # IPv6 prefix option: "opt:2001:fde3/64" +ATTRIBUTE VasExperts-DHCP6-Option-Num 82 string # DHCPv6 numeric option: "opt:1500", for example: "58:3600" +ATTRIBUTE VasExperts-DHCP6-Option-String 83 string # DHCPv6 string option: "opt:text", for example: "56:Hello from DHCP!" +ATTRIBUTE VasExperts-DHCP6-Option-Bin 84 string # DHCPv6 binary option in hex form: "opt:xxxxxxxx", for example: "58:100E" + +VALUE VasExperts-DHCPv6-Request Solicit 1 +VALUE VasExperts-DHCPv6-Request Request 3 +VALUE VasExperts-DHCPv6-Request Renew 5 +VALUE VasExperts-DHCPv6-Request Rebind 6 + +# Attributes 250 - 255 are dedicated to the customer's private use and are not used (ignored) by pcrf + +END-VENDOR VasExperts diff --git a/resources/protocols/radius/dictionary.verizon b/resources/protocols/radius/dictionary.verizon index 0d454182..4bd86931 100644 --- a/resources/protocols/radius/dictionary.verizon +++ b/resources/protocols/radius/dictionary.verizon @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2018 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Verizon RADIUS Dictionary for Diameter Rf diff --git a/resources/protocols/radius/dictionary.versanet b/resources/protocols/radius/dictionary.versanet index 1060a355..e63c429a 100644 --- a/resources/protocols/radius/dictionary.versanet +++ b/resources/protocols/radius/dictionary.versanet @@ -1,5 +1,6 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # dictionary.versanet Vendor specfic attributes for versanet # diff --git a/resources/protocols/radius/dictionary.vqp b/resources/protocols/radius/dictionary.vqp deleted file mode 100644 index a0bcbeb1..00000000 --- a/resources/protocols/radius/dictionary.vqp +++ /dev/null @@ -1,112 +0,0 @@ -# -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors -############################################################################## -# -# Cisco's VLAN Query Protocol -# -# This dictionary is NOT a RADIUS dictionary, but is used for a -# similar purpose. -# -# The default destination port is 1589. -# -# $Id: 78fa95cf475798736674cbba97d8653a3ba78408 $ -# -############################################################################## - -# -# We've allocated "fake" attribute 0x2b00 ... 0x2cff for VQP. -# -# -# 0x2b00..0x2bff are for the VQP packet headers. -# 0x2c00..0x2cff are for the VQP attributes. -# -# Note that the VQP protocol specifies 0x0c01..0x0c08 as the -# real numbers for the VQP attributes. We've added '0x2000' -# to them to separate them from RADIUS attributes... -# - -# -# VQP Op codes -# -ATTRIBUTE VQP-Packet-Type 0x2b00 integer -ATTRIBUTE VQP-Error-Code 0x2b01 integer -ATTRIBUTE VQP-Sequence-Number 0x2b02 integer - -# -# VQP Attributes -# -ATTRIBUTE VQP-Client-IP-Address 0x2c01 ipaddr -ATTRIBUTE VQP-Port-Name 0x2c02 string -ATTRIBUTE VQP-VLAN-Name 0x2c03 string - -# VTP domain -ATTRIBUTE VQP-Domain-Name 0x2c04 string - -# Encapsulates an Ethernet frame... -ATTRIBUTE VQP-Ethernet-Frame 0x2c05 octets -ATTRIBUTE VQP-MAC 0x2c06 ether -ATTRIBUTE VQP-Unknown 0x2c07 octets -ATTRIBUTE VQP-Cookie 0x2c08 ether - -# -# VQP integer mappings -# - -VALUE VQP-Packet-Type VQP-Join-Request 1 -VALUE VQP-Packet-Type VQP-Join-Response 2 -VALUE VQP-Packet-Type VQP-Reconfirm-Request 3 -VALUE VQP-Packet-Type VQP-Reconfirm-Response 4 - -VALUE VQP-Packet-Type Do-Not-Respond 256 - -VALUE VQP-Error-Code VQP-No-Error 0 -VALUE VQP-Error-Code VQP-Wrong-Version 1 -VALUE VQP-Error-Code VQP-Insufficient-Resources 2 -VALUE VQP-Error-Code VQP-Deny 3 -VALUE VQP-Error-Code VQP-Shutdown 4 -VALUE VQP-Error-Code VQP-Wrong-Mgmt-Domain 5 - -###################################################################### -# -# Duplicate names here, for simplicity -# -###################################################################### - -# -# VMPS Op codes -# -ATTRIBUTE VMPS-Packet-Type 0x2b00 integer -ATTRIBUTE VMPS-Error-Code 0x2b01 integer -ATTRIBUTE VMPS-Sequence-Number 0x2b02 integer - -# -# VMPS Attributes -# -ATTRIBUTE VMPS-Client-IP-Address 0x2c01 ipaddr -ATTRIBUTE VMPS-Port-Name 0x2c02 string -ATTRIBUTE VMPS-VLAN-Name 0x2c03 string - -# VTP domain -ATTRIBUTE VMPS-Domain-Name 0x2c04 string - -# Encapsulates an Ethernet frame... -ATTRIBUTE VMPS-Ethernet-Frame 0x2c05 octets -ATTRIBUTE VMPS-MAC 0x2c06 ether -ATTRIBUTE VMPS-Unknown 0x2c07 octets -ATTRIBUTE VMPS-Cookie 0x2c08 ether - -# -# VMPS integer mappings -# - -VALUE VMPS-Packet-Type VMPS-Join-Request 1 -VALUE VMPS-Packet-Type VMPS-Join-Response 2 -VALUE VMPS-Packet-Type VMPS-Reconfirm-Request 3 -VALUE VMPS-Packet-Type VMPS-Reconfirm-Response 4 - -VALUE VMPS-Error-Code VMPS-No-Error 0 -VALUE VMPS-Error-Code VMPS-Wrong-Version 1 -VALUE VMPS-Error-Code VMPS-Insufficient-Resources 2 -VALUE VMPS-Error-Code VMPS-Deny 3 -VALUE VMPS-Error-Code VMPS-Shutdown 4 -VALUE VMPS-Error-Code VMPS-Wrong-Mgmt-Domain 5 diff --git a/resources/protocols/radius/dictionary.walabi b/resources/protocols/radius/dictionary.walabi index 0713c832..d6b8a16c 100644 --- a/resources/protocols/radius/dictionary.walabi +++ b/resources/protocols/radius/dictionary.walabi @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Walabi Store & Forward FAX attributes. # -# $Id: 9f7c85e6d9096872bfba1254288a84a3baa4feef $ +# $Id: 8f0167333f7f4e73551b15ca26c5fb63ea66b53c $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.waverider b/resources/protocols/radius/dictionary.waverider index b1beef74..3de3f70f 100644 --- a/resources/protocols/radius/dictionary.waverider +++ b/resources/protocols/radius/dictionary.waverider @@ -1,8 +1,9 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # http://www.waverider.com/ -# $Id: e56d7426b8cbef976d3b6afff85a0c6276634821 $ +# $Id: ddd1dfcf7e1975bc75e4372e14007bd01f2aaa44 $ # VENDOR Waverider 2979 diff --git a/resources/protocols/radius/dictionary.wichorus b/resources/protocols/radius/dictionary.wichorus index 20295e03..a1a44286 100644 --- a/resources/protocols/radius/dictionary.wichorus +++ b/resources/protocols/radius/dictionary.wichorus @@ -1,10 +1,11 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # Dictionary for WiChorus Inc. VSA's. # http://www.wichorus.com/ # -# Version: $Id: 4cfa70cbf64f40aa6d6677940a3bfaa6b7096221 $ +# Version: $Id: 9b3f5990b05576b53f33e39758ca205f6c480b77 $ # VENDOR Wichorus 27030 diff --git a/resources/protocols/radius/dictionary.wifialliance b/resources/protocols/radius/dictionary.wifialliance new file mode 100644 index 00000000..0da28640 --- /dev/null +++ b/resources/protocols/radius/dictionary.wifialliance @@ -0,0 +1,94 @@ +# -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# +############################################################################## +# +# WiFi-Alliance attributes for Hotspot 2.0 +# +# $Id: a8955618027ba007beb09c82bf1eeafd1cddf4f1 $ +# +############################################################################## + +VENDOR WiFi-Alliance 40808 + +BEGIN-VENDOR WiFi-Alliance + +# 0 1 2 3 +# 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +# | Server Method | Subscription Remediation Server URL +# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +# +# Server Method +# +# 0 = OMA DM +# 1 = Soap XML SPP +# 2..255 reserved +# +ATTRIBUTE HS20-Subscription-Remediation-Needed 1 octets +ATTRIBUTE HS20-AP-Version 2 byte + +# 0 1 2 3 +# 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +# | Version | PPS MO UpdateIdentifier | +# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +# +# Version +# +# 0 = release 1 +# 1 = release 2 +# +ATTRIBUTE HS20-Mobile-Device-Version 3 octets + +# 0 1 2 3 +# 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +# | Code | Re-auth Delay | URL +# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +# +# Code +# +# 0 = User's subscription does not allow or no longer allows access at this BSS +# 1 = User's subscription does not allow or no longer allows access at this ESS +# +# +# Re-Auth delay = delay in seconds that a mobile device waits before attempting +# reassociation. +# 0 == delay is decided by the mobile device. +# +# URL = UTF-8 encoded URL. +# Which provides a webpage explaining why the mobile device was +# not authorized (or is no longer authorized) +# +ATTRIBUTE HS20-Deauthentication-Request 4 octets + +# 0 1 2 3 +# 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +# | SWT | Session Information URL +# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +# +# SWT = Session Warning Time is the number of minutes of advance +# notice an AP shall provide to the mobile device before terminating +# its session. When SWT is set to the special value of 255, the AP +# (802.1X authenticator) chooses the session warning time value. +# +# Session Information URL field: URL which is transmitted to a mobile +# device in a BSS Transition Management Request frame SWT minutes +# before the mobile device’s session is terminated. The URL provides +# the location of a webpage with information for the user on how to +# extend the session. +# +ATTRIBUTE HS20-Session-Information-URL 5 octets + +# Values are: +# +# 5A-03-BA-00-00 OpenRoaming for All Identities, settlement-free, no personal data requested, baseline QoS +# 5A-03-BA-08-00 "OpenRoaming for Educational or Research Identities, settlement-free, no personal data requested, baseline QoS" +ATTRIBUTE HS20-Roaming-Consortium 6 octets + + + +END-VENDOR WiFi-Alliance diff --git a/resources/protocols/radius/dictionary.wimax b/resources/protocols/radius/dictionary.wimax index 984f90b5..2a4dffe5 100644 --- a/resources/protocols/radius/dictionary.wimax +++ b/resources/protocols/radius/dictionary.wimax @@ -1,4 +1,6 @@ # -*- text -*- +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 ############################################################################## # # WiMAX Forum @@ -51,7 +53,7 @@ # ############################################################################## # -# $Id$ +# $Id: 4d220eaf33b147454b80a41d5ab0f0c2c8363d71 $ # ############################################################################## @@ -66,6 +68,13 @@ ATTRIBUTE WiMAX-Release 1 string ATTRIBUTE WiMAX-Accounting-Capabilities 2 byte ATTRIBUTE WiMAX-Hotlining-Capabilities 3 byte ATTRIBUTE WiMAX-Idle-Mode-Notification-Cap 4 byte +ATTRIBUTE WiMAX-ASN-IP-Service-Capabilities 5 byte +ATTRIBUTE WiMAX-VCSN-IP-Service-Capabilities 6 byte +ATTRIBUTE WiMAX-Authorized-IP-Services 7 byte +ATTRIBUTE WiMAX-Authorized-Anchor-Locations 8 byte +ATTRIBUTE WiMAX-ASN-Ethernet-Service-Capabilities 9 byte +ATTRIBUTE WiMAX-VCSN-Ethernet-Service-Capabilities 10 byte +ATTRIBUTE WiMAX-Authorized-Ethernet-Services 11 byte # This is really a bitmap VALUE WiMAX-Accounting-Capabilities No-Accounting 0 @@ -82,6 +91,19 @@ VALUE WiMAX-Hotlining-Capabilities IP-Redirection 8 VALUE WiMAX-Idle-Mode-Notification-Cap Not-Supported 0 VALUE WiMAX-Idle-Mode-Notification-Cap Supported 1 +VALUE WiMAX-ASN-IP-Service-Capabilities DHCP-Relay 1 +VALUE WiMAX-ASN-IP-Service-Capabilities DHCP-Proxy 2 +VALUE WiMAX-ASN-IP-Service-Capabilities FA 4 +VALUE WiMAX-ASN-IP-Service-Capabilities PMIP-Client 8 + +VALUE WiMAX-ASN-Ethernet-Service-Capabilities eAFF-IPv4-Transport 1 +VALUE WiMAX-ASN-Ethernet-Service-Capabilities eAFF-IPv6-Transport 2 +VALUE WiMAX-ASN-Ethernet-Service-Capabilities eFA 4 + +VALUE WiMAX-VCSN-Ethernet-Service-Capabilities eCFF-IPv4-Transport 1 +VALUE WiMAX-VCSN-Ethernet-Service-Capabilities eCFF-IPv6-Transport 2 +VALUE WiMAX-VCSN-Ethernet-Service-Capabilities eHAv4 4 +VALUE WiMAX-VCSN-Ethernet-Service-Capabilities eHAv6 8 END-TLV WiMAX-Capability ATTRIBUTE WiMAX-Device-Authentication-Indicator 2 byte @@ -139,8 +161,8 @@ ATTRIBUTE WiMAX-Hotline-Indicator 24 string ATTRIBUTE WiMAX-Prepaid-Indicator 25 byte ATTRIBUTE WiMAX-PDFID 26 short ATTRIBUTE WiMAX-SDFID 27 short -ATTRIBUTE WiMAX-Packet-Flow-Descriptor 28 tlv +ATTRIBUTE WiMAX-Packet-Flow-Descriptor 28 tlv BEGIN-TLV WiMAX-Packet-Flow-Descriptor ATTRIBUTE WiMAX-Packet-Data-Flow-Id 1 short ATTRIBUTE WiMAX-Service-Data-Flow-Id 2 short @@ -164,6 +186,49 @@ ATTRIBUTE WiMAX-Uplink-QOS-Id 7 byte ATTRIBUTE WiMAX-Downlink-QOS-Id 8 byte ATTRIBUTE WiMAX-Uplink-Classifier 9 string ATTRIBUTE WiMAX-Downlink-Classifier 10 string +ATTRIBUTE WiMAX-Classifier 11 tlv + +BEGIN-TLV WiMAX-Classifier + ATTRIBUTE WiMAX-ClassifierID 1 integer + ATTRIBUTE WiMAX-Classifier-Priority 2 integer + ATTRIBUTE WiMAX-Classifier-Protocol 3 integer + ATTRIBUTE WiMAX-Classifier-Direction 4 byte + +VALUE WiMAX-Classifier-Direction Reserved-0 0 +VALUE WiMAX-Classifier-Direction IN 1 +VALUE WiMAX-Classifier-Direction OUT 2 +VALUE WiMAX-Classifier-Direction Bi-Directional 3 +VALUE WiMAX-Classifier-Direction FF 4 + +# Sub-TLV inside sub-TLV inside sub-TLV. How deep does the rabbit hole go? + ATTRIBUTE WiMAX-Source-Specification 5 tlv + + BEGIN-TLV WiMAX-Source-Specification + ATTRIBUTE WiMAX-Source-IPAddress 1 ipaddr + ATTRIBUTE WiMAX-Source-IPAddressRange 2 octets # 2 of ipv4addr OR ipv6addr + ATTRIBUTE WiMAX-Source-IPAddressMask 3 combo-ip + ATTRIBUTE WiMAX-Source-Port 4 short + ATTRIBUTE WiMAX-Source-Port-Range 5 integer # really 2 short + ATTRIBUTE WiMAX-Source-Inverted 6 byte + ATTRIBUTE WiMAX-Source-Assigned 7 byte + END-TLV WiMAX-Source-Specification + + ATTRIBUTE WiMAX-Destination-Specification 6 tlv + + BEGIN-TLV WiMAX-Destination-Specification + ATTRIBUTE WiMAX-Destination-IPAddress 1 ipaddr + ATTRIBUTE WiMAX-Destination-IPAddressRange 2 octets # 2 of ipv4addr OR ipv6addr + ATTRIBUTE WiMAX-Destination-IPAddressMask 3 combo-ip + ATTRIBUTE WiMAX-Destination-Port 4 short + ATTRIBUTE WiMAX-Destination-Port-Range 5 integer # really 2 short + ATTRIBUTE WiMAX-Destination-Inverted 6 byte + ATTRIBUTE WiMAX-Destination-Assigned 7 byte + END-TLV WiMAX-Destination-Specification + +ATTRIBUTE WiMAX-IP-TOS/DSCP-Range-and-Mask 7 octets +ATTRIBUTE WiMAX-VLAN-ID 8 integer +ATTRIBUTE WiMAX-802.1p 9 octets +END-TLV WiMAX-Classifier END-TLV WiMAX-Packet-Flow-Descriptor ATTRIBUTE WiMAX-QoS-Descriptor 29 tlv @@ -185,6 +250,23 @@ ATTRIBUTE WiMAX-Unsolicited-Grant-Interval 13 short ATTRIBUTE WiMAX-SDU-Size 14 short ATTRIBUTE WiMAX-Unsolicited-Polling-Interval 15 short ATTRIBUTE WiMAX-Media-Flow-Description-SDP 16 string +ATTRIBUTE WiMAX-R3-IF-Descriptor 17 tlv + +BEGIN-TLV WiMAX-R3-IF-Descriptor + ATTRIBUTE WiMAX-R3-IF-Name 1 string + ATTRIBUTE WiMAX-R3-IF-ID 2 octets + # ATTRIBUTE WiMAX-PDFID 3 short + ATTRIBUTE WiMAX-IPv4-addr 4 ipaddr + ATTRIBUTE WiMAX-IPv4-Netmask 5 ipaddr + ATTRIBUTE WiMAX-DGW-IPv4-addr 6 ipaddr +END-TLV WiMAX-R3-IF-Descriptor + +ATTRIBUTE WiMAX-DHCP-Option 18 tlv + +BEGIN-TLV WiMAX-DHCP-Option + ATTRIBUTE WiMAX-Ref-R3-IF-Name 1 string + ATTRIBUTE WiMAX-DHCP-Option-Container 2 string +END-TLV WiMAX-DHCP-Option VALUE WiMAX-Schedule-Type Best-Effort 2 VALUE WiMAX-Schedule-Type nrtPS 3 @@ -447,4 +529,238 @@ ATTRIBUTE WiMAX-vDHCP-RK 75 octets encrypt=2 ATTRIBUTE WiMAX-vDHCP-RK-Key-ID 76 integer ATTRIBUTE WiMAX-vDHCP-RK-Lifetime 77 integer +ATTRIBUTE WiMAX-PMIP-Authenticated-Network-Identity 78 string +ATTRIBUTE WiMAX-Visited-Framed-IP-Address 79 ipaddr +ATTRIBUTE WiMAX-Visited-Framed-IPv6-Prefix 80 ipv6prefix +ATTRIBUTE WiMAX-Visited-Framed-Interface-Id 81 ifid +ATTRIBUTE WiMAX-MIP-Authorization-Status 82 integer + +VALUE WiMAX-MIP-Authorization-Status False 0 +VALUE WiMAX-MIP-Authorization-Status True 1 + +# +# FIXME: See WiMAX-Src-Dst-Specification for TLVs +# +ATTRIBUTE WiMAX-Flow-Descriptor-v2 83 tlv + +ATTRIBUTE WiMAX-Packet-Flow-Descriptor-v2 84 tlv +BEGIN-TLV WiMAX-Packet-Flow-Descriptor-v2 +ATTRIBUTE WiMAX-PFDv2-Packet-Data-Flow-Id 1 short +ATTRIBUTE WiMAX-PFDv2-Service-Data-Flow-Id 2 short +ATTRIBUTE WiMAX-PFDv2-Service-Profile-Id 3 integer +ATTRIBUTE WiMAX-PFDv2-Direction 4 byte +ATTRIBUTE WiMAX-PFDv2-Activation-Trigger 5 byte +ATTRIBUTE WiMAX-PFDv2-Transport-Type 6 byte +ATTRIBUTE WiMAX-PFDv2-Uplink-QoS-Id 7 byte +ATTRIBUTE WiMAX-PFDv2-Downlink-QoS-Id 8 byte + +# +# Classifiers +# +ATTRIBUTE WiMAX-PFDv2-Classifier 9 tlv + +BEGIN-TLV WiMAX-PFDv2-Classifier + ATTRIBUTE WiMAX-PFDv2-Classifier-Id 1 byte + ATTRIBUTE WiMAX-PFDv2-Classifier-Priority 2 byte + ATTRIBUTE WiMAX-PFDv2-Classifier-Protocol 3 byte + ATTRIBUTE WiMAX-PFDv2-Classifier-Direction 4 byte + + ATTRIBUTE WiMAX-PFDv2-Classifier-Source-Spec 5 tlv + BEGIN-TLV WiMAX-PFDv2-Classifier-Source-Spec + ATTRIBUTE WiMAX-PFDv2-Src-IP-Address 1 combo-ip + ATTRIBUTE WiMAX-PFDv2-Src-IP-Address-Range 2 octets # 2 of ipv4addr OR ipv6addr + ATTRIBUTE WiMAX-PFDv2-Src-IP-Address-Mask 3 combo-ip + ATTRIBUTE WiMAX-PFDv2-Src-Port 4 short + ATTRIBUTE WiMAX-PFDv2-Src-Port-Range 5 integer # really 2 short + ATTRIBUTE WiMAX-PFDv2-Src-Inverted 6 byte + ATTRIBUTE WiMAX-PFDv2-Src-Assigned 7 byte + + VALUE WiMAX-PFDv2-Src-Assigned Src-Assigned 1 + VALUE WiMAX-PFDv2-Src-Assigned Dst-Assigned 2 + VALUE WiMAX-PFDv2-Src-Assigned Src-Dst-Assigned 3 + + ATTRIBUTE WiMAX-PFDv2-Src-MAC-Address 8 ether + ATTRIBUTE WiMAX-PFDv2-Src-MAC-Mask 9 ether + END-TLV WiMAX-PFDv2-Classifier-Source-Spec + + ATTRIBUTE WiMAX-PFDv2-Classifier-Dest-Spec 6 tlv + ATTRIBUTE WiMAX-PFDv2-Classifier-IP-ToS-DSCP 7 byte + ATTRIBUTE WiMAX-PFDv2-Classifier-Action 8 byte + + ATTRIBUTE WiMAX-PFDv2-Classifier-Eth-Option 9 tlv + + BEGIN-TLV WiMAX-PFDv2-Classifier-Eth-Option + ATTRIBUTE WiMAX-PFDv2-Eth-Proto-Type 1 tlv + BEGIN-TLV WiMAX-PFDv2-Eth-Proto-Type + ATTRIBUTE WiMAX-PFDv2-Eth-Proto-Type-Ethertype 1 short + ATTRIBUTE WiMAX-PFDv2-Eth-Proto-Type-DSAP 2 byte + END-TLV WiMAX-PFDv2-Eth-Proto-Type + + ATTRIBUTE WiMAX-PFDv2-Eth-VLAN-Id 2 tlv + BEGIN-TLV WiMAX-PFDv2-Eth-VLAN-Id + ATTRIBUTE WiMAX-PFDv2-Eth-VLAN-Id-S-VID 1 integer + ATTRIBUTE WiMAX-PFDv2-Eth-VLAN-Id-C-VID 2 integer + END-TLV WiMAX-PFDv2-Eth-VLAN-Id + + + ATTRIBUTE WiMAX-PFDv2-Eth-Priority-Range 3 tlv + BEGIN-TLV WiMAX-PFDv2-Eth-Priority-Range + ATTRIBUTE WiMAX-PFDv2-Eth-Priority-Range-Low 1 byte + ATTRIBUTE WiMAX-PFDv2-Eth-Priority-Range-High 2 byte + END-TLV WiMAX-PFDv2-Eth-Priority-Range + + ATTRIBUTE WiMAX-XXX 4 byte + END-TLV WiMAX-PFDv2-Classifier-Eth-Option + + ATTRIBUTE WiMAX-PFDv2-Paging-Preference 10 byte + ATTRIBUTE WiMAX-PFDv2-VLAN-Tag-Rule-Id 11 short +END-TLV WiMAX-PFDv2-Classifier + +VALUE WiMAX-PFDv2-Direction Uplink 1 +VALUE WiMAX-PFDv2-Direction Downlink 2 +VALUE WiMAX-PFDv2-Direction Bi-Directional 3 + +VALUE WiMAX-PFDv2-Activation-Trigger Provisioned 1 +VALUE WiMAX-PFDv2-Activation-Trigger Admit 2 +VALUE WiMAX-PFDv2-Activation-Trigger Activate 4 +VALUE WiMAX-PFDv2-Activation-Trigger Dynamic 8 + +VALUE WiMAX-PFDv2-Transport-Type IPv4-CS 1 +VALUE WiMAX-PFDv2-Transport-Type IPv6-CS 2 +VALUE WiMAX-PFDv2-Transport-Type Ethernet 3 + +END-TLV WiMAX-Packet-Flow-Descriptor-v2 + +ATTRIBUTE WiMAX-VLAN-Tag-Processing-Descriptor 85 tlv +BEGIN-TLV WiMAX-VLAN-Tag-Processing-Descriptor +ATTRIBUTE WiMAX-VLAN-Tag-Rule-Id 1 short +ATTRIBUTE WiMAX-VLAN-Tag-C-VLAN-Priority 2 byte +ATTRIBUTE WiMAX-VLAN-Tag-VLAN-Id-Assignment 3 short +ATTRIBUTE WiMAX-VLAN-Tag-C-VLAN-Id 4 short +ATTRIBUTE WiMAX-VLAN-Tag-S-VLAN-Id 5 short +ATTRIBUTE WiMAX-VLAN-Tag-C-S-VLAN-Id-Mapping 6 integer +ATTRIBUTE WiMAX-VLAN-Tag-Local-Config-Info 7 octets +END-TLV WiMAX-VLAN-Tag-Processing-Descriptor + +ATTRIBUTE WiMAX-hDHCP-Server-Parameters 86 tlv +BEGIN-TLV WiMAX-hDHCP-Server-Parameters +ATTRIBUTE WiMAX-hDHCP-DHCPv4-Address 1 ipaddr +ATTRIBUTE WiMAX-hDHCP-DHCPv6-Address 2 ipv6addr +ATTRIBUTE WiMAX-hDHCP-DHCP-RK 3 string encrypt=2 +ATTRIBUTE WiMAX-hDHCP-DHCP-RK-Key-Id 4 integer +ATTRIBUTE WiMAX-hDHCP-DHCP-RK-Lifetime 5 integer +END-TLV WiMAX-hDHCP-Server-Parameters + +ATTRIBUTE WiMAX-vDHCP-Server-Parameters 87 tlv +BEGIN-TLV WiMAX-vDHCP-Server-Parameters +ATTRIBUTE WiMAX-vDHCP-DHCPv4-Address 1 ipaddr +ATTRIBUTE WiMAX-vDHCP-DHCPv6-Address 2 ipv6addr +ATTRIBUTE WiMAX-vDHCP-DHCP-RK 3 string encrypt=2 +ATTRIBUTE WiMAX-vDHCP-DHCP-RK-Key-Id 4 integer +ATTRIBUTE WiMAX-vDHCP-DHCP-RK-Lifetime 5 integer +END-TLV WiMAX-vDHCP-Server-Parameters + +ATTRIBUTE WiMAX-BS-Location 88 octets +ATTRIBUTE WiMAX-Visited-IPv4-HoA-PMIP6 89 byte + +VALUE WiMAX-Visited-IPv4-HoA-PMIP6 Fixed 1 +VALUE WiMAX-Visited-IPv4-HoA-PMIP6 Nomadic 2 +VALUE WiMAX-Visited-IPv4-HoA-PMIP6 Mobile 3 + +ATTRIBUTE WiMAX-MS-Authenticated 90 byte + +VALUE WiMAX-MS-Authenticated No 0 +VALUE WiMAX-MS-Authenticated Yes 1 + +ATTRIBUTE WiMAX-PMIP6-Service-Info 126 short + +ATTRIBUTE WiMAX-hLMA-IPv6-PMIP6 127 ipv6addr +ATTRIBUTE WiMAX-hLMA-IPv4-PMIP6 128 ipaddr +ATTRIBUTE WiMAX-vLMA-IPv6-PMIP6 129 ipv6addr +ATTRIBUTE WiMAX-vLMA-IPv4-PMIP6 130 ipaddr +ATTRIBUTE WiMAX-PMIP6-RK-Key 131 octets encrypt=2 +ATTRIBUTE WiMAX-PMIP6-RK-SPI 132 integer +ATTRIBUTE WiMAX-Home-HNP-PMIP6 133 ipv6prefix +ATTRIBUTE WiMAX-Home-Interface-Id-PMIP6 134 ifid +ATTRIBUTE WiMAX-Home-IPv4-HoA-PMIP6 135 ipaddr +ATTRIBUTE WiMAX-Visited-HNP-PMIP6 136 ipv6prefix +ATTRIBUTE WiMAX-Visited-Interface-Id-PMIP6 137 ifid +ATTRIBUTE WiMAX-Visited-IPv4-HoA-PMIP6-2 138 ipaddr + +ATTRIBUTE WiMAX-AE-Command-Code 143 byte + +VALUE WiMAX-AE-Command-Code Authentication-Information-Request 1 +VALUE WiMAX-AE-Command-Code Authentication-Information-Answer 2 +VALUE WiMAX-AE-Command-Code Update-Location-Request 3 +VALUE WiMAX-AE-Command-Code Update-Location-Answer 4 +VALUE WiMAX-AE-Command-Code Cancel-Location-Request 5 +VALUE WiMAX-AE-Command-Code Cancel-Location-Answer 6 +VALUE WiMAX-AE-Command-Code Purge-UE-Request 7 +VALUE WiMAX-AE-Command-Code Purge-UE-Answer 8 +VALUE WiMAX-AE-Command-Code Insert-Subscriber-Data-Request 9 +VALUE WiMAX-AE-Command-Code Insert-Subscriber-Data-Answer 10 +VALUE WiMAX-AE-Command-Code Delete-Subscriber-Data-Request 11 +VALUE WiMAX-AE-Command-Code Delete-Subscriber-Data-Answer 12 +VALUE WiMAX-AE-Command-Code Notification-Request 13 +VALUE WiMAX-AE-Command-Code Notification-Answer 14 +VALUE WiMAX-AE-Command-Code Accounting 15 + +ATTRIBUTE WiMAX-Requested-EUTRAN-Authentication-Info 144 tlv +BEGIN-TLV WiMAX-Requested-EUTRAN-Authentication-Info +ATTRIBUTE WiMAX-Number-Of-Requested-Vectors 1 integer +ATTRIBUTE WiMAX-Immediate-Response-Preferred 2 integer +ATTRIBUTE WiMAX-Re-synchronization-Info 3 octets +END-TLV WiMAX-Requested-EUTRAN-Authentication-Info + +VALUE WiMAX-Immediate-Response-Preferred Yes 0 + +ATTRIBUTE WiMAX-Authentication-Info 145 tlv +BEGIN-TLV WiMAX-Authentication-Info +ATTRIBUTE WiMAX-E-UTRAN-Vector 1 tlv +BEGIN-TLV WiMAX-E-UTRAN-Vector + ATTRIBUTE WiMAX-E-UTRAN-Vector-Item-Number 1 integer + ATTRIBUTE WiMAX-E-UTRAN-Vector-RAND 2 octets + ATTRIBUTE WiMAX-E-UTRAN-Vector-XRES 3 octets + ATTRIBUTE WiMAX-E-UTRAN-Vector-AUTN 4 octets + ATTRIBUTE WiMAX-E-UTRAN-Vector-KASME 5 octets +END-TLV WiMAX-E-UTRAN-Vector +END-TLV WiMAX-Authentication-Info + +ATTRIBUTE WiMAX-Visited-PLMN-ID 146 octets + +ATTRIBUTE WiMAX-RAT-Type 150 integer + +ATTRIBUTE WiMAX-Terminal-Information 151 tlv +BEGIN-TLV WiMAX-Terminal-Information +# These can't both be 2? +ATTRIBUTE WiMAX-IMEI 2 string +ATTRIBUTE WiMAX-Software-Version 2 string +END-TLV WiMAX-Terminal-Information + +ATTRIBUTE WiMAX-Subscription-Data 154 tlv +BEGIN-TLV WiMAX-Subscription-Data +ATTRIBUTE WiMAX-UE-AMBR-DL 2 integer +ATTRIBUTE WiMAX-UE-AMBR-UL 3 integer +END-TLV WiMAX-Subscription-Data + +ATTRIBUTE WiMAX-Cancellation-Type 155 byte + +VALUE WiMAX-Cancellation-Type MME_UPDATE_PROCEDURE 0 +VALUE WiMAX-Cancellation-Type SUBSCRIPTION_WITHDRAWAL 2 +VALUE WiMAX-Cancellation-Type INITIAL_ATTACH_PROCEDURE 4 + +ATTRIBUTE WiMAX-EPS-Location-Information 156 tlv +BEGIN-TLV WiMAX-EPS-Location-Information +ATTRIBUTE WiMAX-E-UTRAN-Cell-Global-Identity 1 octets +ATTRIBUTE WiMAX-Tracking-Area-Identity 2 octets +ATTRIBUTE WiMAX-Geographical-Information 3 octets +ATTRIBUTE WiMAX-Geodetic-Information 4 octets +ATTRIBUTE WiMAX-Current-Location-Retrieved 5 byte +ATTRIBUTE WiMAX-Age-Of-Location-Information 6 integer + +VALUE WiMAX-Current-Location-Retrieved Active-Location-Retrieval 0 +END-TLV WiMAX-EPS-Location-Information + +ATTRIBUTE WiMAX-Service-Selection 166 string + END-VENDOR WiMAX diff --git a/resources/protocols/radius/dictionary.wimax.alvarion b/resources/protocols/radius/dictionary.wimax.alvarion index 1f839bda..db2df07a 100644 --- a/resources/protocols/radius/dictionary.wimax.alvarion +++ b/resources/protocols/radius/dictionary.wimax.alvarion @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Alvarion has taken it on themselves to produce a WiMAX dictionary @@ -12,7 +14,7 @@ # # You CANNOT use both dictionaries at the same time. # -# $Id: 94960143a8b8d73eceada9f47862d7343364ef5a $ +# $Id: 10c273fb0ca4be7436cba82d683bf315554664b8 $ # ############################################################################## @@ -21,10 +23,11 @@ VENDOR WiMAX 24757 format=1,1,c BEGIN-VENDOR WiMAX ATTRIBUTE WiMAX-Capability 1 tlv -ATTRIBUTE WiMAX-Release 1.1 string -ATTRIBUTE WiMAX-Accounting-Capabilities 1.2 byte -ATTRIBUTE WiMAX-Hotlining-Capabilities 1.3 byte -ATTRIBUTE WiMAX-Idle-Mode-Notification-Cap 1.4 byte +BEGIN-TLV WiMAX-Capability +ATTRIBUTE WiMAX-Release 1 string +ATTRIBUTE WiMAX-Accounting-Capabilities 2 byte +ATTRIBUTE WiMAX-Hotlining-Capabilities 3 byte +ATTRIBUTE WiMAX-Idle-Mode-Notification-Cap 4 byte # This is really a bitmap VALUE WiMAX-Accounting-Capabilities No-Accounting 0 @@ -40,6 +43,7 @@ VALUE WiMAX-Hotlining-Capabilities IP-Redirection 8 VALUE WiMAX-Idle-Mode-Notification-Cap Not-Supported 0 VALUE WiMAX-Idle-Mode-Notification-Cap Supported 1 +END-TLV WiMAX-Capability ATTRIBUTE WiMAX-Device-Authentication-Indicator 2 byte ATTRIBUTE WiMAX-GMT-Timezone-offset 3 signed @@ -104,107 +108,117 @@ ATTRIBUTE WiMAX-SDFID 27 short # some aspects of v1 (26/28) and v2 (26/84) # See their Radius Interoperability Spec documentation for additional details. ATTRIBUTE WiMAX-Packet-Flow-Descriptor 28 tlv -ATTRIBUTE WiMAX-Packet-Data-Flow-Id 28.1 short -ATTRIBUTE WiMAX-Service-Data-Flow-Id 28.2 short -ATTRIBUTE WiMAX-Service-Profile-Id 28.3 integer -ATTRIBUTE WiMAX-Direction 28.4 byte +BEGIN-TLV WiMAX-Packet-Flow-Descriptor +ATTRIBUTE WiMAX-Packet-Data-Flow-Id 1 short +ATTRIBUTE WiMAX-Service-Data-Flow-Id 2 short +ATTRIBUTE WiMAX-Service-Profile-Id 3 integer +ATTRIBUTE WiMAX-Direction 4 byte VALUE WiMAX-Direction Reserved-0 0 VALUE WiMAX-Direction Uplink 1 VALUE WiMAX-Direction Downlink 2 VALUE WiMAX-Direction Bi-Directional 3 -ATTRIBUTE WiMAX-Activation-Trigger 28.5 byte # bitmap -ATTRIBUTE WiMAX-Transport-Type 28.6 byte +ATTRIBUTE WiMAX-Activation-Trigger 5 byte # bitmap +ATTRIBUTE WiMAX-Transport-Type 6 byte VALUE WiMAX-Transport-Type Reserved-0 0 VALUE WiMAX-Transport-Type IPv4-CS 1 VALUE WiMAX-Transport-Type IPv6-CS 2 VALUE WiMAX-Transport-Type Ethernet 3 -ATTRIBUTE WiMAX-Uplink-QOS-Id 28.7 byte -ATTRIBUTE WiMAX-Downlink-QOS-Id 28.8 byte +ATTRIBUTE WiMAX-Uplink-QOS-Id 7 byte +ATTRIBUTE WiMAX-Downlink-QOS-Id 8 byte # The following are not listed in Alvarion's Spec -#ATTRIBUTE WiMAX-Uplink-Classifier 28.9 string -#ATTRIBUTE WiMAX-Downlink-Classifier 28.10 string +#ATTRIBUTE WiMAX-Uplink-Classifier 9 string +#ATTRIBUTE WiMAX-Downlink-Classifier 10 string # Added by Alvarion -ATTRIBUTE WiMAX-Classifier 28.11 tlv - -ATTRIBUTE WiMAX-ClassifierID 28.11.1 byte -ATTRIBUTE WiMAX-Classifier-Priority 28.11.2 byte -ATTRIBUTE WiMAX-Classifier-Protocol 28.11.3 byte -ATTRIBUTE WiMAX-Classifier-Direction 28.11.4 byte - -VALUE WiMAX-Classifier-Direction Reserved-0 0 -VALUE WiMAX-Classifier-Direction IN 1 -VALUE WiMAX-Classifier-Direction OUT 2 -VALUE WiMAX-Classifier-Direction Bi-Directional 3 -VALUE WiMAX-Classifier-Direction FF 4 - -ATTRIBUTE WiMAX-Source-Specification 28.11.5 tlv - -ATTRIBUTE WiMAX-Source-IPAddress 28.11.5.1 combo-ip -# 2 IPv4 or IPv6 addresses -ATTRIBUTE WiMAX-Source-IPAddressRange 28.11.5.2 octets -# IPv4/IPv6 subnet mask plus bit-width mask -ATTRIBUTE WiMAX-Source-IPAddressMask 28.11.5.3 octets -ATTRIBUTE WiMAX-Source-Port 28.11.5.4 short -# 4 bytes: first two indicate beginning of range, second two indicate end -ATTRIBUTE WiMAX-Source-Port-Range 28.11.5.5 octets -ATTRIBUTE WiMAX-Source-Inverted 28.11.5.6 byte - -VALUE WiMAX-Source-Inverted False 0 -VALUE WiMAX-Source-Inverted True 1 - -# 8 bit unsigned enum -ATTRIBUTE WiMAX-Source-Assigned 28.11.5.7 byte - -VALUE WiMAX-Source-Assigned Src-Assigned 1 -VALUE WiMAX-Source-Assigned Dst-Assigned 2 -VALUE WiMAX-Source-Assigned Src-Dst-Assigned 3 - -ATTRIBUTE WiMAX-Destination-Specification 28.11.6 tlv - -ATTRIBUTE WiMAX-Destination-IPAddress 28.11.6.1 combo-ip -# 2 IPv4 or IPv6 addresses to indicate beginning/end of range -ATTRIBUTE WiMAX-Destination-IPAddressRange 28.11.6.2 octets -# IPv4/IPv6 subnet mask plus bit-width mask -ATTRIBUTE WiMAX-Destination-IPAddressMask 28.11.6.3 octets -ATTRIBUTE WiMAX-Destination-Port 28.11.6.4 short -# 4 bytes: first two indicate beginning of range, second two indicate end -ATTRIBUTE WiMAX-Destination-Port-Range 28.11.6.5 octets -ATTRIBUTE WiMAX-Destination-Inverted 28.11.6.6 byte - -VALUE WiMAX-Destination-Inverted False 0 -VALUE WiMAX-Destination-Inverted True 1 - -ATTRIBUTE WiMAX-Destination-Assigned 28.11.6.7 byte - -VALUE WiMAX-Destination-Assigned Src-Assigned 1 -VALUE WiMAX-Destination-Assigned Dst-Assigned 2 -VALUE WiMAX-Destination-Assigned Src-Dst-Assigned 3 - -ATTRIBUTE WiMAX-IP-TOS-DSCP-Range-and-Mask 28.11.7 octets -ATTRIBUTE WiMAX-VLAN-ID 28.11.9 short -ATTRIBUTE WiMAX-8021p 28.11.10 byte +ATTRIBUTE WiMAX-Classifier 11 tlv + +BEGIN-TLV WiMAX-Classifier + ATTRIBUTE WiMAX-ClassifierID 1 byte + ATTRIBUTE WiMAX-Classifier-Priority 2 byte + ATTRIBUTE WiMAX-Classifier-Protocol 3 byte + ATTRIBUTE WiMAX-Classifier-Direction 4 byte + + VALUE WiMAX-Classifier-Direction Reserved-0 0 + VALUE WiMAX-Classifier-Direction IN 1 + VALUE WiMAX-Classifier-Direction OUT 2 + VALUE WiMAX-Classifier-Direction Bi-Directional 3 + VALUE WiMAX-Classifier-Direction FF 4 + + ATTRIBUTE WiMAX-Source-Specification 5 tlv + + BEGIN-TLV WiMAX-Source-Specification + ATTRIBUTE WiMAX-Source-IPAddress 1 combo-ip + # 2 IPv4 or IPv6 addresses + ATTRIBUTE WiMAX-Source-IPAddressRange 2 octets + # IPv4/IPv6 subnet mask plus bit-width mask + ATTRIBUTE WiMAX-Source-IPAddressMask 3 octets + ATTRIBUTE WiMAX-Source-Port 4 short + # 4 bytes: first two indicate beginning of range, second two indicate end + ATTRIBUTE WiMAX-Source-Port-Range 5 octets + ATTRIBUTE WiMAX-Source-Inverted 6 byte + + VALUE WiMAX-Source-Inverted False 0 + VALUE WiMAX-Source-Inverted True 1 + + # 8 bit unsigned enum + ATTRIBUTE WiMAX-Source-Assigned 7 byte + + VALUE WiMAX-Source-Assigned Src-Assigned 1 + VALUE WiMAX-Source-Assigned Dst-Assigned 2 + VALUE WiMAX-Source-Assigned Src-Dst-Assigned 3 + END-TLV WiMAX-Source-Specification + + ATTRIBUTE WiMAX-Destination-Specification 6 tlv + + BEGIN-TLV WiMAX-Destination-Specification + ATTRIBUTE WiMAX-Destination-IPAddress 1 combo-ip + # 2 IPv4 or IPv6 addresses to indicate beginning/end of range + ATTRIBUTE WiMAX-Destination-IPAddressRange 2 octets + # IPv4/IPv6 subnet mask plus bit-width mask + ATTRIBUTE WiMAX-Destination-IPAddressMask 3 octets + ATTRIBUTE WiMAX-Destination-Port 4 short + # 4 bytes: first two indicate beginning of range, second two indicate end + ATTRIBUTE WiMAX-Destination-Port-Range 5 octets + ATTRIBUTE WiMAX-Destination-Inverted 6 byte + + VALUE WiMAX-Destination-Inverted False 0 + VALUE WiMAX-Destination-Inverted True 1 + + ATTRIBUTE WiMAX-Destination-Assigned 7 byte + + VALUE WiMAX-Destination-Assigned Src-Assigned 1 + VALUE WiMAX-Destination-Assigned Dst-Assigned 2 + VALUE WiMAX-Destination-Assigned Src-Dst-Assigned 3 + END-TLV WiMAX-Destination-Specification + + ATTRIBUTE WiMAX-IP-TOS-DSCP-Range-and-Mask 7 octets + ATTRIBUTE WiMAX-VLAN-ID 9 short + ATTRIBUTE WiMAX-8021p 10 byte +END-TLV WiMAX-Classifier +END-TLV WiMAX-Packet-Flow-Descriptor ATTRIBUTE WiMAX-QoS-Descriptor 29 tlv -ATTRIBUTE WiMAX-QoS-Id 29.1 byte -ATTRIBUTE WiMAX-Global-Service-Class-Name 29.2 string # 6 octets -ATTRIBUTE WiMAX-Service-Class-Name 29.3 string -ATTRIBUTE WiMAX-Schedule-Type 29.4 byte -ATTRIBUTE WiMAX-Traffic-Priority 29.5 byte -ATTRIBUTE WiMAX-Maximum-Sustained-Traffic-Rate 29.6 integer -ATTRIBUTE WiMAX-Minimum-Reserved-Traffic-Rate 29.7 integer -ATTRIBUTE WiMAX-Maximum-Traffic-Burst 29.8 integer -ATTRIBUTE WiMAX-Tolerated-Jitter 29.9 integer -ATTRIBUTE WiMAX-Maximum-Latency 29.10 integer -ATTRIBUTE WiMAX-Reduced-Resources-Code 29.11 byte -ATTRIBUTE WiMAX-Media-Flow-Type 29.12 byte -ATTRIBUTE WiMAX-Unsolicited-Grant-Interval 29.13 short -ATTRIBUTE WiMAX-SDU-Size 29.14 short -ATTRIBUTE WiMAX-Unsolicited-Polling-Interval 29.15 short -ATTRIBUTE WiMAX-Media-Flow-Description-SDP 29.16 string +BEGIN-TLV WiMAX-QoS-Descriptor +ATTRIBUTE WiMAX-QoS-Id 1 byte +ATTRIBUTE WiMAX-Global-Service-Class-Name 2 string # 6 octets +ATTRIBUTE WiMAX-Service-Class-Name 3 string +ATTRIBUTE WiMAX-Schedule-Type 4 byte +ATTRIBUTE WiMAX-Traffic-Priority 5 byte +ATTRIBUTE WiMAX-Maximum-Sustained-Traffic-Rate 6 integer +ATTRIBUTE WiMAX-Minimum-Reserved-Traffic-Rate 7 integer +ATTRIBUTE WiMAX-Maximum-Traffic-Burst 8 integer +ATTRIBUTE WiMAX-Tolerated-Jitter 9 integer +ATTRIBUTE WiMAX-Maximum-Latency 10 integer +ATTRIBUTE WiMAX-Reduced-Resources-Code 11 byte +ATTRIBUTE WiMAX-Media-Flow-Type 12 byte +ATTRIBUTE WiMAX-Unsolicited-Grant-Interval 13 short +ATTRIBUTE WiMAX-SDU-Size 14 short +ATTRIBUTE WiMAX-Unsolicited-Polling-Interval 15 short +ATTRIBUTE WiMAX-Media-Flow-Description-SDP 16 string +END-TLV WiMAX-QoS-Descriptor VALUE WiMAX-Schedule-Type Best-Effort 2 VALUE WiMAX-Schedule-Type nrtPS 3 @@ -232,7 +246,8 @@ ATTRIBUTE WiMAX-Control-Octets-In 32 integer ATTRIBUTE WiMAX-Control-Packets-Out 33 integer ATTRIBUTE WiMAX-Control-Octets-Out 34 integer ATTRIBUTE WiMAX-PPAC 35 tlv -ATTRIBUTE WiMAX-Available-In-Client 35.1 integer +BEGIN-TLV WiMAX-PPAC +ATTRIBUTE WiMAX-Available-In-Client 1 integer # Really a bitmap VALUE WiMAX-Available-In-Client Volume-Metering 1 @@ -242,6 +257,7 @@ VALUE WiMAX-Available-In-Client Pools 8 VALUE WiMAX-Available-In-Client Rating-Groups 0x10 VALUE WiMAX-Available-In-Client Multi-Services 0x20 VALUE WiMAX-Available-In-Client Tariff-Switch 0x40 +END-TLV WiMAX-PPAC ATTRIBUTE WiMAX-Session-Termination-Capability 36 integer @@ -249,29 +265,30 @@ ATTRIBUTE WiMAX-Session-Termination-Capability 36 integer VALUE WiMAX-Session-Termination-Capability Dynamic-Authorization 1 ATTRIBUTE WiMAX-PPAQ 37 tlv -ATTRIBUTE WiMAX-PPAQ-Quota-Identifier 37.1 octets -ATTRIBUTE WiMAX-Volume-Quota 37.2 integer #kb -ATTRIBUTE WiMAX-Volume-Threshold 37.3 integer #kb -ATTRIBUTE WiMAX-Duration-Quota 37.4 integer #s -ATTRIBUTE WiMAX-Duration-Threshold 37.5 integer #s -ATTRIBUTE WiMAX-Resource-Quota 37.6 integer -ATTRIBUTE WiMAX-Resource-Threshold 37.7 integer -ATTRIBUTE WiMAX-Update-Reason 37.8 integer -ATTRIBUTE WiMAX-Prepaid-Server 37.9 combo-ip -ATTRIBUTE WiMAX-Service-Id 37.10 string -ATTRIBUTE WiMAX-Rating-Group-Id 37.11 integer -ATTRIBUTE WiMAX-Termination-Action 37.12 byte -ATTRIBUTE WiMAX-Pool-Id 37.13 integer -ATTRIBUTE WiMAX-Pool-Multiplier 37.14 integer -ATTRIBUTE WiMAX-Requested-Action 37.15 byte -ATTRIBUTE WiMAX-Check-Balance-Result 37.16 byte +BEGIN-TLV WiMAX-PPAQ +ATTRIBUTE WiMAX-PPAQ-Quota-Identifier 1 octets +ATTRIBUTE WiMAX-Volume-Quota 2 integer #kb +ATTRIBUTE WiMAX-Volume-Threshold 3 integer #kb +ATTRIBUTE WiMAX-Duration-Quota 4 integer #s +ATTRIBUTE WiMAX-Duration-Threshold 5 integer #s +ATTRIBUTE WiMAX-Resource-Quota 6 integer +ATTRIBUTE WiMAX-Resource-Threshold 7 integer +ATTRIBUTE WiMAX-Update-Reason 8 integer +ATTRIBUTE WiMAX-Prepaid-Server 9 combo-ip +ATTRIBUTE WiMAX-Service-Id 10 string +ATTRIBUTE WiMAX-Rating-Group-Id 11 integer +ATTRIBUTE WiMAX-Termination-Action 12 byte +ATTRIBUTE WiMAX-Pool-Id 13 integer +ATTRIBUTE WiMAX-Pool-Multiplier 14 integer +ATTRIBUTE WiMAX-Requested-Action 15 byte +ATTRIBUTE WiMAX-Check-Balance-Result 16 byte # # 4 octets - integer representing 1/10's of lowest currency (e.g. cents) # 4 octets - currency code as in ISO-4217 # 1+ - UTF8 string containing text like "cost is $1 per minute" # -ATTRIBUTE WiMAX-Cost-Information-AVP 37.17 octets +ATTRIBUTE WiMAX-Cost-Information-AVP 17 octets VALUE WiMAX-Update-Reason Pre-Initialization 1 VALUE WiMAX-Update-Reason Initial-Request 2 @@ -290,12 +307,15 @@ VALUE WiMAX-Termination-Action Redirect-Or-Filter 3 VALUE WiMAX-Requested-Action Balance-Check 1 VALUE WiMAX-Requested-Action Price-Enquiry 2 +END-TLV WiMAX-PPAQ ATTRIBUTE WiMAX-Prepaid-Tariff-Switching 38 tlv -ATTRIBUTE WiMAX-Prepaid-Quota-Identifier 38.1 string -ATTRIBUTE WiMAX-Volume-Used-After 38.2 integer #1k -ATTRIBUTE WiMAX-Tariff-Switch-Interval 38.3 integer #s -ATTRIBUTE WiMAX-Time-Interval-After 38.4 integer #s +BEGIN-TLV WiMAX-Prepaid-Tariff-Switching +ATTRIBUTE WiMAX-Prepaid-Quota-Identifier 1 string +ATTRIBUTE WiMAX-Volume-Used-After 2 integer #1k +ATTRIBUTE WiMAX-Tariff-Switch-Interval 3 integer #s +ATTRIBUTE WiMAX-Time-Interval-After 4 integer #s +END-TLV WiMAX-Prepaid-Tariff-Switching ATTRIBUTE WiMAX-Active-Time-Duration 39 integer ATTRIBUTE WiMAX-DHCP-RK 40 octets encrypt=2 @@ -389,100 +409,120 @@ VALUE WiMAX-MIP-Authorization-Status True 1 ATTRIBUTE WiMAX-Flow-Descriptor-v2 83 tlv ATTRIBUTE WiMAX-Packet-Flow-Descriptor-v2 84 tlv -ATTRIBUTE WiMAX-PFDv2-Packet-Data-Flow-Id 84.1 short -ATTRIBUTE WiMAX-PFDv2-Service-Data-Flow-Id 84.2 short -ATTRIBUTE WiMAX-PFDv2-Service-Profile-Id 84.3 integer -ATTRIBUTE WiMAX-PFDv2-Direction 84.4 byte -ATTRIBUTE WiMAX-PFDv2-Activation-Trigger 84.5 byte -ATTRIBUTE WiMAX-PFDv2-Transport-Type 84.6 byte -ATTRIBUTE WiMAX-PFDv2-Uplink-QoS-Id 84.7 byte -ATTRIBUTE WiMAX-PFDv2-Downlink-QoS-Id 84.8 byte +BEGIN-TLV WiMAX-Packet-Flow-Descriptor-v2 +ATTRIBUTE WiMAX-PFDv2-Packet-Data-Flow-Id 1 short +ATTRIBUTE WiMAX-PFDv2-Service-Data-Flow-Id 2 short +ATTRIBUTE WiMAX-PFDv2-Service-Profile-Id 3 integer +ATTRIBUTE WiMAX-PFDv2-Direction 4 byte +ATTRIBUTE WiMAX-PFDv2-Activation-Trigger 5 byte +ATTRIBUTE WiMAX-PFDv2-Transport-Type 6 byte +ATTRIBUTE WiMAX-PFDv2-Uplink-QoS-Id 7 byte +ATTRIBUTE WiMAX-PFDv2-Downlink-QoS-Id 8 byte # # Classifiers # -ATTRIBUTE WiMAX-PFDv2-Classifier 84.9 tlv -ATTRIBUTE WiMAX-PFDv2-Classifier-Id 84.9.1 byte -ATTRIBUTE WiMAX-PFDv2-Classifier-Priority 84.9.2 byte -ATTRIBUTE WiMAX-PFDv2-Classifier-Protocol 84.9.3 byte -ATTRIBUTE WiMAX-PFDv2-Classifier-Direction 84.9.4 byte - -ATTRIBUTE WiMAX-PFDv2-Classifier-Source-Spec 84.9.5 tlv -ATTRIBUTE WiMAX-PFDv2-Src-IP-Address 84.9.5.1 combo-ip -# really two IPv4 OR IPv6 addresses -ATTRIBUTE WiMAX-PFDv2-Src-IP-Address-Range 84.9.5.2 octets -ATTRIBUTE WiMAX-PFDv2-Src-IP-Address-Mask 84.9.5.3 combo-ip -ATTRIBUTE WiMAX-PFDv2-Src-Port 84.9.5.4 short -# 2 shorts -ATTRIBUTE WiMAX-PFDv2-Src-Port-Range 84.9.5.5 integer -ATTRIBUTE WiMAX-PFDv2-Src-Inverted 84.9.5.6 byte -ATTRIBUTE WiMAX-PFDv2-Src-Assigned 84.9.5.7 byte - -VALUE WiMAX-PFDv2-Src-Assigned Src-Assigned 1 -VALUE WiMAX-PFDv2-Src-Assigned Dst-Assigned 2 -VALUE WiMAX-PFDv2-Src-Assigned Src-Dst-Assigned 3 - -ATTRIBUTE WiMAX-PFDv2-Src-MAC-Address 84.9.5.8 ether -ATTRIBUTE WiMAX-PFDv2-Src-MAC-Mask 84.9.5.9 ether - -ATTRIBUTE WiMAX-PFDv2-Classifier-Dest-Spec 84.9.6 tlv -ATTRIBUTE WiMAX-PFDv2-Classifier-IP-ToS-DSCP 84.9.7 byte -ATTRIBUTE WiMAX-PFDv2-Classifier-Action 84.9.8 byte - -ATTRIBUTE WiMAX-PFDv2-Classifier-Eth-Option 84.9.9 tlv - -ATTRIBUTE WiMAX-PFDv2-Eth-Proto-Type 84.9.9.1 tlv -ATTRIBUTE WiMAX-PFDv2-Eth-Proto-Type-Ethertype 84.9.9.1.1 short -ATTRIBUTE WiMAX-PFDv2-Eth-Proto-Type-DSAP 84.9.9.1.2 byte - -ATTRIBUTE WiMAX-PFDv2-Eth-VLAN-Id 84.9.9.2 tlv -ATTRIBUTE WiMAX-PFDv2-Eth-VLAN-Id-S-VID 84.9.9.2.1 integer -ATTRIBUTE WiMAX-PFDv2-Eth-VLAN-Id-C-VID 84.9.9.2.2 integer - -ATTRIBUTE WiMAX-PFDv2-Eth-Priority-Range 84.9.9.3 tlv -ATTRIBUTE WiMAX-PFDv2-Eth-Priority-Range-Low 84.9.9.3.1 byte -ATTRIBUTE WiMAX-PFDv2-Eth-Priority-Range-High 84.9.9.3.2 byte - -ATTRIBUTE WiMAX-XXX 84.9.9.4 byte - -ATTRIBUTE WiMAX-PFDv2-Paging-Preference 84.9.10 byte -ATTRIBUTE WiMAX-PFDv2-VLAN-Tag-Rule-Id 84.9.11 short - -VALUE WiMAX-PFDv2-Direction Uplink 1 -VALUE WiMAX-PFDv2-Direction Downlink 2 -VALUE WiMAX-PFDv2-Direction Bi-Directional 3 - -VALUE WiMAX-PFDv2-Activation-Trigger Provisioned 1 -VALUE WiMAX-PFDv2-Activation-Trigger Admit 2 -VALUE WiMAX-PFDv2-Activation-Trigger Activate 4 -VALUE WiMAX-PFDv2-Activation-Trigger Dynamic 8 - -VALUE WiMAX-PFDv2-Transport-Type IPv4-CS 1 -VALUE WiMAX-PFDv2-Transport-Type IPv6-CS 2 -VALUE WiMAX-PFDv2-Transport-Type Ethernet 3 +ATTRIBUTE WiMAX-PFDv2-Classifier 9 tlv +BEGIN-TLV WiMAX-PFDv2-Classifier + ATTRIBUTE WiMAX-PFDv2-Classifier-Id 1 byte + ATTRIBUTE WiMAX-PFDv2-Classifier-Priority 2 byte + ATTRIBUTE WiMAX-PFDv2-Classifier-Protocol 3 byte + ATTRIBUTE WiMAX-PFDv2-Classifier-Direction 4 byte + + ATTRIBUTE WiMAX-PFDv2-Classifier-Source-Spec 5 tlv + BEGIN-TLV WiMAX-PFDv2-Classifier-Source-Spec + ATTRIBUTE WiMAX-PFDv2-Src-IP-Address 1 combo-ip + # really two IPv4 OR IPv6 addresses + ATTRIBUTE WiMAX-PFDv2-Src-IP-Address-Range 2 octets + ATTRIBUTE WiMAX-PFDv2-Src-IP-Address-Mask 3 combo-ip + ATTRIBUTE WiMAX-PFDv2-Src-Port 4 short + # 2 shorts + ATTRIBUTE WiMAX-PFDv2-Src-Port-Range 5 integer + ATTRIBUTE WiMAX-PFDv2-Src-Inverted 6 byte + ATTRIBUTE WiMAX-PFDv2-Src-Assigned 7 byte + + VALUE WiMAX-PFDv2-Src-Assigned Src-Assigned 1 + VALUE WiMAX-PFDv2-Src-Assigned Dst-Assigned 2 + VALUE WiMAX-PFDv2-Src-Assigned Src-Dst-Assigned 3 + + ATTRIBUTE WiMAX-PFDv2-Src-MAC-Address 8 ether + ATTRIBUTE WiMAX-PFDv2-Src-MAC-Mask 9 ether + END-TLV WiMAX-PFDv2-Classifier-Source-Spec + + ATTRIBUTE WiMAX-PFDv2-Classifier-Dest-Spec 6 tlv + ATTRIBUTE WiMAX-PFDv2-Classifier-IP-ToS-DSCP 7 byte + ATTRIBUTE WiMAX-PFDv2-Classifier-Action 8 byte + + ATTRIBUTE WiMAX-PFDv2-Classifier-Eth-Option 9 tlv + + BEGIN-TLV WiMAX-PFDv2-Classifier-Eth-Option + ATTRIBUTE WiMAX-PFDv2-Eth-Proto-Type 1 tlv + BEGIN-TLV WiMAX-PFDv2-Eth-Proto-Type + ATTRIBUTE WiMAX-PFDv2-Eth-Proto-Type-Ethertype 1 short + ATTRIBUTE WiMAX-PFDv2-Eth-Proto-Type-DSAP 2 byte + END-TLV WiMAX-PFDv2-Eth-Proto-Type + + ATTRIBUTE WiMAX-PFDv2-Eth-VLAN-Id 2 tlv + BEGIN-TLV WiMAX-PFDv2-Eth-VLAN-Id + ATTRIBUTE WiMAX-PFDv2-Eth-VLAN-Id-S-VID 1 integer + ATTRIBUTE WiMAX-PFDv2-Eth-VLAN-Id-C-VID 2 integer + END-TLV WiMAX-PFDv2-Eth-VLAN-Id + + ATTRIBUTE WiMAX-PFDv2-Eth-Priority-Range 3 tlv + BEGIN-TLV WiMAX-PFDv2-Eth-Priority-Range + ATTRIBUTE WiMAX-PFDv2-Eth-Priority-Range-Low 1 byte + ATTRIBUTE WiMAX-PFDv2-Eth-Priority-Range-High 2 byte + END-TLV WiMAX-PFDv2-Eth-Priority-Range + + ATTRIBUTE WiMAX-XXX 4 byte + END-TLV WiMAX-PFDv2-Classifier-Eth-Option + + ATTRIBUTE WiMAX-PFDv2-Paging-Preference 10 byte + ATTRIBUTE WiMAX-PFDv2-VLAN-Tag-Rule-Id 11 short + + VALUE WiMAX-PFDv2-Direction Uplink 1 + VALUE WiMAX-PFDv2-Direction Downlink 2 + VALUE WiMAX-PFDv2-Direction Bi-Directional 3 + + VALUE WiMAX-PFDv2-Activation-Trigger Provisioned 1 + VALUE WiMAX-PFDv2-Activation-Trigger Admit 2 + VALUE WiMAX-PFDv2-Activation-Trigger Activate 4 + VALUE WiMAX-PFDv2-Activation-Trigger Dynamic 8 + + VALUE WiMAX-PFDv2-Transport-Type IPv4-CS 1 + VALUE WiMAX-PFDv2-Transport-Type IPv6-CS 2 + VALUE WiMAX-PFDv2-Transport-Type Ethernet 3 +END-TLV WiMAX-PFDv2-Classifier +END-TLV WiMAX-Packet-Flow-Descriptor-v2 ATTRIBUTE WiMAX-VLAN-Tag-Processing-Descriptor 85 tlv -ATTRIBUTE WiMAX-VLAN-Tag-Rule-Id 85.1 short -ATTRIBUTE WiMAX-VLAN-Tag-C-VLAN-Priority 85.2 byte -ATTRIBUTE WiMAX-VLAN-Tag-VLAN-Id-Assignment 85.3 short -ATTRIBUTE WiMAX-VLAN-Tag-C-VLAN-Id 85.4 short -ATTRIBUTE WiMAX-VLAN-Tag-S-VLAN-Id 85.5 short -ATTRIBUTE WiMAX-VLAN-Tag-C-S-VLAN-Id-Mapping 85.6 integer -ATTRIBUTE WiMAX-VLAN-Tag-Local-Config-Info 85.7 octets +BEGIN-TLV WiMAX-VLAN-Tag-Processing-Descriptor +ATTRIBUTE WiMAX-VLAN-Tag-Rule-Id 1 short +ATTRIBUTE WiMAX-VLAN-Tag-C-VLAN-Priority 2 byte +ATTRIBUTE WiMAX-VLAN-Tag-VLAN-Id-Assignment 3 short +ATTRIBUTE WiMAX-VLAN-Tag-C-VLAN-Id 4 short +ATTRIBUTE WiMAX-VLAN-Tag-S-VLAN-Id 5 short +ATTRIBUTE WiMAX-VLAN-Tag-C-S-VLAN-Id-Mapping 6 integer +ATTRIBUTE WiMAX-VLAN-Tag-Local-Config-Info 7 octets +END-TLV WiMAX-VLAN-Tag-Processing-Descriptor ATTRIBUTE WiMAX-hDHCP-Server-Parameters 86 tlv -ATTRIBUTE WiMAX-hDHCP-DHCPv4-Address 86.1 ipaddr -ATTRIBUTE WiMAX-hDHCP-DHCPv6-Address 86.2 ipv6addr -ATTRIBUTE WiMAX-hDHCP-DHCP-RK 86.3 string encrypt=2 -ATTRIBUTE WiMAX-hDHCP-DHCP-RK-Key-Id 86.4 integer -ATTRIBUTE WiMAX-hDHCP-DHCP-RK-Lifetime 86.5 integer +BEGIN-TLV WiMAX-hDHCP-Server-Parameters +ATTRIBUTE WiMAX-hDHCP-DHCPv4-Address 1 ipaddr +ATTRIBUTE WiMAX-hDHCP-DHCPv6-Address 2 ipv6addr +ATTRIBUTE WiMAX-hDHCP-DHCP-RK 3 string encrypt=2 +ATTRIBUTE WiMAX-hDHCP-DHCP-RK-Key-Id 4 integer +ATTRIBUTE WiMAX-hDHCP-DHCP-RK-Lifetime 5 integer +END-TLV WiMAX-hDHCP-Server-Parameters ATTRIBUTE WiMAX-vDHCP-Server-Parameters 87 tlv -ATTRIBUTE WiMAX-vDHCP-DHCPv4-Address 87.1 ipaddr -ATTRIBUTE WiMAX-vDHCP-DHCPv6-Address 87.2 ipv6addr -ATTRIBUTE WiMAX-vDHCP-DHCP-RK 87.3 string encrypt=2 -ATTRIBUTE WiMAX-vDHCP-DHCP-RK-Key-Id 87.4 integer -ATTRIBUTE WiMAX-vDHCP-DHCP-RK-Lifetime 87.5 integer +BEGIN-TLV WiMAX-vDHCP-Server-Parameters +ATTRIBUTE WiMAX-vDHCP-DHCPv4-Address 1 ipaddr +ATTRIBUTE WiMAX-vDHCP-DHCPv6-Address 2 ipv6addr +ATTRIBUTE WiMAX-vDHCP-DHCP-RK 3 string encrypt=2 +ATTRIBUTE WiMAX-vDHCP-DHCP-RK-Key-Id 4 integer +ATTRIBUTE WiMAX-vDHCP-DHCP-RK-Lifetime 5 integer +END-TLV WiMAX-vDHCP-Server-Parameters ATTRIBUTE WiMAX-BS-Location 88 octets ATTRIBUTE WiMAX-Visited-IPv4-HoA-PMIP6 89 byte diff --git a/resources/protocols/radius/dictionary.wimax.wichorus b/resources/protocols/radius/dictionary.wimax.wichorus index 02b2007b..0cbcc5ea 100644 --- a/resources/protocols/radius/dictionary.wimax.wichorus +++ b/resources/protocols/radius/dictionary.wimax.wichorus @@ -1,5 +1,7 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # This is a WiMAX dictionary for the WiChorus line of products. @@ -8,7 +10,7 @@ # ############################################################################## # -# $Id: c3dd1e620496eba6467928136d0c81dcb907eb7b $ +# $Id: aa2e3d36bc374c5579eff86a02528faca2e78aad $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.wispr b/resources/protocols/radius/dictionary.wispr index 71b4cdd6..29f56888 100644 --- a/resources/protocols/radius/dictionary.wispr +++ b/resources/protocols/radius/dictionary.wispr @@ -1,19 +1,17 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # dictionary.wispr # -# VSAs originally by -# "James Underwood" <underwood@comcast.net> +# Attributes from the Wireless Broadband Alliance (used to be Wispr) # -# Version: $Id: 2296e60a3912ca078f19f81457d20658950bc63d $ +# Updated attributes are at # -# For documentation on WISPr RADIUS attributes, see: +# https://github.com/wireless-broadband-alliance/RADIUS-VSA # -# Wi-Fi Alliance - Wireless ISP Roaming - Best Current Practices v1, -# Feb 2003, p 14 +# Version: $Id: 8ac0b830b5532339e38dbe15d20399b5b660785d $ # -# http://www.weca.net/OpenSection/downloads/WISPr_V1.0.pdf VENDOR WISPr 14122 @@ -34,4 +32,11 @@ ATTRIBUTE WISPr-Session-Terminate-Time 9 string ATTRIBUTE WISPr-Session-Terminate-End-Of-Day 10 string ATTRIBUTE WISPr-Billing-Class-Of-Service 11 string +ATTRIBUTE WBA-Offered-Service 12 string +ATTRIBUTE WBA-Financial-Clearing-Provider 13 string +ATTRIBUTE WBA-Data-Clearing-Provider 14 string +ATTRIBUTE WBA-Linear-Volume-Rate 15 octets +ATTRIBUTE WBA-Identity-Provider 16 string +ATTRIBUTE WBA-Custom-SLA 17 string + END-VENDOR WISPr diff --git a/resources/protocols/radius/dictionary.xedia b/resources/protocols/radius/dictionary.xedia index 05d44d3c..9fe70272 100644 --- a/resources/protocols/radius/dictionary.xedia +++ b/resources/protocols/radius/dictionary.xedia @@ -1,11 +1,13 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # XEDIA, AP series routers # From Yard RADIUS, and Piotr Orlewicz, porlewicz@teleton.pl www.real-data.pl # -# $Id: 24560a99e7bd24718fe175c3fb0b2a7b2cd3343b $ +# $Id: d125e4eb6bc410dfe9122cb8ace82cb9634e6b23 $ # ############################################################################# VENDOR Xedia 838 diff --git a/resources/protocols/radius/dictionary.xylan b/resources/protocols/radius/dictionary.xylan index 2f6484d2..672465ae 100644 --- a/resources/protocols/radius/dictionary.xylan +++ b/resources/protocols/radius/dictionary.xylan @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Xylan dictionary # -# $Id: 8a45a1fb26b16d2eafcd800efc79643e9fb3082f $ +# $Id: 506bf04a7034519e808f1f263fb7fc18fb6b80f2 $ # ############################################################################## @@ -22,6 +24,10 @@ ATTRIBUTE Xylan-Profil-Numb 7 integer ATTRIBUTE Xylan-Auth-Group-Protocol 8 string ATTRIBUTE Xylan-Asa-Access 9 string ATTRIBUTE Xylan-End-User-Profile 10 integer +ATTRIBUTE Xylan-Primary-Home-Agent 12 string +ATTRIBUTE Xylan-Secondary-Home-Agent 13 string +ATTRIBUTE Xylan-Home-Agent-Password 14 string +ATTRIBUTE Xylan-Home-Network-Name 15 string ATTRIBUTE Xylan-Access-Priv 16 integer ATTRIBUTE Xylan-Nms-Group 20 string ATTRIBUTE Xylan-Nms-First-Name 21 string @@ -38,6 +44,11 @@ ATTRIBUTE Xylan-Acce-Priv-F-R2 40 octets ATTRIBUTE Xylan-Acce-Priv-F-W1 41 octets ATTRIBUTE Xylan-Acce-Priv-F-W2 42 octets +ATTRIBUTE Xylan-Policy-List 100 string +ATTRIBUTE Xylan-Redirect-Url 101 string +ATTRIBUTE Xylan-Device-Name 152 string +ATTRIBUTE Xylan-Device-Location 153 string + VALUE Xylan-Access-Priv Xylan-Read-Priv 1 VALUE Xylan-Access-Priv Xylan-Write-Priv 2 VALUE Xylan-Access-Priv Xylan-Admin-Priv 3 diff --git a/resources/protocols/radius/dictionary.yubico b/resources/protocols/radius/dictionary.yubico index a7fb1990..d725911b 100644 --- a/resources/protocols/radius/dictionary.yubico +++ b/resources/protocols/radius/dictionary.yubico @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Yubico VSA's # -# $Id: 618597605ce29d7bee6887bf2c2cd10e72009593 $ +# $Id: a40ea555f79f323af44bdf83a38491e287721920 $ # ############################################################################## diff --git a/resources/protocols/radius/dictionary.zeus b/resources/protocols/radius/dictionary.zeus index 1604b7bd..d3f5bbcf 100644 --- a/resources/protocols/radius/dictionary.zeus +++ b/resources/protocols/radius/dictionary.zeus @@ -1,4 +1,6 @@ -# dictionary.zeus +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# # Zeus Packet RADIUS Dictionary # # http://www.zeus.com diff --git a/resources/protocols/radius/dictionary.zte b/resources/protocols/radius/dictionary.zte index 6cfda574..f24f0e6b 100644 --- a/resources/protocols/radius/dictionary.zte +++ b/resources/protocols/radius/dictionary.zte @@ -1,9 +1,10 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 # # For ZTE. # -# $Id: aab6f65f9daba7bc0b5317e4a732292e5ac53cb1 $ +# $Id: d7352c0db0a19ccc0405140316a27ed548fef71d $ # # QoS attributes Mostly derived from: # http://wwwen.zte.com.cn/en/products/bearer/201308/P020130828522349526032.pdf diff --git a/resources/protocols/radius/dictionary.zyxel b/resources/protocols/radius/dictionary.zyxel index 6bde7317..a4d3db98 100644 --- a/resources/protocols/radius/dictionary.zyxel +++ b/resources/protocols/radius/dictionary.zyxel @@ -1,10 +1,12 @@ # -*- text -*- -# Copyright (C) 2015 The FreeRADIUS Server project and contributors +# Copyright (C) 2019 The FreeRADIUS Server project and contributors +# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0 +# ############################################################################## # # Zyxel attributes, of course in the RFC space... # -# $Id: 966af2b33a02ed7ef370cfcb837bd175ad8fab00 $ +# $Id: 3b60bb819136274ff7235358302e194f1d887c8f $ # ############################################################################## diff --git a/resources/share/logray/colorfilters b/resources/share/logray/colorfilters index a3c9785f..f2524a9b 100644 --- a/resources/share/logray/colorfilters +++ b/resources/share/logray/colorfilters @@ -1,4 +1,12 @@ # This file was created by Logray. Edit with care. -@Errors@ct.error@[4626,10023,11822][63479,34695,34695] -@State Modifying Event@ct.readonly == "false"@[61423,50372,39578][0,0,0] -@Administrative Activity@cloudtrail and not (ct.name ~ "^Describe.*" or ct.name ~ "^List.*" or ct.name ~ "^(Batch|)Get.*")@[61423,50372,39578][0,0,0] +@Failed Syscall@(evt.failed == True) && !(evt.res == "EAGAIN") && !(evt.res == "EALREADY")@[56797,28270,24158][0,0,0] +@Falco Notifications@sysdig.event_name == "notification"@[0,0,0][65535,65535,65535] +@Command Executions@evt.type == "execve"@[38807,57568,17990][0,0,0] +@New Process Creations@evt.type=="clone" || evt.type=="fork"@[14649,28013,14906][65535,65535,65535] +@Socket Syscalls@evt.type == "connect" || evt.type == "accept" || evt.type == "socket" || evt.type == "bind"@[20303,26214,51143][65535,65535,65535] +@Net Writes@(evt.is_io == True) && (evt.category == "net") && (evt.is_io_write == True)@[24672,53713,51657][0,0,0] +@Net Reads@(evt.is_io == True) && (evt.category == "net")@[29812,64764,62451][0,0,0] +@File Opens@evt.type == "open" || evt.type == "openat" || evt.type == "openat2"@[31611,24415,13621][65535,65535,65535] +@File Writes@(evt.is_io == True) && (evt.category == "file") && (evt.is_io_write == True)@[60138,48059,37522][0,0,0] +@File Reads@(evt.is_io == True) && (evt.category == "file")@[61423,53970,40349][0,0,0] +@FD Closes@evt.type == "close"@[27499,27499,27499][65535,65535,65535] diff --git a/resources/share/logray/dfilter_buttons b/resources/share/logray/dfilter_buttons index 57b024b5..7ad8ba3b 100644 --- a/resources/share/logray/dfilter_buttons +++ b/resources/share/logray/dfilter_buttons @@ -1,5 +1,23 @@ # This file is automatically generated, DO NOT MODIFY. -"TRUE","S3","ct.shortsrc == \x22s3\x22","S3 events" -"TRUE","EC2","ct.shortsrc == \x22ec2\x22","EC2 events" -"TRUE","S3 PutObject","ct.name == \x22PutObject\x22","" -"TRUE","Writes","ct.readonly == \x22false\x22","" +"TRUE","Cmd // Interactive Command Executions","evt.type == \x22execve\x22 and evt.dir == \x22<\x22 and (proc.pname == \x22bash\x22 or proc.pname == \x22zsh\x22 or proc.pname == \x22tcsh\x22 or proc.pname == \x22ksh\x22 or proc.pname == \x22fish\x22)","List the command executions (eceve system call)" +"TRUE","Cmd // All Command Executions","evt.type == \x22execve\x22","List the command executions (eceve system call)" +"TRUE","File // All File Activity","evt.category == \x22file\x22","Display activity on files" +"TRUE","File // Opens","evt.type == \x22open\x22 || evt.type == \x22openat\x22 || evt.type == \x22openat2\x22","Display file open events (open, openat...)" +"TRUE","File // Reads/Writes","evt.category==\x22file\x22 && evt.is_io == True","" +"TRUE","File // Writes","evt.category==\x22file\x22 && evt.is_io == True && evt.is_io_write == True","" +"FALSE","File // Opens W","(evt.type == \x22open\x22 || evt.type == \x22openat\x22 || evt.type == \x22openat2\x22) && (evt.is_open_write == True)","Display file open events (open, openat...) where the file has been open with \x22write\x22 flags" +"TRUE","File // File Deletions","(evt.type == \x22unlink\x22 || evt.type == \x22unlinkat\x22 || evt.type == \x22rmdir\x22) && evt.dir == \x22<\x22","" +"TRUE","File // Symlink Creation","(evt.type == \x22symlink\x22 || evt.type == \x22symlinkat\x22) && evt.dir == \x22<\x22","" +"TRUE","Network // All Network Activity","evt.category==\x22net\x22","Display activity on the network" +"TRUE","Network // Reads/Writes","evt.category==\x22net\x22 && evt.is_io == True","" +"TRUE","Network // Outbound Connection Requests","evt.type == \x22connect\x22","Show the client-side network connection attempts" +"TRUE","Network // Inbound Connection Requests","evt.type == \x22accept\x22","Show the server-side network connection reception" +"TRUE","Network // Port Opens","evt.type == \x22bind\x22","Show the server-side network connection reception" +"FALSE","I/O","evt.is_io == True","Show all IO system calls (read/write/sendto...)" +"FALSE","I/O W","(evt.is_io == True) && (evt.is_io_write == True)","Show all of the I/O system calls that write content on file descriptors (write, sendto...)" +"TRUE","Misc // Falco Events","sysdig.event_name == \x22notification\x22","This finds the Falco notifications that have been embedded into captures. It allows to quickly go to the place where something happened" +"TRUE","Misc // Process/Thread Creation","evt.type == \x22clone\x22 || evt.type == \x22clone3\x22 || evt.type == \x22fork\x22 || evt.type == \x22vfork\x22","Selects that system calls that failed" +"TRUE","Misc // Failed System Calls","(evt.failed == True) && !(evt.res == \x22EAGAIN\x22) && !(evt.res == \x22EALREADY\x22)","Selects that system calls that failed" +"TRUE","Misc // Writes to Log Files","evt.is_io_write == True && evt.dir == \x22<\x22 && (fd.name contains \x22/var/log\x22 || fd.name contains \x22.log\x22 || fd.name contains \x22_log\x22)","Selects that system calls that failed" +"TRUE","Misc // Writes to System Files","evt.is_io_write == True && evt.dir == \x22<\x22 && (fd.name matches \x22^/bin/\x22 || fd.name matches \x22^/sbin/\x22 || fd.name matches \x22^/boot/\x22 || fd.name matches \x22^/etc/\x22 || fd.name matches \x22^/lib/\x22 || fd.name matches \x22^/usr/bin/\x22 || fd.name matches \x22^/usr/sbin/\x22 || fd.name matches \x22^/usr/share/\x22 || fd.name matches \x22^/usr/lib\x22)","Selects that system calls that failed" +"TRUE","Misc // Kernel Modules Loading","evt.type==init_module || evt.type==finit_module","Selects that system calls that failed" diff --git a/resources/share/logray/profiles/CloudTrail/colorfilters b/resources/share/logray/profiles/CloudTrail/colorfilters new file mode 100644 index 00000000..cdd1d217 --- /dev/null +++ b/resources/share/logray/profiles/CloudTrail/colorfilters @@ -0,0 +1,4 @@ +# This file was created by Logray. Edit with care. +@Errors@ct.error@[4626,10023,11822][63479,34695,34695] +@State Modifying Event@ct.readonly == "false"@[61423,50372,39578][0,0,0] +@Administrative Activity@falcobridge.id == 2 and not (ct.name ~ "^Describe.*" or ct.name ~ "^List.*" or ct.name ~ "^(Batch|)Get.*")@[61423,50372,39578][0,0,0] diff --git a/resources/share/logray/profiles/CloudTrail/preferences b/resources/share/logray/profiles/CloudTrail/preferences new file mode 100644 index 00000000..464f0424 --- /dev/null +++ b/resources/share/logray/profiles/CloudTrail/preferences @@ -0,0 +1,18 @@ +# Configuration file for Logray +# +# Packet list column format +# Each pair of strings consists of a column title and its format +gui.column.format: + "No.", "%m", + "Time", "%t", + "Source", "%s", + "Destination", "%d", + "Length", "%L", + "Service", "%Cus:ct.shortsrc:0:R", + "Region", "%Cus:ct.region:0:R", + "Bucket/Instance", "%Cus:s3.bucket || ec2.name:0:R", + "User Name", "%Cus:ct.user:0:R", + "Event Name", "%Cus:ct.name:0:R", + "User IP", "%Cus:ct.srcip:0:R", + "Info", "%i" + diff --git a/resources/share/logray/profiles/dfilter_buttons b/resources/share/logray/profiles/dfilter_buttons new file mode 100644 index 00000000..d94b2178 --- /dev/null +++ b/resources/share/logray/profiles/dfilter_buttons @@ -0,0 +1,3 @@ +# This file is automatically generated, DO NOT MODIFY. +"TRUE","Errors","ct.error","" +"TRUE","Modify Events","ct.readonly == false","" diff --git a/resources/share/wireshark/cfilters b/resources/share/wireshark/cfilters index b22fa938..29340f96 100644 --- a/resources/share/wireshark/cfilters +++ b/resources/share/wireshark/cfilters @@ -1,3 +1,5 @@ +# This file is the capture filters file shipped with Wireshark. It may be overwritten. +# For your personal filters you can use the same file in your profile dir. "Ethernet address 00:00:5e:00:53:00" ether host 00:00:5e:00:53:00 "Ethernet type 0x0806 (ARP)" ether proto 0x0806 "No Broadcast and no Multicast" not broadcast and not multicast diff --git a/resources/share/wireshark/dfilter_macros b/resources/share/wireshark/dfilter_macros deleted file mode 100644 index a85f9134..00000000 --- a/resources/share/wireshark/dfilter_macros +++ /dev/null @@ -1,6 +0,0 @@ -# DO NOT MODIFY -# This file is the macro file shipped with Wireshark. -# For your personal macros, use the same file in your profile dir. -"private_ipv4","$1 == 192.168.0.0/16 or $1 == 172.16.0.0/12 or $1 == 10.0.0.0/8" -"private_ethernet","$1[0] & 0x0F == 2" -"private_ipv6", "ipv6 && $1 == fc00::/7" diff --git a/resources/share/wireshark/dfilters b/resources/share/wireshark/dfilters index a11f9f06..d2ec67e0 100644 --- a/resources/share/wireshark/dfilters +++ b/resources/share/wireshark/dfilters @@ -1,3 +1,5 @@ +# This file is the display filters file shipped with Wireshark. It may be overwritten. +# For your personal filters you can use the same file in your profile dir. "Ethernet address 00:00:5e:00:53:00" eth.addr == 00:00:5e:00:53:00 "Ethernet type 0x0806 (ARP)" eth.type == 0x0806 "Ethernet broadcast" eth.addr == ff:ff:ff:ff:ff:ff diff --git a/resources/share/wireshark/dmacros b/resources/share/wireshark/dmacros new file mode 100644 index 00000000..152842ff --- /dev/null +++ b/resources/share/wireshark/dmacros @@ -0,0 +1,5 @@ +# This file is the display filter macro file shipped with Wireshark. It may be overwritten. +# For your personal macros you can use the same file in your profile dir. +"private_ipv4" $1 == 192.168.0.0/16 or $1 == 172.16.0.0/12 or $1 == 10.0.0.0/8 +"private_ethernet" $1[0] & 0x0F == 2 +"private_ipv6" ipv6 and $1 == fc00::/7 diff --git a/resources/share/wireshark/profiles/No Reassembly/preferences b/resources/share/wireshark/profiles/No Reassembly/preferences index c1b86483..52bc91a3 100644 --- a/resources/share/wireshark/profiles/No Reassembly/preferences +++ b/resources/share/wireshark/profiles/No Reassembly/preferences @@ -77,10 +77,12 @@ laplink.desegment_laplink_over_tcp: FALSE ldap.desegment_ldap_messages: FALSE ldp.desegment_ldp_messages: FALSE ltp.reassemble_block: FALSE +m3ua.desegment: FALSE memcache.desegment_headers: FALSE memcache.desegment_pdus: FALSE mbrtu.desegment: FALSE mbtcp.desegment: FALSE +monero.desegment: FALSE mq.desegment: FALSE mq.reassembly: FALSE mysql.desegment_buffers: FALSE @@ -92,6 +94,7 @@ ndmp.desegment: FALSE ndps.desegment_tcp: FALSE ndps.desegment_spx: FALSE netsync.desegment_netsync_messages: FALSE +nmf.reassemble_nmf: FALSE opa.mad.reassemble_rmpp: FALSE openflow.desegment: FALSE openwire.desegment: FALSE @@ -120,6 +123,7 @@ rtsp.desegment_headers: FALSE rtsp.desegment_body: FALSE sametime.reassemble: FALSE sapni.desegment: FALSE +saprfc.table_reassembly: FALSE sasp.desegment_sasp_messages: FALSE sctp.reassembly: FALSE scylla.desegment: FALSE diff --git a/resources/stock_icons.qrc b/resources/stock_icons.qrc index 7510fd0c..d778edfe 100644 --- a/resources/stock_icons.qrc +++ b/resources/stock_icons.qrc @@ -96,6 +96,18 @@ <file>stock_icons/16x16/x-colorize-packets.png</file> <file>stock_icons/16x16/x-colorize-packets@2x.png</file> <file>stock_icons/16x16/x-hide-ro.png</file> + <file>stock_icons/16x16/x-reset-layout_1.png</file> + <file>stock_icons/16x16/x-reset-layout_1@2x.png</file> + <file>stock_icons/16x16/x-reset-layout_2.png</file> + <file>stock_icons/16x16/x-reset-layout_2@2x.png</file> + <file>stock_icons/16x16/x-reset-layout_3.png</file> + <file>stock_icons/16x16/x-reset-layout_3@2x.png</file> + <file>stock_icons/16x16/x-reset-layout_4.png</file> + <file>stock_icons/16x16/x-reset-layout_4@2x.png</file> + <file>stock_icons/16x16/x-reset-layout_5.png</file> + <file>stock_icons/16x16/x-reset-layout_5@2x.png</file> + <file>stock_icons/16x16/x-reset-layout_6.png</file> + <file>stock_icons/16x16/x-reset-layout_6@2x.png</file> <file>stock_icons/16x16/x-reset.template.png</file> <file>stock_icons/16x16/x-reset.template@2x.png</file> <file>stock_icons/16x16/x-resize-columns.png</file> @@ -147,6 +159,18 @@ <file>stock_icons/24x24/x-colorize-packets.png</file> <file>stock_icons/24x24/x-colorize-packets@2x.png</file> <file>stock_icons/24x24/x-hide-ro.png</file> + <file>stock_icons/24x24/x-reset-layout_1.png</file> + <file>stock_icons/24x24/x-reset-layout_1@2x.png</file> + <file>stock_icons/24x24/x-reset-layout_2.png</file> + <file>stock_icons/24x24/x-reset-layout_2@2x.png</file> + <file>stock_icons/24x24/x-reset-layout_3.png</file> + <file>stock_icons/24x24/x-reset-layout_3@2x.png</file> + <file>stock_icons/24x24/x-reset-layout_4.png</file> + <file>stock_icons/24x24/x-reset-layout_4@2x.png</file> + <file>stock_icons/24x24/x-reset-layout_5.png</file> + <file>stock_icons/24x24/x-reset-layout_5@2x.png</file> + <file>stock_icons/24x24/x-reset-layout_6.png</file> + <file>stock_icons/24x24/x-reset-layout_6@2x.png</file> <file>stock_icons/24x24/x-resize-columns.png</file> <file>stock_icons/24x24/x-resize-columns@2x.png</file> <file>stock_icons/24x24/x-stay-last.png</file> diff --git a/resources/stock_icons/16x16/x-reset-layout_1.png b/resources/stock_icons/16x16/x-reset-layout_1.png Binary files differnew file mode 100644 index 00000000..8e056c44 --- /dev/null +++ b/resources/stock_icons/16x16/x-reset-layout_1.png diff --git a/resources/stock_icons/16x16/x-reset-layout_1@2x.png b/resources/stock_icons/16x16/x-reset-layout_1@2x.png Binary files differnew file mode 100644 index 00000000..bbbb3a2d --- /dev/null +++ b/resources/stock_icons/16x16/x-reset-layout_1@2x.png diff --git a/resources/stock_icons/16x16/x-reset-layout_2.png b/resources/stock_icons/16x16/x-reset-layout_2.png Binary files differnew file mode 100644 index 00000000..a2b8acb1 --- /dev/null +++ b/resources/stock_icons/16x16/x-reset-layout_2.png diff --git a/resources/stock_icons/16x16/x-reset-layout_2@2x.png b/resources/stock_icons/16x16/x-reset-layout_2@2x.png Binary files differnew file mode 100644 index 00000000..14e5c247 --- /dev/null +++ b/resources/stock_icons/16x16/x-reset-layout_2@2x.png diff --git a/resources/stock_icons/16x16/x-reset-layout_3.png b/resources/stock_icons/16x16/x-reset-layout_3.png Binary files differnew file mode 100644 index 00000000..b835fb46 --- /dev/null +++ b/resources/stock_icons/16x16/x-reset-layout_3.png diff --git a/resources/stock_icons/16x16/x-reset-layout_3@2x.png b/resources/stock_icons/16x16/x-reset-layout_3@2x.png Binary files differnew file mode 100644 index 00000000..0c7c3efb --- /dev/null +++ b/resources/stock_icons/16x16/x-reset-layout_3@2x.png diff --git a/resources/stock_icons/16x16/x-reset-layout_4.png b/resources/stock_icons/16x16/x-reset-layout_4.png Binary files differnew file mode 100644 index 00000000..5ecac905 --- /dev/null +++ b/resources/stock_icons/16x16/x-reset-layout_4.png diff --git a/resources/stock_icons/16x16/x-reset-layout_4@2x.png b/resources/stock_icons/16x16/x-reset-layout_4@2x.png Binary files differnew file mode 100644 index 00000000..a449a4c1 --- /dev/null +++ b/resources/stock_icons/16x16/x-reset-layout_4@2x.png diff --git a/resources/stock_icons/16x16/x-reset-layout_5.png b/resources/stock_icons/16x16/x-reset-layout_5.png Binary files differnew file mode 100644 index 00000000..cbf99942 --- /dev/null +++ b/resources/stock_icons/16x16/x-reset-layout_5.png diff --git a/resources/stock_icons/16x16/x-reset-layout_5@2x.png b/resources/stock_icons/16x16/x-reset-layout_5@2x.png Binary files differnew file mode 100644 index 00000000..522a0ede --- /dev/null +++ b/resources/stock_icons/16x16/x-reset-layout_5@2x.png diff --git a/resources/stock_icons/16x16/x-reset-layout_6.png b/resources/stock_icons/16x16/x-reset-layout_6.png Binary files differnew file mode 100644 index 00000000..6951bda7 --- /dev/null +++ b/resources/stock_icons/16x16/x-reset-layout_6.png diff --git a/resources/stock_icons/16x16/x-reset-layout_6@2x.png b/resources/stock_icons/16x16/x-reset-layout_6@2x.png Binary files differnew file mode 100644 index 00000000..3b701164 --- /dev/null +++ b/resources/stock_icons/16x16/x-reset-layout_6@2x.png diff --git a/resources/stock_icons/24x24/x-reset-layout_1.png b/resources/stock_icons/24x24/x-reset-layout_1.png Binary files differnew file mode 100644 index 00000000..b7be82f2 --- /dev/null +++ b/resources/stock_icons/24x24/x-reset-layout_1.png diff --git a/resources/stock_icons/24x24/x-reset-layout_1@2x.png b/resources/stock_icons/24x24/x-reset-layout_1@2x.png Binary files differnew file mode 100644 index 00000000..fdcb5f78 --- /dev/null +++ b/resources/stock_icons/24x24/x-reset-layout_1@2x.png diff --git a/resources/stock_icons/24x24/x-reset-layout_2.png b/resources/stock_icons/24x24/x-reset-layout_2.png Binary files differnew file mode 100644 index 00000000..8d3287ef --- /dev/null +++ b/resources/stock_icons/24x24/x-reset-layout_2.png diff --git a/resources/stock_icons/24x24/x-reset-layout_2@2x.png b/resources/stock_icons/24x24/x-reset-layout_2@2x.png Binary files differnew file mode 100644 index 00000000..ccc880a0 --- /dev/null +++ b/resources/stock_icons/24x24/x-reset-layout_2@2x.png diff --git a/resources/stock_icons/24x24/x-reset-layout_3.png b/resources/stock_icons/24x24/x-reset-layout_3.png Binary files differnew file mode 100644 index 00000000..d91a272e --- /dev/null +++ b/resources/stock_icons/24x24/x-reset-layout_3.png diff --git a/resources/stock_icons/24x24/x-reset-layout_3@2x.png b/resources/stock_icons/24x24/x-reset-layout_3@2x.png Binary files differnew file mode 100644 index 00000000..1ae62fdf --- /dev/null +++ b/resources/stock_icons/24x24/x-reset-layout_3@2x.png diff --git a/resources/stock_icons/24x24/x-reset-layout_4.png b/resources/stock_icons/24x24/x-reset-layout_4.png Binary files differnew file mode 100644 index 00000000..8dae8c37 --- /dev/null +++ b/resources/stock_icons/24x24/x-reset-layout_4.png diff --git a/resources/stock_icons/24x24/x-reset-layout_4@2x.png b/resources/stock_icons/24x24/x-reset-layout_4@2x.png Binary files differnew file mode 100644 index 00000000..465c918c --- /dev/null +++ b/resources/stock_icons/24x24/x-reset-layout_4@2x.png diff --git a/resources/stock_icons/24x24/x-reset-layout_5.png b/resources/stock_icons/24x24/x-reset-layout_5.png Binary files differnew file mode 100644 index 00000000..19909572 --- /dev/null +++ b/resources/stock_icons/24x24/x-reset-layout_5.png diff --git a/resources/stock_icons/24x24/x-reset-layout_5@2x.png b/resources/stock_icons/24x24/x-reset-layout_5@2x.png Binary files differnew file mode 100644 index 00000000..746b0965 --- /dev/null +++ b/resources/stock_icons/24x24/x-reset-layout_5@2x.png diff --git a/resources/stock_icons/24x24/x-reset-layout_6.png b/resources/stock_icons/24x24/x-reset-layout_6.png Binary files differnew file mode 100644 index 00000000..8538d445 --- /dev/null +++ b/resources/stock_icons/24x24/x-reset-layout_6.png diff --git a/resources/stock_icons/24x24/x-reset-layout_6@2x.png b/resources/stock_icons/24x24/x-reset-layout_6@2x.png Binary files differnew file mode 100644 index 00000000..218190c5 --- /dev/null +++ b/resources/stock_icons/24x24/x-reset-layout_6@2x.png diff --git a/resources/stock_icons/layouts-to-png.sh b/resources/stock_icons/layouts-to-png.sh new file mode 100644 index 00000000..4572652c --- /dev/null +++ b/resources/stock_icons/layouts-to-png.sh @@ -0,0 +1,140 @@ +#!/bin/bash +# layouts-to-png +# Convert SVG files to 1x and 2x PNGs. Dump a list of Qt resource +# file entries upon successful completion. +# +# Copyright 2014 Gerald Combs <gerald [AT] wireshark.org> +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# SPDX-License-Identifier: GPL-2.0-or-later + +# COMMON_ARGS="--export-area-page" + +#SVGCLEANER=$( type -p svgcleaner ) + +# Running on WSL. Set as needed for Mac/linux. +INKSCAPE_EXE="inkscape.com" + +ICONS=" + layout_1 + layout_2 + layout_3 + layout_4 + layout_5 + layout_6 + " + +if [ -n "$*" ] ; then + ICONS="$*" +fi + +QRC_FILES="" + +for SIZE in 16x16 24x24 ; do + WIDTH=${SIZE/x*/} + HEIGHT=${SIZE/*x/} + SIZE_DIR=${SIZE} + + TWO_X_WIDTH=$(( WIDTH * 2 )) + TWO_X_HEIGHT=$(( HEIGHT * 2 )) + ONE_X_ARGS="--export-width=${WIDTH} --export-height=${HEIGHT}" + TWO_X_ARGS="--export-width=${TWO_X_WIDTH} --export-height=${TWO_X_HEIGHT}" + + echo "Converting $SIZE_DIR" + cd $SIZE_DIR || exit 1 + + for ICON in $ICONS ; do + echo "Converting $ICON" + + ONE_X_SVG="../../layouts.svg" + TWO_X_SVG=$ONE_X_SVG + + ICONNAME="x-reset-$ICON" + ONE_X_PNG=${ICONNAME}.png + TWO_X_PNG=${ICONNAME}@2x.png + + if [ "$ONE_X_SVG" -nt "$ONE_X_PNG" ] ; then + # shellcheck disable=SC2086 + $INKSCAPE_EXE $COMMON_ARGS $ONE_X_ARGS --export-id="$ICON" \ + --export-filename="$ONE_X_PNG" $ONE_X_SVG || exit 1 + QRC_FILES="${QRC_FILES} ${SIZE_DIR}/${ONE_X_PNG}" + fi + + if [ "$TWO_X_SVG" -nt "$TWO_X_PNG" ] ; then + # shellcheck disable=SC2086 + $INKSCAPE_EXE $COMMON_ARGS $TWO_X_ARGS --export-id="$ICON" \ + --export-filename="$TWO_X_PNG" $TWO_X_SVG || exit 1 + QRC_FILES="${QRC_FILES} ${SIZE_DIR}/${TWO_X_PNG}" + fi + + done + + cd .. + +done + +for QRC_FILE in $QRC_FILES ; do + echo " <file>stock_icons/${QRC_FILE}</file>" +done + +echo "--------------------------------------" +QRC_FILES="" + +for SIZE in 48x48 96x96 ; do + WIDTH=${SIZE/x*/} + HEIGHT=${SIZE/*x/} + OUT_DIR=".." + + TWO_X_WIDTH=$(( WIDTH * 2 )) + TWO_X_HEIGHT=$(( HEIGHT * 2 )) + ONE_X_ARGS="--export-width=${WIDTH} --export-height=${HEIGHT}" + TWO_X_ARGS="--export-width=${TWO_X_WIDTH} --export-height=${TWO_X_HEIGHT}" + + echo "Converting $OUT_DIR" + + for ICON in $ICONS ; do + echo "Converting $ICON" + + ONE_X_SVG=${OUT_DIR}/layouts.svg + TWO_X_SVG=$ONE_X_SVG + + ICONNAME="$ICON" + ONE_X_PNG=${OUT_DIR}/${ICONNAME}.png + TWO_X_PNG=${OUT_DIR}/${ICONNAME}@2x.png + + if [ "$ONE_X_SVG" -nt "$ONE_X_PNG" ] ; then + # shellcheck disable=SC2086 + $INKSCAPE_EXE $COMMON_ARGS $ONE_X_ARGS --export-id="$ICON" \ + --export-filename="$ONE_X_PNG" $ONE_X_SVG || exit 1 + QRC_FILES="${QRC_FILES} ${ICONNAME}.png" + fi + + if [ "$TWO_X_SVG" -nt "$TWO_X_PNG" ] ; then + # shellcheck disable=SC2086 + $INKSCAPE_EXE $COMMON_ARGS $TWO_X_ARGS --export-id="$ICON" \ + --export-filename="$TWO_X_PNG" $TWO_X_SVG || exit 1 + QRC_FILES="${QRC_FILES} ${ICONNAME}@2x.png" + fi + + done + +done + +for QRC_FILE in $QRC_FILES ; do + echo " <file>${QRC_FILE}</file>" +done +# +# Editor modelines - https://www.wireshark.org/tools/modelines.html +# +# Local variables: +# c-basic-offset: 4 +# tab-width: 8 +# indent-tabs-mode: nil +# End: +# +# vi: set shiftwidth=4 tabstop=8 expandtab: +# :indentSize=4:tabSize=8:noTabs=true: +# diff --git a/resources/wireshark.exe.manifest.in b/resources/wireshark.exe.manifest.in index 8f996103..ec4d87ed 100644 --- a/resources/wireshark.exe.manifest.in +++ b/resources/wireshark.exe.manifest.in @@ -36,12 +36,6 @@ - The WinVer parts of packaging\nsis\wireshark.nsi - The VersionNT parts of packaging\wix\Prerequisites.wxi --> - <!-- Windows 7 --> - <!-- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> --> - <!-- Windows 8 --> - <!-- <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> --> - <!-- Windows 8.1 --> - <!-- <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> --> <!-- Windows 10 & 11 --> <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> </application> @@ -58,6 +52,7 @@ of PerMonitor. Unfortunately that causes layout issues with Qt 5.6 and 5.9. For now enable PerMonitor DPI awareness by enabling Qt::AA_EnableHighDpiScaling in ui/qt/main.cpp. + Qt 6 is is Per-Monitor DPI Aware V2 by default. --> <!-- <application xmlns="urn:schemas-microsoft-com:asm.v3"> diff --git a/resources/wireshark.pc.in b/resources/wireshark.pc.in new file mode 100644 index 00000000..212d4ec3 --- /dev/null +++ b/resources/wireshark.pc.in @@ -0,0 +1,14 @@ +prefix=${pcfiledir}/../.. +exec_prefix=${prefix} +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +sharedlibdir=${libdir} +plugindir=${libdir}/wireshark/@PLUGIN_VERSION_DIR@ + +Name: Wireshark +Description: Network Protocol Analyzer (Packet Dissection Library) +Version: @PROJECT_VERSION@ + +Requires: glib-2.0, gmodule-2.0, gthread-2.0 +Libs: -L${libdir} -lwireshark -lwsutil +Cflags: -I${includedir}/wireshark |
