From 3c9e4d5de9f95b0c3e047262cae0342ca5bd3864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Wed, 11 Feb 2009 07:46:39 +0000 Subject: Whitespace changes, missed a comment in German svn path=/trunk/; revision=27422 --- epan/dissectors/packet-dect.c | 1426 ++++++++++++++++++++--------------------- 1 file changed, 713 insertions(+), 713 deletions(-) (limited to 'epan/dissectors/packet-dect.c') diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index a1c2669d69..a812732584 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -20,22 +20,22 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* - TODO (roughly in that order) - - Don't use structs to access the elements in the datastream. - - Use tvb_..._item wherever possible - - Add references to documentation (ETSI EN 300 175 parts 1-8) - - Make things stateful - - Once the capture format has stabilized, get rid of the Ethernet - hack and use a proper capture type. + TODO (roughly in that order) + - Don't use structs to access the elements in the datastream. + - Use tvb_..._item wherever possible + - Add references to documentation (ETSI EN 300 175 parts 1-8) + - Make things stateful + - Once the capture format has stabilized, get rid of the Ethernet + hack and use a proper capture type. */ #ifdef HAVE_CONFIG_H @@ -51,14 +51,14 @@ /* scramble table with corrections by Jakub Hruska */ static guint8 scrt[8][31]= { - {0x3B,0xCD,0x21,0x5D,0x88,0x65,0xBD,0x44,0xEF,0x34,0x85,0x76,0x21,0x96,0xF5,0x13,0xBC,0xD2,0x15,0xD8,0x86,0x5B,0xD4,0x4E,0xF3,0x48,0x57,0x62,0x19,0x6F,0x51}, - {0x32,0xDE,0xA2,0x77,0x9A,0x42,0xBB,0x10,0xCB,0x7A,0x89,0xDE,0x69,0x0A,0xEC,0x43,0x2D,0xEA,0x27,0x79,0xA4,0x2B,0xB1,0x0C,0xB7,0xA8,0x9D,0xE6,0x90,0xAE,0xC4}, - {0x2D,0xEA,0x27,0x79,0xA4,0x2B,0xB1,0x0C,0xB7,0xA8,0x9D,0xE6,0x90,0xAE,0xC4,0x32,0xDE,0xA2,0x77,0x9A,0x42,0xBB,0x10,0xCB,0x7A,0x89,0xDE,0x69,0x0A,0xEC,0x43}, - {0x27,0x79,0xA4,0x2B,0xB1,0x0C,0xB7,0xA8,0x9D,0xE6,0x90,0xAE,0xC4,0x32,0xDE,0xA2,0x77,0x9A,0x42,0xBB,0x10,0xCB,0x7A,0x89,0xDE,0x69,0x0A,0xEC,0x43,0x2D,0xEA}, - {0x19,0x6F,0x51,0x3B,0xCD,0x21,0x5D,0x88,0x65,0xBD,0x44,0xEF,0x34,0x85,0x76,0x21,0x96,0xF5,0x13,0xBC,0xD2,0x15,0xD8,0x86,0x5B,0xD4,0x4E,0xF3,0x48,0x57,0x62}, - {0x13,0xBC,0xD2,0x15,0xD8,0x86,0x5B,0xD4,0x4E,0xF3,0x48,0x57,0x62,0x19,0x6F,0x51,0x3B,0xCD,0x21,0x5D,0x88,0x65,0xBD,0x44,0xEF,0x34,0x85,0x76,0x21,0x96,0xF5}, - {0x0C,0xB7,0xA8,0x9D,0xE6,0x90,0xAE,0xC4,0x32,0xDE,0xA2,0x77,0x9A,0x42,0xBB,0x10,0xCB,0x7A,0x89,0xDE,0x69,0x0A,0xEC,0x43,0x2D,0xEA,0x27,0x79,0xA4,0x2B,0xB1}, - {0x79,0xA4,0x2B,0xB1,0x0C,0xB7,0xA8,0x9D,0xE6,0x90,0xAE,0xC4,0x32,0xDE,0xA2,0x77,0x9A,0x42,0xBB,0x10,0xCB,0x7A,0x89,0xDE,0x69,0x0A,0xEC,0x43,0x2D,0xEA,0x27} + {0x3B, 0xCD, 0x21, 0x5D, 0x88, 0x65, 0xBD, 0x44, 0xEF, 0x34, 0x85, 0x76, 0x21, 0x96, 0xF5, 0x13, 0xBC, 0xD2, 0x15, 0xD8, 0x86, 0x5B, 0xD4, 0x4E, 0xF3, 0x48, 0x57, 0x62, 0x19, 0x6F, 0x51}, + {0x32, 0xDE, 0xA2, 0x77, 0x9A, 0x42, 0xBB, 0x10, 0xCB, 0x7A, 0x89, 0xDE, 0x69, 0x0A, 0xEC, 0x43, 0x2D, 0xEA, 0x27, 0x79, 0xA4, 0x2B, 0xB1, 0x0C, 0xB7, 0xA8, 0x9D, 0xE6, 0x90, 0xAE, 0xC4}, + {0x2D, 0xEA, 0x27, 0x79, 0xA4, 0x2B, 0xB1, 0x0C, 0xB7, 0xA8, 0x9D, 0xE6, 0x90, 0xAE, 0xC4, 0x32, 0xDE, 0xA2, 0x77, 0x9A, 0x42, 0xBB, 0x10, 0xCB, 0x7A, 0x89, 0xDE, 0x69, 0x0A, 0xEC, 0x43}, + {0x27, 0x79, 0xA4, 0x2B, 0xB1, 0x0C, 0xB7, 0xA8, 0x9D, 0xE6, 0x90, 0xAE, 0xC4, 0x32, 0xDE, 0xA2, 0x77, 0x9A, 0x42, 0xBB, 0x10, 0xCB, 0x7A, 0x89, 0xDE, 0x69, 0x0A, 0xEC, 0x43, 0x2D, 0xEA}, + {0x19, 0x6F, 0x51, 0x3B, 0xCD, 0x21, 0x5D, 0x88, 0x65, 0xBD, 0x44, 0xEF, 0x34, 0x85, 0x76, 0x21, 0x96, 0xF5, 0x13, 0xBC, 0xD2, 0x15, 0xD8, 0x86, 0x5B, 0xD4, 0x4E, 0xF3, 0x48, 0x57, 0x62}, + {0x13, 0xBC, 0xD2, 0x15, 0xD8, 0x86, 0x5B, 0xD4, 0x4E, 0xF3, 0x48, 0x57, 0x62, 0x19, 0x6F, 0x51, 0x3B, 0xCD, 0x21, 0x5D, 0x88, 0x65, 0xBD, 0x44, 0xEF, 0x34, 0x85, 0x76, 0x21, 0x96, 0xF5}, + {0x0C, 0xB7, 0xA8, 0x9D, 0xE6, 0x90, 0xAE, 0xC4, 0x32, 0xDE, 0xA2, 0x77, 0x9A, 0x42, 0xBB, 0x10, 0xCB, 0x7A, 0x89, 0xDE, 0x69, 0x0A, 0xEC, 0x43, 0x2D, 0xEA, 0x27, 0x79, 0xA4, 0x2B, 0xB1}, + {0x79, 0xA4, 0x2B, 0xB1, 0x0C, 0xB7, 0xA8, 0x9D, 0xE6, 0x90, 0xAE, 0xC4, 0x32, 0xDE, 0xA2, 0x77, 0x9A, 0x42, 0xBB, 0x10, 0xCB, 0x7A, 0x89, 0xDE, 0x69, 0x0A, 0xEC, 0x43, 0x2D, 0xEA, 0x27} }; struct dect_afield @@ -152,529 +152,529 @@ static int hf_dect_B_XCRC = -1; static const value_string tranceiver_mode[]= { - {0,"Receive"}, - {1,"Send"}, - {0,NULL} + {0, "Receive"}, + {1, "Send"}, + {0, NULL} }; static const value_string TA_vals[]= { - {0,"Ct Next Data Packet"}, - {1,"Ct First Data Packet"}, - {2,"Nt Identities Information on Connectionless Bearer"}, - {3,"Nt Identities Information"}, - {4,"Qt Multiframe Synchronisation and System Information"}, - {5,"Escape"}, - {6,"Mt MAC Layer Control"}, - {7,"Pt Paging Tail"}, - {0,NULL} + {0, "Ct Next Data Packet"}, + {1, "Ct First Data Packet"}, + {2, "Nt Identities Information on Connectionless Bearer"}, + {3, "Nt Identities Information"}, + {4, "Qt Multiframe Synchronisation and System Information"}, + {5, "Escape"}, + {6, "Mt MAC Layer Control"}, + {7, "Pt Paging Tail"}, + {0, NULL} }; static const value_string BA_vals[]= { - {0,"U-Type, In, SIn or Ip Packet No. 0 or No Valid Ip_error_detect Channel Data"}, - {1,"U-Type, Ip_error_detect or Ip Packet No. 1 or SIn or No Valid In Channel Data"}, - {2,"Double-Slot Required / E-Type, all Cf or CLf, Packet No. 0"}, - {3,"E-Type, All Cf, Packet No. 1"}, - {4,"Half-Slot Required / E-Type, not all Cf or CLf, Cf Packet No. 0"}, - {5,"E-Type, not all Cf, Cf Packet No. 1"}, - {6,"E-Type, All MAC control (unnumbered)"}, - {7,"No B-Field"}, - {0,NULL} + {0, "U-Type, In, SIn or Ip Packet No. 0 or No Valid Ip_error_detect Channel Data"}, + {1, "U-Type, Ip_error_detect or Ip Packet No. 1 or SIn or No Valid In Channel Data"}, + {2, "Double-Slot Required / E-Type, all Cf or CLf, Packet No. 0"}, + {3, "E-Type, All Cf, Packet No. 1"}, + {4, "Half-Slot Required / E-Type, not all Cf or CLf, Cf Packet No. 0"}, + {5, "E-Type, not all Cf, Cf Packet No. 1"}, + {6, "E-Type, All MAC control (unnumbered)"}, + {7, "No B-Field"}, + {0, NULL} }; static const value_string QTHead_vals[]= { - {0,"Static System Info"}, - {1,"Static System Info"}, - {2,"Extended RF Carriers Part 1"}, - {3,"Fixed Part Capabilities"}, - {4,"Extended Fixed Part Capabilities"}, - {5,"SARI List Contents"}, - {6,"Multi-Frame No."}, - {7,"Escape"}, - {8,"Obsolete"}, - {9,"Extended RF Carriers Part 2"}, - {10,"Reserved(?)"}, - {11,"Transmit Information(?)"}, - {12,"Reserved"}, - {13,"Reserved"}, - {14,"Reserved"}, - {15,"Reserved"}, - {0,NULL} + {0, "Static System Info"}, + {1, "Static System Info"}, + {2, "Extended RF Carriers Part 1"}, + {3, "Fixed Part Capabilities"}, + {4, "Extended Fixed Part Capabilities"}, + {5, "SARI List Contents"}, + {6, "Multi-Frame No."}, + {7, "Escape"}, + {8, "Obsolete"}, + {9, "Extended RF Carriers Part 2"}, + {10, "Reserved(?)"}, + {11, "Transmit Information(?)"}, + {12, "Reserved"}, + {13, "Reserved"}, + {14, "Reserved"}, + {15, "Reserved"}, + {0, NULL} }; static const value_string QTNormalReverse_vals[]= { - {0,"Normal RFP Transmit Half-Frame"}, - {1,"Normal PP Transmit Half-Frame"}, - {0,NULL} + {0, "Normal RFP Transmit Half-Frame"}, + {1, "Normal PP Transmit Half-Frame"}, + {0, NULL} }; static const value_string QTSlotNumber_vals[]= { - {0,"Slot Pair 0/12"}, - {1,"Slot Pair 1/13"}, - {2,"Slot Pair 2/14"}, - {3,"Slot Pair 3/15"}, - {4,"Slot Pair 4/16"}, - {5,"Slot Pair 5/17"}, - {6,"Slot Pair 6/18"}, - {7,"Slot Pair 7/19"}, - {8,"Slot Pair 8/20"}, - {9,"Slot Pair 9/21"}, - {10,"Slot Pair 10/22"}, - {11,"Slot Pair 11/23"}, - {12,"Reserved"}, - {13,"Reserved"}, - {14,"Reserved"}, - {15,"Reserved"}, - {0,NULL} + {0, "Slot Pair 0/12"}, + {1, "Slot Pair 1/13"}, + {2, "Slot Pair 2/14"}, + {3, "Slot Pair 3/15"}, + {4, "Slot Pair 4/16"}, + {5, "Slot Pair 5/17"}, + {6, "Slot Pair 6/18"}, + {7, "Slot Pair 7/19"}, + {8, "Slot Pair 8/20"}, + {9, "Slot Pair 9/21"}, + {10, "Slot Pair 10/22"}, + {11, "Slot Pair 11/23"}, + {12, "Reserved"}, + {13, "Reserved"}, + {14, "Reserved"}, + {15, "Reserved"}, + {0, NULL} }; static const value_string QTStartPosition_vals[]= { - {0,"S-Field starts at Bit F0"}, - {1,"Reserved for Future Use"}, - {2,"S-Field starts at Bit F240"}, - {3,"Reserved for Future Use"}, - {0,NULL} + {0, "S-Field starts at Bit F0"}, + {1, "Reserved for Future Use"}, + {2, "S-Field starts at Bit F240"}, + {3, "Reserved for Future Use"}, + {0, NULL} }; static const value_string QTEscape_vals[]= { - {0,"No QT Escape is broadcast"}, - {1,"The QT Escape is broadcast"}, - {0,NULL} + {0, "No QT Escape is broadcast"}, + {1, "The QT Escape is broadcast"}, + {0, NULL} }; static const value_string QTTranceiver_vals[]= { - {0,"RFP has 1 Transceiver"}, - {1,"RFP has 2 Transceiver"}, - {2,"RFP has 3 Transceiver"}, - {3,"RFP has 4 or more Transceiver"}, - {0,NULL} + {0, "RFP has 1 Transceiver"}, + {1, "RFP has 2 Transceiver"}, + {2, "RFP has 3 Transceiver"}, + {3, "RFP has 4 or more Transceiver"}, + {0, NULL} }; static const value_string QTExtendedCarrier_vals[]= { - {0,"No Extended RF Carrier Information Message"}, - {1,"Extended RF Carrier Information Message shall be transmitted in the next Multiframe"}, - {0,NULL} + {0, "No Extended RF Carrier Information Message"}, + {1, "Extended RF Carrier Information Message shall be transmitted in the next Multiframe"}, + {0, NULL} }; static const value_string QTSpr_vals[]= { - {0,"OK"}, - {1,"Reserved"}, - {2,"Reserved"}, - {3,"Reserved"}, - {0,NULL} + {0, "OK"}, + {1, "Reserved"}, + {2, "Reserved"}, + {3, "Reserved"}, + {0, NULL} }; static const value_string QTCarrierNumber_vals[]= { - {0,"RF Carrier 0"}, - {1,"RF Carrier 1"}, - {2,"RF Carrier 2"}, - {3,"RF Carrier 3"}, - {4,"RF Carrier 4"}, - {5,"RF Carrier 5"}, - {6,"RF Carrier 6"}, - {7,"RF Carrier 7"}, - {8,"RF Carrier 8"}, - {9,"RF Carrier 9"}, - {10,"RF Carrier 10"}, - {11,"RF Carrier 11"}, - {12,"RF Carrier 12"}, - {13,"RF Carrier 13"}, - {14,"RF Carrier 14"}, - {15,"RF Carrier 15"}, - {16,"RF Carrier 16"}, - {17,"RF Carrier 17"}, - {18,"RF Carrier 18"}, - {19,"RF Carrier 19"}, - {20,"RF Carrier 20"}, - {21,"RF Carrier 21"}, - {22,"RF Carrier 22"}, - {23,"RF Carrier 23"}, - {24,"RF Carrier 24"}, - {25,"RF Carrier 25"}, - {26,"RF Carrier 26"}, - {27,"RF Carrier 27"}, - {28,"RF Carrier 28"}, - {29,"RF Carrier 29"}, - {30,"RF Carrier 30"}, - {31,"RF Carrier 31"}, - {32,"RF Carrier 32"}, - {33,"RF Carrier 33"}, - {34,"RF Carrier 34"}, - {35,"RF Carrier 35"}, - {36,"RF Carrier 36"}, - {37,"RF Carrier 37"}, - {38,"RF Carrier 38"}, - {39,"RF Carrier 39"}, - {40,"RF Carrier 40"}, - {41,"RF Carrier 41"}, - {42,"RF Carrier 42"}, - {43,"RF Carrier 43"}, - {44,"RF Carrier 44"}, - {45,"RF Carrier 45"}, - {46,"RF Carrier 46"}, - {47,"RF Carrier 47"}, - {48,"RF Carrier 48"}, - {49,"RF Carrier 49"}, - {50,"RF Carrier 50"}, - {51,"RF Carrier 51"}, - {52,"RF Carrier 52"}, - {53,"RF Carrier 53"}, - {54,"RF Carrier 54"}, - {55,"RF Carrier 55"}, - {56,"RF Carrier 56"}, - {57,"RF Carrier 57"}, - {58,"RF Carrier 58"}, - {59,"RF Carrier 59"}, - {60,"RF Carrier 60"}, - {61,"RF Carrier 61"}, - {62,"RF Carrier 62"}, - {63,"RF Carrier 63"}, - {0,NULL} + {0, "RF Carrier 0"}, + {1, "RF Carrier 1"}, + {2, "RF Carrier 2"}, + {3, "RF Carrier 3"}, + {4, "RF Carrier 4"}, + {5, "RF Carrier 5"}, + {6, "RF Carrier 6"}, + {7, "RF Carrier 7"}, + {8, "RF Carrier 8"}, + {9, "RF Carrier 9"}, + {10, "RF Carrier 10"}, + {11, "RF Carrier 11"}, + {12, "RF Carrier 12"}, + {13, "RF Carrier 13"}, + {14, "RF Carrier 14"}, + {15, "RF Carrier 15"}, + {16, "RF Carrier 16"}, + {17, "RF Carrier 17"}, + {18, "RF Carrier 18"}, + {19, "RF Carrier 19"}, + {20, "RF Carrier 20"}, + {21, "RF Carrier 21"}, + {22, "RF Carrier 22"}, + {23, "RF Carrier 23"}, + {24, "RF Carrier 24"}, + {25, "RF Carrier 25"}, + {26, "RF Carrier 26"}, + {27, "RF Carrier 27"}, + {28, "RF Carrier 28"}, + {29, "RF Carrier 29"}, + {30, "RF Carrier 30"}, + {31, "RF Carrier 31"}, + {32, "RF Carrier 32"}, + {33, "RF Carrier 33"}, + {34, "RF Carrier 34"}, + {35, "RF Carrier 35"}, + {36, "RF Carrier 36"}, + {37, "RF Carrier 37"}, + {38, "RF Carrier 38"}, + {39, "RF Carrier 39"}, + {40, "RF Carrier 40"}, + {41, "RF Carrier 41"}, + {42, "RF Carrier 42"}, + {43, "RF Carrier 43"}, + {44, "RF Carrier 44"}, + {45, "RF Carrier 45"}, + {46, "RF Carrier 46"}, + {47, "RF Carrier 47"}, + {48, "RF Carrier 48"}, + {49, "RF Carrier 49"}, + {50, "RF Carrier 50"}, + {51, "RF Carrier 51"}, + {52, "RF Carrier 52"}, + {53, "RF Carrier 53"}, + {54, "RF Carrier 54"}, + {55, "RF Carrier 55"}, + {56, "RF Carrier 56"}, + {57, "RF Carrier 57"}, + {58, "RF Carrier 58"}, + {59, "RF Carrier 59"}, + {60, "RF Carrier 60"}, + {61, "RF Carrier 61"}, + {62, "RF Carrier 62"}, + {63, "RF Carrier 63"}, + {0, NULL} }; static const value_string QTScanCarrierNum_vals[]= { - {0,"Primary Scan next on RF Carrier 0"}, - {1,"Primary Scan next on RF Carrier 1"}, - {2,"Primary Scan next on RF Carrier 2"}, - {3,"Primary Scan next on RF Carrier 3"}, - {4,"Primary Scan next on RF Carrier 4"}, - {5,"Primary Scan next on RF Carrier 5"}, - {6,"Primary Scan next on RF Carrier 6"}, - {7,"Primary Scan next on RF Carrier 7"}, - {8,"Primary Scan next on RF Carrier 8"}, - {9,"Primary Scan next on RF Carrier 9"}, - {10,"Primary Scan next on RF Carrier 10"}, - {11,"Primary Scan next on RF Carrier 11"}, - {12,"Primary Scan next on RF Carrier 12"}, - {13,"Primary Scan next on RF Carrier 13"}, - {14,"Primary Scan next on RF Carrier 14"}, - {15,"Primary Scan next on RF Carrier 15"}, - {16,"Primary Scan next on RF Carrier 16"}, - {17,"Primary Scan next on RF Carrier 17"}, - {18,"Primary Scan next on RF Carrier 18"}, - {19,"Primary Scan next on RF Carrier 19"}, - {20,"Primary Scan next on RF Carrier 20"}, - {21,"Primary Scan next on RF Carrier 21"}, - {22,"Primary Scan next on RF Carrier 22"}, - {23,"Primary Scan next on RF Carrier 23"}, - {24,"Primary Scan next on RF Carrier 24"}, - {25,"Primary Scan next on RF Carrier 25"}, - {26,"Primary Scan next on RF Carrier 26"}, - {27,"Primary Scan next on RF Carrier 27"}, - {28,"Primary Scan next on RF Carrier 28"}, - {29,"Primary Scan next on RF Carrier 29"}, - {30,"Primary Scan next on RF Carrier 30"}, - {31,"Primary Scan next on RF Carrier 31"}, - {32,"Primary Scan next on RF Carrier 32"}, - {33,"Primary Scan next on RF Carrier 33"}, - {34,"Primary Scan next on RF Carrier 34"}, - {35,"Primary Scan next on RF Carrier 35"}, - {36,"Primary Scan next on RF Carrier 36"}, - {37,"Primary Scan next on RF Carrier 37"}, - {38,"Primary Scan next on RF Carrier 38"}, - {39,"Primary Scan next on RF Carrier 39"}, - {40,"Primary Scan next on RF Carrier 40"}, - {41,"Primary Scan next on RF Carrier 41"}, - {42,"Primary Scan next on RF Carrier 42"}, - {43,"Primary Scan next on RF Carrier 43"}, - {44,"Primary Scan next on RF Carrier 44"}, - {45,"Primary Scan next on RF Carrier 45"}, - {46,"Primary Scan next on RF Carrier 46"}, - {47,"Primary Scan next on RF Carrier 47"}, - {48,"Primary Scan next on RF Carrier 48"}, - {49,"Primary Scan next on RF Carrier 49"}, - {50,"Primary Scan next on RF Carrier 50"}, - {51,"Primary Scan next on RF Carrier 51"}, - {52,"Primary Scan next on RF Carrier 52"}, - {53,"Primary Scan next on RF Carrier 53"}, - {54,"Primary Scan next on RF Carrier 54"}, - {55,"Primary Scan next on RF Carrier 55"}, - {56,"Primary Scan next on RF Carrier 56"}, - {57,"Primary Scan next on RF Carrier 57"}, - {58,"Primary Scan next on RF Carrier 58"}, - {59,"Primary Scan next on RF Carrier 59"}, - {60,"Primary Scan next on RF Carrier 60"}, - {61,"Primary Scan next on RF Carrier 61"}, - {62,"Primary Scan next on RF Carrier 62"}, - {63,"Primary Scan next on RF Carrier 63"}, - {0,NULL} + {0, "Primary Scan next on RF Carrier 0"}, + {1, "Primary Scan next on RF Carrier 1"}, + {2, "Primary Scan next on RF Carrier 2"}, + {3, "Primary Scan next on RF Carrier 3"}, + {4, "Primary Scan next on RF Carrier 4"}, + {5, "Primary Scan next on RF Carrier 5"}, + {6, "Primary Scan next on RF Carrier 6"}, + {7, "Primary Scan next on RF Carrier 7"}, + {8, "Primary Scan next on RF Carrier 8"}, + {9, "Primary Scan next on RF Carrier 9"}, + {10, "Primary Scan next on RF Carrier 10"}, + {11, "Primary Scan next on RF Carrier 11"}, + {12, "Primary Scan next on RF Carrier 12"}, + {13, "Primary Scan next on RF Carrier 13"}, + {14, "Primary Scan next on RF Carrier 14"}, + {15, "Primary Scan next on RF Carrier 15"}, + {16, "Primary Scan next on RF Carrier 16"}, + {17, "Primary Scan next on RF Carrier 17"}, + {18, "Primary Scan next on RF Carrier 18"}, + {19, "Primary Scan next on RF Carrier 19"}, + {20, "Primary Scan next on RF Carrier 20"}, + {21, "Primary Scan next on RF Carrier 21"}, + {22, "Primary Scan next on RF Carrier 22"}, + {23, "Primary Scan next on RF Carrier 23"}, + {24, "Primary Scan next on RF Carrier 24"}, + {25, "Primary Scan next on RF Carrier 25"}, + {26, "Primary Scan next on RF Carrier 26"}, + {27, "Primary Scan next on RF Carrier 27"}, + {28, "Primary Scan next on RF Carrier 28"}, + {29, "Primary Scan next on RF Carrier 29"}, + {30, "Primary Scan next on RF Carrier 30"}, + {31, "Primary Scan next on RF Carrier 31"}, + {32, "Primary Scan next on RF Carrier 32"}, + {33, "Primary Scan next on RF Carrier 33"}, + {34, "Primary Scan next on RF Carrier 34"}, + {35, "Primary Scan next on RF Carrier 35"}, + {36, "Primary Scan next on RF Carrier 36"}, + {37, "Primary Scan next on RF Carrier 37"}, + {38, "Primary Scan next on RF Carrier 38"}, + {39, "Primary Scan next on RF Carrier 39"}, + {40, "Primary Scan next on RF Carrier 40"}, + {41, "Primary Scan next on RF Carrier 41"}, + {42, "Primary Scan next on RF Carrier 42"}, + {43, "Primary Scan next on RF Carrier 43"}, + {44, "Primary Scan next on RF Carrier 44"}, + {45, "Primary Scan next on RF Carrier 45"}, + {46, "Primary Scan next on RF Carrier 46"}, + {47, "Primary Scan next on RF Carrier 47"}, + {48, "Primary Scan next on RF Carrier 48"}, + {49, "Primary Scan next on RF Carrier 49"}, + {50, "Primary Scan next on RF Carrier 50"}, + {51, "Primary Scan next on RF Carrier 51"}, + {52, "Primary Scan next on RF Carrier 52"}, + {53, "Primary Scan next on RF Carrier 53"}, + {54, "Primary Scan next on RF Carrier 54"}, + {55, "Primary Scan next on RF Carrier 55"}, + {56, "Primary Scan next on RF Carrier 56"}, + {57, "Primary Scan next on RF Carrier 57"}, + {58, "Primary Scan next on RF Carrier 58"}, + {59, "Primary Scan next on RF Carrier 59"}, + {60, "Primary Scan next on RF Carrier 60"}, + {61, "Primary Scan next on RF Carrier 61"}, + {62, "Primary Scan next on RF Carrier 62"}, + {63, "Primary Scan next on RF Carrier 63"}, + {0, NULL} }; static const value_string Qt_A12_vals[]= { - {0,""}, - {1,"Extended FP Info"}, - {0,NULL} + {0, ""}, + {1, "Extended FP Info"}, + {0, NULL} }; static const value_string Qt_A13_vals[]= { - {0,""}, - {1,"Double Duplex Bearer Connections"}, - {0,NULL} + {0, ""}, + {1, "Double Duplex Bearer Connections"}, + {0, NULL} }; static const value_string Qt_A14_vals[]= { - {0,""}, - {1,"Reserved"}, - {0,NULL} + {0, ""}, + {1, "Reserved"}, + {0, NULL} }; static const value_string Qt_A15_vals[]= { - {0,""}, - {1,"Double Slot"}, - {0,NULL} + {0, ""}, + {1, "Double Slot"}, + {0, NULL} }; static const value_string Qt_A16_vals[]= { - {0,""}, - {1,"Half Slot"}, - {0,NULL} + {0, ""}, + {1, "Half Slot"}, + {0, NULL} }; static const value_string Qt_A17_vals[]= { - {0,""}, - {1,"Full Slot"}, - {0,NULL} + {0, ""}, + {1, "Full Slot"}, + {0, NULL} }; static const value_string Qt_A18_vals[]= { - {0,""}, - {1,"Frequency Control"}, - {0,NULL} + {0, ""}, + {1, "Frequency Control"}, + {0, NULL} }; static const value_string Qt_A19_vals[]= { - {0,""}, - {1,"Page Repetition"}, - {0,NULL} + {0, ""}, + {1, "Page Repetition"}, + {0, NULL} }; static const value_string Qt_A20_vals[]= { - {0,""}, - {1,"C/O Setup on Dummy allowed"}, - {0,NULL} + {0, ""}, + {1, "C/O Setup on Dummy allowed"}, + {0, NULL} }; static const value_string Qt_A21_vals[]= { - {0,""}, - {1,"C/L Uplink"}, - {0,NULL} + {0, ""}, + {1, "C/L Uplink"}, + {0, NULL} }; static const value_string Qt_A22_vals[]= { - {0,""}, - {1,"C/L Downlink"}, - {0,NULL} + {0, ""}, + {1, "C/L Downlink"}, + {0, NULL} }; static const value_string Qt_A23_vals[]= { - {0,""}, - {1,"Basic A-Field Set-Up"}, - {0,NULL} + {0, ""}, + {1, "Basic A-Field Set-Up"}, + {0, NULL} }; static const value_string Qt_A24_vals[]= { - {0,""}, - {1,"Advanced A-Field Set-Up"}, - {0,NULL} + {0, ""}, + {1, "Advanced A-Field Set-Up"}, + {0, NULL} }; static const value_string Qt_A25_vals[]= { - {0,""}, - {1,"B-field Set-Up"}, - {0,NULL} + {0, ""}, + {1, "B-field Set-Up"}, + {0, NULL} }; static const value_string Qt_A26_vals[]= { - {0,""}, - {1,"Cf Messages"}, - {0,NULL} + {0, ""}, + {1, "Cf Messages"}, + {0, NULL} }; static const value_string Qt_A27_vals[]= { - {0,""}, - {1,"In Minimum Delay"}, - {0,NULL} + {0, ""}, + {1, "In Minimum Delay"}, + {0, NULL} }; static const value_string Qt_A28_vals[]= { - {0,""}, - {1,"In Normal Delay"}, - {0,NULL} + {0, ""}, + {1, "In Normal Delay"}, + {0, NULL} }; static const value_string Qt_A29_vals[]= { - {0,""}, - {1,"Ip Error Detection"}, - {0,NULL} + {0, ""}, + {1, "Ip Error Detection"}, + {0, NULL} }; static const value_string Qt_A30_vals[]= { - {0,""}, - {1,"Ip Error Correction"}, - {0,NULL} + {0, ""}, + {1, "Ip Error Correction"}, + {0, NULL} }; static const value_string Qt_A31_vals[]= { - {0,""}, - {1,"Multibearer Connections"}, - {0,NULL} + {0, ""}, + {1, "Multibearer Connections"}, + {0, NULL} }; static const value_string MTHead_vals[]= { - {0,"Basic Connection Control"}, - {1,"Advanced Connection Control"}, - {2,"MAC Layer Test Messages"}, - {3,"Quality Control"}, - {4,"Broadcast and Connectionless Services"}, - {5,"Encryption Control"}, - {6,"Tail for use with the first Transmission of a B-Field \"bearer request\" Message"}, - {7,"Escape"}, - {8,"TARI Message"}, - {9,"REP Connection Control"}, - {10,"Reserved"}, - {11,"Reserved"}, - {12,"Reserved"}, - {13,"Reserved"}, - {14,"Reserved"}, - {15,"Reserved"}, - {0,NULL} + {0, "Basic Connection Control"}, + {1, "Advanced Connection Control"}, + {2, "MAC Layer Test Messages"}, + {3, "Quality Control"}, + {4, "Broadcast and Connectionless Services"}, + {5, "Encryption Control"}, + {6, "Tail for use with the first Transmission of a B-Field \"bearer request\" Message"}, + {7, "Escape"}, + {8, "TARI Message"}, + {9, "REP Connection Control"}, + {10, "Reserved"}, + {11, "Reserved"}, + {12, "Reserved"}, + {13, "Reserved"}, + {14, "Reserved"}, + {15, "Reserved"}, + {0, NULL} }; static const value_string MTBasicConCtrl_vals[]= { - {0,"Access Request"}, - {1,"Bearer Handover Request"}, - {2,"Connection Handover Request"}, - {3,"Unconfirmed Access Request"}, - {4,"Bearer Confirm"}, - {5,"Wait"}, - {6,"Attributes T Request"}, - {7,"Attributes T Confirm"}, - {8,"Reserved"}, - {9,"Reserved"}, - {10,"Reserved"}, - {11,"Reserved"}, - {12,"Reserved"}, - {13,"Reserved"}, - {14,"Reserved"}, - {15,"Release"}, - {0,NULL} + {0, "Access Request"}, + {1, "Bearer Handover Request"}, + {2, "Connection Handover Request"}, + {3, "Unconfirmed Access Request"}, + {4, "Bearer Confirm"}, + {5, "Wait"}, + {6, "Attributes T Request"}, + {7, "Attributes T Confirm"}, + {8, "Reserved"}, + {9, "Reserved"}, + {10, "Reserved"}, + {11, "Reserved"}, + {12, "Reserved"}, + {13, "Reserved"}, + {14, "Reserved"}, + {15, "Release"}, + {0, NULL} }; static const value_string MTEncrCmd1_vals[]= { - {0,"Start Encryption"}, - {1,"Stop Encryption"}, - {2,"reserved"}, - {3,"reserved"}, - {0,NULL} + {0, "Start Encryption"}, + {1, "Stop Encryption"}, + {2, "reserved"}, + {3, "reserved"}, + {0, NULL} }; static const value_string MTEncrCmd2_vals[]= { - {0,"Request"}, - {1,"Confirm"}, - {2,"Grant"}, - {3,"Reserved"}, - {0,NULL} + {0, "Request"}, + {1, "Confirm"}, + {2, "Grant"}, + {3, "Reserved"}, + {0, NULL} }; static const value_string PTExtFlag_vals[]= { - {0,"bla1"}, - {1,"bla2"}, - {0,NULL} + {0, "bla1"}, + {1, "bla2"}, + {0, NULL} }; static const value_string PTSDU_vals[]= { - {0,"Zero Length Page"}, - {1,"Short Page"}, - {2,"Full Page"}, - {3,"MAC resume page"}, - {4,"Not the last 36 Bits of a Long Page"}, - {5,"The first 36 Bits of a Long Page"}, - {6,"The last 36 Bits of a Long Page"}, - {7,"All of a Long Page (first and last)"}, - {0,NULL} + {0, "Zero Length Page"}, + {1, "Short Page"}, + {2, "Full Page"}, + {3, "MAC resume page"}, + {4, "Not the last 36 Bits of a Long Page"}, + {5, "The first 36 Bits of a Long Page"}, + {6, "The last 36 Bits of a Long Page"}, + {7, "All of a Long Page (first and last)"}, + {0, NULL} }; static const value_string PTInfoType_vals[]= { - {0,"Fill Bits"}, - {1,"Blind Full Slot Information for Circuit Mode Service"}, - {2,"Other Bearer"}, - {3,"Recommended Other Bearer"}, - {4,"Good RFP Bearer"}, - {5,"Dummy or connectionless Bearer Position"}, - {6,"Extended Modulation Types"}, - {7,"Escape"}, - {8,"Dummy or connectionless Bearer Marker"}, - {9,"Bearer Handover/Replacement Information"}, - {10,"RFP Status and Modulation Types"}, - {11,"Active Carriers"}, - {12,"Connectionless Bearer Position"}, - {13,"RFP Power Level"}, - {14,"Blind Double Slot/RFP-FP Interface Resource Information"}, - {15,"Blind Full Slot Information for Packet Mode Service"}, - {0,NULL} + {0, "Fill Bits"}, + {1, "Blind Full Slot Information for Circuit Mode Service"}, + {2, "Other Bearer"}, + {3, "Recommended Other Bearer"}, + {4, "Good RFP Bearer"}, + {5, "Dummy or connectionless Bearer Position"}, + {6, "Extended Modulation Types"}, + {7, "Escape"}, + {8, "Dummy or connectionless Bearer Marker"}, + {9, "Bearer Handover/Replacement Information"}, + {10, "RFP Status and Modulation Types"}, + {11, "Active Carriers"}, + {12, "Connectionless Bearer Position"}, + {13, "RFP Power Level"}, + {14, "Blind Double Slot/RFP-FP Interface Resource Information"}, + {15, "Blind Full Slot Information for Packet Mode Service"}, + {0, NULL} }; static const value_string PTRFPPower_vals[]= { - {0,"0 dBm"}, - {1,"2 dBm"}, - {2,"4 dBm"}, - {3,"6 dBm"}, - {4,"8 dBm"}, - {5,"10 dBm"}, - {6,"12 dBm"}, - {7,"14 dBm"}, - {8,"16 dBm"}, - {9,"18 dBm"}, - {10,"20 dBm"}, - {11,"22 dBm"}, - {12,"24 dBm"}, - {13,"26 dBm"}, - {14,"28 dBm"}, - {15,"30 dBm"}, + {0, "0 dBm"}, + {1, "2 dBm"}, + {2, "4 dBm"}, + {3, "6 dBm"}, + {4, "8 dBm"}, + {5, "10 dBm"}, + {6, "12 dBm"}, + {7, "14 dBm"}, + {8, "16 dBm"}, + {9, "18 dBm"}, + {10, "20 dBm"}, + {11, "22 dBm"}, + {12, "24 dBm"}, + {13, "26 dBm"}, + {14, "28 dBm"}, + {15, "30 dBm"}, {0, NULL} }; static unsigned char -getbit(guint8 *data,int bit) +getbit(guint8 *data, int bit) { guint8 c; guint8 byte=data[bit/8]; @@ -686,7 +686,7 @@ getbit(guint8 *data,int bit) } static void -setbit(guint8 *data,int bit,guint8 value) +setbit(guint8 *data, int bit, guint8 value) { if(!value) data[bit/8]&=~(1<<(bit%8)); @@ -695,17 +695,17 @@ setbit(guint8 *data,int bit,guint8 value) } static guint8 -calc_xcrc(guint8* data,guint8 length) +calc_xcrc(guint8* data, guint8 length) { guint8 bits[21]; guint8 gp=0x1; guint8 div; guint8 next; - int y,x; + int y, x; for(y=0;y<80;y++) { - setbit(bits,y,getbit(data,y+48*(1+(int)(y/16)))); + setbit(bits, y, getbit(data, y+48*(1+(int)(y/16)))); } length=10; div=bits[0]; @@ -749,7 +749,7 @@ calc_rcrc(guint8* data) guint16 div; guint8 next; - int y,x; + int y, x; div=data[0]<<8|data[1]; y=0; @@ -785,11 +785,11 @@ calc_rcrc(guint8* data) static gint dissect_bfield(gboolean type _U_, struct dect_afield *pkt_afield, struct dect_bfield *pkt_bfield, packet_info *pinfo, const guint8 *pkt_ptr _U_, - tvbuff_t *tvb,proto_item *ti _U_, proto_tree *DectTree, gint offset) + tvbuff_t *tvb, proto_item *ti _U_, proto_tree *DectTree, gint offset) { - guint8 xcrc,xcrclen; + guint8 xcrc, xcrclen; guint16 blen; - gint oldoffset,fn; + gint oldoffset, fn; proto_item *bfieldti =NULL; #if 0 proto_item *bxcrc =NULL; @@ -807,36 +807,36 @@ dissect_bfield(gboolean type _U_, struct dect_afield *pkt_afield, blen=40; xcrclen=4; - if(check_col(pinfo->cinfo,COL_DEF_NET_DST)) + if(check_col(pinfo->cinfo, COL_DEF_NET_DST)) { - col_append_str(pinfo->cinfo,COL_DEF_NET_DST,"Full Slot"); + col_append_str(pinfo->cinfo, COL_DEF_NET_DST, "Full Slot"); } break; case 2: blen=100; xcrclen=4; - if(check_col(pinfo->cinfo,COL_DEF_NET_DST)) + if(check_col(pinfo->cinfo, COL_DEF_NET_DST)) { - col_append_str(pinfo->cinfo,COL_DEF_NET_DST,"Double Slot"); + col_append_str(pinfo->cinfo, COL_DEF_NET_DST, "Double Slot"); } break; case 4: blen=10; xcrclen=4; - if(check_col(pinfo->cinfo,COL_DEF_NET_DST)) + if(check_col(pinfo->cinfo, COL_DEF_NET_DST)) { - col_append_str(pinfo->cinfo,COL_DEF_NET_DST,"Half Slot"); + col_append_str(pinfo->cinfo, COL_DEF_NET_DST, "Half Slot"); } break; case 7: blen=0; xcrclen=0; - if(check_col(pinfo->cinfo,COL_DEF_NET_DST)) + if(check_col(pinfo->cinfo, COL_DEF_NET_DST)) { - col_append_str(pinfo->cinfo,COL_DEF_NET_DST,"No B-Field"); + col_append_str(pinfo->cinfo, COL_DEF_NET_DST, "No B-Field"); } break; default: @@ -847,15 +847,15 @@ dissect_bfield(gboolean type _U_, struct dect_afield *pkt_afield, } if(blen) { - bfieldti = proto_tree_add_uint_format(DectTree,hf_dect_B,tvb,offset,40,0/*0x2323*/,"B-Field"); - BField = proto_item_add_subtree(bfieldti,ett_bfield); + bfieldti = proto_tree_add_uint_format(DectTree, hf_dect_B, tvb, offset, 40, 0/*0x2323*/, "B-Field"); + BField = proto_item_add_subtree(bfieldti, ett_bfield); } oldoffset=offset; if((blen+(xcrclen/8)+1)<=pkt_bfield->Length) { - guint16 x,y=0; + guint16 x, y=0; for(x=0;x=blen) break; - g_snprintf(string,sizeof(string),"%s%.2x ",string,pkt_bfield->Data[x+y]); + g_snprintf(string, sizeof(string), "%s%.2x ", string, pkt_bfield->Data[x+y]); } - proto_tree_add_uint_format(BField,hf_dect_B_Data,tvb,offset,y,0x2323,"Data: %s",string); + proto_tree_add_uint_format(BField, hf_dect_B_Data, tvb, offset, y, 0x2323, "Data: %s", string); if(y==16) offset+=16; else @@ -877,10 +877,10 @@ dissect_bfield(gboolean type _U_, struct dect_afield *pkt_afield, { guint16 bytecount=0; - proto_tree_add_uint_format(BField,hf_dect_B_Data,tvb,offset,y,0x2323,"\n"); + proto_tree_add_uint_format(BField, hf_dect_B_Data, tvb, offset, y, 0x2323, "\n"); offset=oldoffset; - proto_tree_add_uint_format(BField,hf_dect_B_Data,tvb,offset,y,0x2323,"Framenumber %u/%u",fn,fn+8); + proto_tree_add_uint_format(BField, hf_dect_B_Data, tvb, offset, y, 0x2323, "Framenumber %u/%u", fn, fn+8); for(x=0;x=blen) break; - g_snprintf(string,sizeof(string),"%s%.2x ",string,pkt_bfield->Data[x+y]^scrt[fn][bytecount%31]); + g_snprintf(string, sizeof(string), "%s%.2x ", string, pkt_bfield->Data[x+y]^scrt[fn][bytecount%31]); bytecount++; } - proto_tree_add_uint_format(BField,hf_dect_B_Data,tvb,offset,y,0x2323,"Data: %s",string); + proto_tree_add_uint_format(BField, hf_dect_B_Data, tvb, offset, y, 0x2323, "Data: %s", string); if(y==16) offset+=16; else offset+=16-y; } } - xcrc=calc_xcrc(pkt_bfield->Data,83); + xcrc=calc_xcrc(pkt_bfield->Data, 83); if(xcrc!=(pkt_bfield->Data[40]&0xf0)) - proto_tree_add_uint_format(bfieldti,hf_dect_B_XCRC,tvb,offset,1,0,"X-CRC Error (Calc:%.2x,Recv:%.2x)",xcrc,pkt_bfield->Data[40]&0xf0); + proto_tree_add_uint_format(bfieldti, hf_dect_B_XCRC, tvb, offset, 1, 0, "X-CRC Error (Calc:%.2x, Recv:%.2x)", xcrc, pkt_bfield->Data[40]&0xf0); else - proto_tree_add_uint_format(bfieldti,hf_dect_B_XCRC,tvb,offset,1,1,"X-CRC Match (Calc:%.2x,Recv:%.2x)",xcrc,pkt_bfield->Data[40]&0xf0); + proto_tree_add_uint_format(bfieldti, hf_dect_B_XCRC, tvb, offset, 1, 1, "X-CRC Match (Calc:%.2x, Recv:%.2x)", xcrc, pkt_bfield->Data[40]&0xf0); } else - proto_tree_add_uint_format(BField,hf_dect_B_Data,tvb,offset,0,0x2323,"Data too Short"); + proto_tree_add_uint_format(BField, hf_dect_B_Data, tvb, offset, 0, 0x2323, "Data too Short"); return offset; } @@ -935,198 +935,198 @@ dissect_decttype(gboolean type, struct dect_afield *pkt_afield, proto_tree *AQT =NULL; #endif - /************************** A-Field ***********************************/ + /************************** A-Field ***********************************/ /* A-Feld */ - afieldti = proto_tree_add_uint_format(DectTree,hf_dect_A,tvb,offset,8,0/*0x2323*/,"A-Field"); - AField = proto_item_add_subtree(afieldti,ett_afield); + afieldti = proto_tree_add_uint_format(DectTree, hf_dect_A, tvb, offset, 8, 0/*0x2323*/, "A-Field"); + AField = proto_item_add_subtree(afieldti, ett_afield); - /* Header */ - aheadti = proto_tree_add_uint_format(afieldti,hf_dect_A_Head,tvb,offset,1,0x2323,"Header"); - AHead = proto_item_add_subtree(aheadti,ett_ahead); + /* Header */ + aheadti = proto_tree_add_uint_format(afieldti, hf_dect_A_Head, tvb, offset, 1, 0x2323, "Header"); + AHead = proto_item_add_subtree(aheadti, ett_ahead); - proto_tree_add_uint(AHead,hf_dect_A_Head_TA,tvb,offset,1,pkt_afield->Header); - proto_tree_add_uint(AHead,hf_dect_A_Head_Q1,tvb,offset,1,pkt_afield->Header); - proto_tree_add_uint(AHead,hf_dect_A_Head_BA,tvb,offset,1,pkt_afield->Header); - proto_tree_add_uint(AHead,hf_dect_A_Head_Q2,tvb,offset,1,pkt_afield->Header); + proto_tree_add_uint(AHead, hf_dect_A_Head_TA, tvb, offset, 1, pkt_afield->Header); + proto_tree_add_uint(AHead, hf_dect_A_Head_Q1, tvb, offset, 1, pkt_afield->Header); + proto_tree_add_uint(AHead, hf_dect_A_Head_BA, tvb, offset, 1, pkt_afield->Header); + proto_tree_add_uint(AHead, hf_dect_A_Head_Q2, tvb, offset, 1, pkt_afield->Header); offset++; /* Tail */ - atailti = proto_tree_add_uint_format(afieldti,hf_dect_A_Tail,tvb,offset,5,0x2323,"Tail: %s",TA_vals[(pkt_afield->Header&0xE0)>>5].strptr); - ATail = proto_item_add_subtree(atailti,ett_atail); + atailti = proto_tree_add_uint_format(afieldti, hf_dect_A_Tail, tvb, offset, 5, 0x2323, "Tail: %s", TA_vals[(pkt_afield->Header&0xE0)>>5].strptr); + ATail = proto_item_add_subtree(atailti, ett_atail); switch((pkt_afield->Header&0xE0)>>5) { case 0: /* Ct */ case 1: - if(check_col(pinfo->cinfo,COL_HPUX_SUBSYS)) - col_set_str(pinfo->cinfo,COL_HPUX_SUBSYS,"[Ct]"); + if(check_col(pinfo->cinfo, COL_HPUX_SUBSYS)) + col_set_str(pinfo->cinfo, COL_HPUX_SUBSYS, "[Ct]"); break; case 2: /* Nt */ case 3: /* Nt connectionless bearer */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) { str_p = ep_strdup_printf("RFPI:%.2x%.2x%.2x%.2x%.2x" - ,pkt_afield->Tail[0],pkt_afield->Tail[1],pkt_afield->Tail[2] - ,pkt_afield->Tail[3],pkt_afield->Tail[4]); + , pkt_afield->Tail[0], pkt_afield->Tail[1], pkt_afield->Tail[2] + , pkt_afield->Tail[3], pkt_afield->Tail[4]); - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,str_p); + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, str_p); offset+=5; /* due to addition further down */ offset-=5; } - if(check_col(pinfo->cinfo,COL_HPUX_SUBSYS)) - col_set_str(pinfo->cinfo,COL_HPUX_SUBSYS,"[Nt]"); + if(check_col(pinfo->cinfo, COL_HPUX_SUBSYS)) + col_set_str(pinfo->cinfo, COL_HPUX_SUBSYS, "[Nt]"); - proto_tree_add_uint_format(atailti,hf_dect_A_Tail_Nt,tvb,offset,5,0x2323,"RFPI:%.2x%.2x%.2x%.2x%.2x" - ,pkt_afield->Tail[0],pkt_afield->Tail[1],pkt_afield->Tail[2],pkt_afield->Tail[3] - ,pkt_afield->Tail[4]); + proto_tree_add_uint_format(atailti, hf_dect_A_Tail_Nt, tvb, offset, 5, 0x2323, "RFPI:%.2x%.2x%.2x%.2x%.2x" + , pkt_afield->Tail[0], pkt_afield->Tail[1], pkt_afield->Tail[2], pkt_afield->Tail[3] + , pkt_afield->Tail[4]); break; case 4: /* Qt */ - if(check_col(pinfo->cinfo,COL_HPUX_SUBSYS)) - col_set_str(pinfo->cinfo,COL_HPUX_SUBSYS,"[Qt]"); + if(check_col(pinfo->cinfo, COL_HPUX_SUBSYS)) + col_set_str(pinfo->cinfo, COL_HPUX_SUBSYS, "[Qt]"); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_Qh,tvb,offset,1,(pkt_afield->Tail[0])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_Qh, tvb, offset, 1, (pkt_afield->Tail[0])); switch(pkt_afield->Tail[0]>>4) { case 0: /* Static System Info */ case 1: - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Static System Info"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Static System Info"); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_0_Nr,tvb,offset,1,(pkt_afield->Tail[0])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_0_Sn,tvb,offset,1,(pkt_afield->Tail[0])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_0_Nr, tvb, offset, 1, (pkt_afield->Tail[0])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_0_Sn, tvb, offset, 1, (pkt_afield->Tail[0])); offset++; - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_0_Sp,tvb,offset,1,(pkt_afield->Tail[1])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_0_Esc,tvb,offset,1,(pkt_afield->Tail[1])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_0_Txs,tvb,offset,1,(pkt_afield->Tail[1])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_0_Mc,tvb,offset,1,(pkt_afield->Tail[1])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_0_Sp, tvb, offset, 1, (pkt_afield->Tail[1])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_0_Esc, tvb, offset, 1, (pkt_afield->Tail[1])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_0_Txs, tvb, offset, 1, (pkt_afield->Tail[1])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_0_Mc, tvb, offset, 1, (pkt_afield->Tail[1])); offset++; - proto_tree_add_uint_format(ATail,hf_dect_A_Tail_Mt_Mh,tvb,offset,2,0x2323," Carrier%s%s%s%s%s%s%s%s%s%s available", - (pkt_afield->Tail[1]&0x02)?" 0":"",(pkt_afield->Tail[1]&0x01)?" 1":"",(pkt_afield->Tail[2]&0x80)?" 2":"", - (pkt_afield->Tail[2]&0x40)?" 3":"",(pkt_afield->Tail[2]&0x20)?" 4":"",(pkt_afield->Tail[2]&0x10)?" 5":"", - (pkt_afield->Tail[2]&0x08)?" 6":"",(pkt_afield->Tail[2]&0x04)?" 7":"",(pkt_afield->Tail[2]&0x02)?" 8":"", + proto_tree_add_uint_format(ATail, hf_dect_A_Tail_Mt_Mh, tvb, offset, 2, 0x2323, " Carrier%s%s%s%s%s%s%s%s%s%s available", + (pkt_afield->Tail[1]&0x02)?" 0":"", (pkt_afield->Tail[1]&0x01)?" 1":"", (pkt_afield->Tail[2]&0x80)?" 2":"", + (pkt_afield->Tail[2]&0x40)?" 3":"", (pkt_afield->Tail[2]&0x20)?" 4":"", (pkt_afield->Tail[2]&0x10)?" 5":"", + (pkt_afield->Tail[2]&0x08)?" 6":"", (pkt_afield->Tail[2]&0x04)?" 7":"", (pkt_afield->Tail[2]&0x02)?" 8":"", (pkt_afield->Tail[2]&0x01)?" 9":""); offset++; - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_0_Spr1,tvb,offset,1,(pkt_afield->Tail[3])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_0_Cn,tvb,offset,1,(pkt_afield->Tail[3])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_0_Spr1, tvb, offset, 1, (pkt_afield->Tail[3])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_0_Cn, tvb, offset, 1, (pkt_afield->Tail[3])); offset++; - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_0_Spr2,tvb,offset,1,(pkt_afield->Tail[4])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_0_PSCN,tvb,offset,1,(pkt_afield->Tail[4])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_0_Spr2, tvb, offset, 1, (pkt_afield->Tail[4])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_0_PSCN, tvb, offset, 1, (pkt_afield->Tail[4])); offset++; /* due to addition further down */ offset-=5; break; case 2: /* Extended RF Carriers Part 1 */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Extended RF Carriers Part 1"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Extended RF Carriers Part 1"); break; case 3: /* Fixed Part Capabilities */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Fixed Part Capabilities"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Fixed Part Capabilities"); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A12,tvb,offset,1,(pkt_afield->Tail[0])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A13,tvb,offset,1,(pkt_afield->Tail[0])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A14,tvb,offset,1,(pkt_afield->Tail[0])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A15,tvb,offset,1,(pkt_afield->Tail[0])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A12, tvb, offset, 1, (pkt_afield->Tail[0])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A13, tvb, offset, 1, (pkt_afield->Tail[0])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A14, tvb, offset, 1, (pkt_afield->Tail[0])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A15, tvb, offset, 1, (pkt_afield->Tail[0])); offset++; - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A16,tvb,offset,1,(pkt_afield->Tail[1])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A17,tvb,offset,1,(pkt_afield->Tail[1])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A18,tvb,offset,1,(pkt_afield->Tail[1])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A19,tvb,offset,1,(pkt_afield->Tail[1])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A20,tvb,offset,1,(pkt_afield->Tail[1])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A21,tvb,offset,1,(pkt_afield->Tail[1])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A22,tvb,offset,1,(pkt_afield->Tail[1])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A23,tvb,offset,1,(pkt_afield->Tail[1])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A16, tvb, offset, 1, (pkt_afield->Tail[1])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A17, tvb, offset, 1, (pkt_afield->Tail[1])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A18, tvb, offset, 1, (pkt_afield->Tail[1])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A19, tvb, offset, 1, (pkt_afield->Tail[1])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A20, tvb, offset, 1, (pkt_afield->Tail[1])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A21, tvb, offset, 1, (pkt_afield->Tail[1])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A22, tvb, offset, 1, (pkt_afield->Tail[1])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A23, tvb, offset, 1, (pkt_afield->Tail[1])); offset++; - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A24,tvb,offset,1,(pkt_afield->Tail[2])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A25,tvb,offset,1,(pkt_afield->Tail[2])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A26,tvb,offset,1,(pkt_afield->Tail[2])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A27,tvb,offset,1,(pkt_afield->Tail[2])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A28,tvb,offset,1,(pkt_afield->Tail[2])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A29,tvb,offset,1,(pkt_afield->Tail[2])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A30,tvb,offset,1,(pkt_afield->Tail[2])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Qt_3_A31,tvb,offset,1,(pkt_afield->Tail[2])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A24, tvb, offset, 1, (pkt_afield->Tail[2])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A25, tvb, offset, 1, (pkt_afield->Tail[2])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A26, tvb, offset, 1, (pkt_afield->Tail[2])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A27, tvb, offset, 1, (pkt_afield->Tail[2])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A28, tvb, offset, 1, (pkt_afield->Tail[2])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A29, tvb, offset, 1, (pkt_afield->Tail[2])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A30, tvb, offset, 1, (pkt_afield->Tail[2])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Qt_3_A31, tvb, offset, 1, (pkt_afield->Tail[2])); offset+=3; /* due to addition further down */ offset-=5; break; case 4: /* Extended Fixed Part Capabilities */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Extended Fixed Part Capabilities"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Extended Fixed Part Capabilities"); break; case 5: /* SARI List Contents */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"SARI List Contents"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "SARI List Contents"); break; case 6: /* Multi-Frame No. */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Multi-Frame No."); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Multi-Frame No."); break; case 7: /* Escape */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Escape"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Escape"); break; case 8: /* Obsolete */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Obsolete"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Obsolete"); break; case 9: /* Extended RF Carriers Part 2 */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Extended RF Carriers Part 2"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Extended RF Carriers Part 2"); break; case 10: /* Reserved(?) */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Reserved(?)"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Reserved(?)"); break; case 11: /* Transmit Information(?) */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Transmit Information(?)"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Transmit Information(?)"); break; case 12: /* Reserved */ case 13: case 14: case 15: - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Reserved"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Reserved"); break; } break; case 5: /* Escape */ break; case 6: /* Mt */ - if(check_col(pinfo->cinfo,COL_HPUX_SUBSYS)) - col_set_str(pinfo->cinfo,COL_HPUX_SUBSYS,"[Mt]"); + if(check_col(pinfo->cinfo, COL_HPUX_SUBSYS)) + col_set_str(pinfo->cinfo, COL_HPUX_SUBSYS, "[Mt]"); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Mt_Mh,tvb,offset,1,(pkt_afield->Tail[0])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Mt_Mh, tvb, offset, 1, (pkt_afield->Tail[0])); switch(pkt_afield->Tail[0]>>4) { case 0: /* Basic Connection Control */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Basic Connection Control"); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Mt_BasicConCtrl,tvb,offset,1,(pkt_afield->Tail[0])); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Basic Connection Control"); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Mt_BasicConCtrl, tvb, offset, 1, (pkt_afield->Tail[0])); offset++; if(((pkt_afield->Tail[0]&&0x0f)==6)||((pkt_afield->Tail[0]&&0x0f)==7)) { - proto_tree_add_uint_format(ATail,hf_dect_A_Tail_Mt_Mh,tvb,offset,5,0x2323,"hier sollten attribute stehn..."); + proto_tree_add_uint_format(ATail, hf_dect_A_Tail_Mt_Mh, tvb, offset, 5, 0x2323, "hier sollten attribute stehn..."); } else { - proto_tree_add_uint_format(ATail,hf_dect_A_Tail_Mt_Mh,tvb,offset,2,0x2323,"FMID:%.3x",(pkt_afield->Tail[1]<<4)|(pkt_afield->Tail[2]>>4)); + proto_tree_add_uint_format(ATail, hf_dect_A_Tail_Mt_Mh, tvb, offset, 2, 0x2323, "FMID:%.3x", (pkt_afield->Tail[1]<<4)|(pkt_afield->Tail[2]>>4)); offset++; - proto_tree_add_uint_format(ATail,hf_dect_A_Tail_Mt_Mh,tvb,offset,3,0x2323,"PMID:%.5x",((pkt_afield->Tail[2]&0x0f)<<16)|(pkt_afield->Tail[3]<<8)|pkt_afield->Tail[4]); + proto_tree_add_uint_format(ATail, hf_dect_A_Tail_Mt_Mh, tvb, offset, 3, 0x2323, "PMID:%.5x", ((pkt_afield->Tail[2]&0x0f)<<16)|(pkt_afield->Tail[3]<<8)|pkt_afield->Tail[4]); offset+=3; } @@ -1134,53 +1134,53 @@ dissect_decttype(gboolean type, struct dect_afield *pkt_afield, offset-=5; break; case 1: /* Advanced Connection Control */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Advanced Connection Control"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Advanced Connection Control"); break; case 2: /* MAC Layer Test Messages */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"MAC Layer Test Messages"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "MAC Layer Test Messages"); break; case 3: /* Quality Control */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Quality Control"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Quality Control"); break; case 4: /* Broadcast and Connectionless Services */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Broadcast and Connectionless Services"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Broadcast and Connectionless Services"); break; case 5: /* Encryption Control */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Encryption Control"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Encryption Control"); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Mt_Encr_Cmd1,tvb,offset,1,(pkt_afield->Tail[0])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Mt_Encr_Cmd2,tvb,offset,1,(pkt_afield->Tail[0])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Mt_Encr_Cmd1, tvb, offset, 1, (pkt_afield->Tail[0])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Mt_Encr_Cmd2, tvb, offset, 1, (pkt_afield->Tail[0])); offset++; - proto_tree_add_uint_format(ATail,hf_dect_A_Tail_Mt_Mh,tvb,offset,2,0x2323,"FMID:%.3x",(pkt_afield->Tail[1]<<4)|(pkt_afield->Tail[2]>>4)); + proto_tree_add_uint_format(ATail, hf_dect_A_Tail_Mt_Mh, tvb, offset, 2, 0x2323, "FMID:%.3x", (pkt_afield->Tail[1]<<4)|(pkt_afield->Tail[2]>>4)); offset++; - proto_tree_add_uint_format(ATail,hf_dect_A_Tail_Mt_Mh,tvb,offset,3,0x2323,"PMID:%.5x",((pkt_afield->Tail[2]&0x0f)<<16)|(pkt_afield->Tail[3]<<8)|pkt_afield->Tail[4]); + proto_tree_add_uint_format(ATail, hf_dect_A_Tail_Mt_Mh, tvb, offset, 3, 0x2323, "PMID:%.5x", ((pkt_afield->Tail[2]&0x0f)<<16)|(pkt_afield->Tail[3]<<8)|pkt_afield->Tail[4]); offset+=3; /* wegen addition weiter unten */ offset-=5; break; case 6: /* Tail for use with the first Transmission of a B-Field \"bearer request\" Message */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Tail for use with the first Transmission of a B-Field \"bearer request\" Message"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Tail for use with the first Transmission of a B-Field \"bearer request\" Message"); break; case 7: /* Escape */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Escape"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Escape"); break; case 8: /* TARI Message */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"TARI Message"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "TARI Message"); break; case 9: /* REP Connection Control */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"REP Connection Control"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "REP Connection Control"); break; case 10: /* Reserved */ case 11: @@ -1188,53 +1188,53 @@ dissect_decttype(gboolean type, struct dect_afield *pkt_afield, case 13: case 14: case 15: - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Reserved"); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Reserved"); break; } break; case 7: /* Pt */ - if(check_col(pinfo->cinfo,COL_HPUX_SUBSYS)) - col_set_str(pinfo->cinfo,COL_HPUX_SUBSYS,"[Pt]"); + if(check_col(pinfo->cinfo, COL_HPUX_SUBSYS)) + col_set_str(pinfo->cinfo, COL_HPUX_SUBSYS, "[Pt]"); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Pt_ExtFlag,tvb,offset,1,(pkt_afield->Tail[0])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Pt_SDU,tvb,offset,1,(pkt_afield->Tail[0])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Pt_ExtFlag, tvb, offset, 1, (pkt_afield->Tail[0])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Pt_SDU, tvb, offset, 1, (pkt_afield->Tail[0])); switch((pkt_afield->Tail[0]&0x70)>>4) { case 0: /* Zero Length Page */ case 1: /* Short Page */ if(((pkt_afield->Tail[0]&0x70)>>4)==0) { - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Zero Length Page: "); - proto_tree_add_uint_format(atailti,hf_dect_A_Tail_Pt_InfoType,tvb,offset,3,0x2323,"RFPI:xxxxx%.1x%.2x%.2x",(pkt_afield->Tail[0]&0x0f),pkt_afield->Tail[1],pkt_afield->Tail[2]); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Zero Length Page: "); + proto_tree_add_uint_format(atailti, hf_dect_A_Tail_Pt_InfoType, tvb, offset, 3, 0x2323, "RFPI:xxxxx%.1x%.2x%.2x", (pkt_afield->Tail[0]&0x0f), pkt_afield->Tail[1], pkt_afield->Tail[2]); offset+=3; - proto_tree_add_uint(ATail,hf_dect_A_Tail_Pt_InfoType,tvb,offset,1,(pkt_afield->Tail[3])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Pt_InfoType, tvb, offset, 1, (pkt_afield->Tail[3])); } else { - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Short Page: "); - proto_tree_add_uint_format(atailti,hf_dect_A_Tail_Pt_InfoType,tvb,offset,3,0x2323,"Bs Data:%.1x%.2x%.2x",(pkt_afield->Tail[0]&0x0f),pkt_afield->Tail[1],pkt_afield->Tail[2]); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Short Page: "); + proto_tree_add_uint_format(atailti, hf_dect_A_Tail_Pt_InfoType, tvb, offset, 3, 0x2323, "Bs Data:%.1x%.2x%.2x", (pkt_afield->Tail[0]&0x0f), pkt_afield->Tail[1], pkt_afield->Tail[2]); offset+=3; - proto_tree_add_uint(ATail,hf_dect_A_Tail_Pt_InfoType,tvb,offset,1,(pkt_afield->Tail[3])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Pt_InfoType, tvb, offset, 1, (pkt_afield->Tail[3])); } switch(pkt_afield->Tail[3]>>4) { case 0: /* Fill Bits */ - proto_tree_add_uint_format(ATail,hf_dect_A_Tail_Pt_Fill_Fillbits,tvb,offset,2,0x2323,"Fillbits:%.1x%.2x",pkt_afield->Tail[3]&0x0f,pkt_afield->Tail[4]); + proto_tree_add_uint_format(ATail, hf_dect_A_Tail_Pt_Fill_Fillbits, tvb, offset, 2, 0x2323, "Fillbits:%.1x%.2x", pkt_afield->Tail[3]&0x0f, pkt_afield->Tail[4]); offset+=2; break; case 1: /* Blind Full Slot Information for Circuit Mode Service */ case 7: /* Escape */ case 8: /* Dummy or connectionless Bearer Marker */ - proto_tree_add_uint_format(ATail,hf_dect_A_Tail_Pt_InfoType,tvb,offset,2,0x2323," Slot-Pairs:%s%s%s%s%s%s%s%s%s%s%s%s available", - (pkt_afield->Tail[3]&0x08)?" 0/12":"",(pkt_afield->Tail[3]&0x04)?" 1/13":"",(pkt_afield->Tail[3]&0x02)?" 2/14":"", - (pkt_afield->Tail[3]&0x01)?" 3/15":"",(pkt_afield->Tail[4]&0x80)?" 4/16":"",(pkt_afield->Tail[4]&0x40)?" 5/17":"", - (pkt_afield->Tail[4]&0x20)?" 6/18":"",(pkt_afield->Tail[4]&0x10)?" 7/19":"",(pkt_afield->Tail[4]&0x08)?" 8/20":"", - (pkt_afield->Tail[4]&0x04)?" 9/21":"",(pkt_afield->Tail[4]&0x02)?" 10/22":"",(pkt_afield->Tail[4]&0x01)?" 11/23":""); + proto_tree_add_uint_format(ATail, hf_dect_A_Tail_Pt_InfoType, tvb, offset, 2, 0x2323, " Slot-Pairs:%s%s%s%s%s%s%s%s%s%s%s%s available", + (pkt_afield->Tail[3]&0x08)?" 0/12":"", (pkt_afield->Tail[3]&0x04)?" 1/13":"", (pkt_afield->Tail[3]&0x02)?" 2/14":"", + (pkt_afield->Tail[3]&0x01)?" 3/15":"", (pkt_afield->Tail[4]&0x80)?" 4/16":"", (pkt_afield->Tail[4]&0x40)?" 5/17":"", + (pkt_afield->Tail[4]&0x20)?" 6/18":"", (pkt_afield->Tail[4]&0x10)?" 7/19":"", (pkt_afield->Tail[4]&0x08)?" 8/20":"", + (pkt_afield->Tail[4]&0x04)?" 9/21":"", (pkt_afield->Tail[4]&0x02)?" 10/22":"", (pkt_afield->Tail[4]&0x01)?" 11/23":""); offset+=2; break; @@ -1243,11 +1243,11 @@ dissect_decttype(gboolean type, struct dect_afield *pkt_afield, case 4: /* Good RFP Bearer */ case 5: /* Dummy or connectionless Bearer Position */ case 12: /* Connectionless Bearer Position */ - proto_tree_add_uint(ATail,hf_dect_A_Tail_Pt_Bearer_Sn,tvb,offset,1,(pkt_afield->Tail[3])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Pt_Bearer_Sn, tvb, offset, 1, (pkt_afield->Tail[3])); offset++; - proto_tree_add_uint(ATail,hf_dect_A_Tail_Pt_Bearer_Sp,tvb,offset,1,(pkt_afield->Tail[4])); - proto_tree_add_uint(ATail,hf_dect_A_Tail_Pt_Bearer_Cn,tvb,offset,1,(pkt_afield->Tail[4])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Pt_Bearer_Sp, tvb, offset, 1, (pkt_afield->Tail[4])); + proto_tree_add_uint(ATail, hf_dect_A_Tail_Pt_Bearer_Cn, tvb, offset, 1, (pkt_afield->Tail[4])); offset++; break; case 6: /* Extended Modulation Types */ @@ -1277,28 +1277,28 @@ dissect_decttype(gboolean type, struct dect_afield *pkt_afield, offset-=5; break; case 2: /* Full Page */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Full Page: "); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Full Page: "); break; case 3: /* MAC Resume Page */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"MAC Resume Page: "); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "MAC Resume Page: "); break; case 4: /* Not the Last 36 Bits of a Long Page */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"Not the Last 36 Bits: "); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "Not the Last 36 Bits: "); break; case 5: /* The First 36 Bits of a Long Page */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"The First 36 Bits: "); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "The First 36 Bits: "); break; case 6: /* The Last 36 Bits of a Long Page */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"The Last 36 Bits: "); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "The Last 36 Bits: "); break; case 7: /* All of a Long Page */ - if(check_col(pinfo->cinfo,COL_DEF_NET_SRC)) - col_append_str(pinfo->cinfo,COL_DEF_NET_SRC,"All of a Long Page: "); + if(check_col(pinfo->cinfo, COL_DEF_NET_SRC)) + col_append_str(pinfo->cinfo, COL_DEF_NET_SRC, "All of a Long Page: "); break; } break; @@ -1307,19 +1307,19 @@ dissect_decttype(gboolean type, struct dect_afield *pkt_afield, /* R-CRC */ - memcpy(rcrcdat,pkt_ptr,6); + memcpy(rcrcdat, pkt_ptr, 6); rcrcdat[6]=0; rcrcdat[7]=0; rcrc=calc_rcrc(rcrcdat); if(rcrc!=pkt_afield->RCRC) - proto_tree_add_uint_format(afieldti,hf_dect_A_RCRC,tvb,offset,2,0,"R-CRC Error (Calc:%.4x,Recv:%.4x)",rcrc,pkt_afield->RCRC); + proto_tree_add_uint_format(afieldti, hf_dect_A_RCRC, tvb, offset, 2, 0, "R-CRC Error (Calc:%.4x, Recv:%.4x)", rcrc, pkt_afield->RCRC); else - proto_tree_add_uint_format(afieldti,hf_dect_A_RCRC,tvb,offset,2,1,"R-CRC Match (Calc:%.4x,Recv:%.4x)",rcrc,pkt_afield->RCRC); + proto_tree_add_uint_format(afieldti, hf_dect_A_RCRC, tvb, offset, 2, 1, "R-CRC Match (Calc:%.4x, Recv:%.4x)", rcrc, pkt_afield->RCRC); offset+=2; - /* **************** B-Field ************************************/ - offset=dissect_bfield(type,pkt_afield,pkt_bfield,pinfo,pkt_ptr,tvb,ti,DectTree,offset); + /* **************** B-Field ************************************/ + offset=dissect_bfield(type, pkt_afield, pkt_bfield, pinfo, pkt_ptr, tvb, ti, DectTree, offset); } static void @@ -1331,7 +1331,7 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) struct dect_afield pkt_afield; struct dect_bfield pkt_bfield; - /* Packet pointer holen */ + /* Packetpointer */ pkt_len=tvb_length(tvb); if(pkt_len>140) @@ -1339,35 +1339,35 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(pkt_len<13) { - if(check_col(pinfo->cinfo,COL_PROTOCOL)) + if(check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo,COL_PROTOCOL,"No Data"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "No Data"); } return; } - pkt_ptr=tvb_get_ptr(tvb,11,pkt_len-11); + pkt_ptr=tvb_get_ptr(tvb, 11, pkt_len-11); - /* fill A-Field */ + /* fill A-Field */ pkt_afield.Header=pkt_ptr[0]; - memcpy((char*)(&(pkt_afield.Tail)),(char*)(pkt_ptr+1),5); + memcpy((char*)(&(pkt_afield.Tail)), (char*)(pkt_ptr+1), 5); pkt_afield.RCRC=(((guint16)pkt_ptr[6])<<8)|pkt_ptr[7]; - /* fill B-Field */ + /* fill B-Field */ if(pkt_len>13) - memcpy((char*)(&(pkt_bfield.Data)),(char*)(pkt_ptr+8),pkt_len-5-8); + memcpy((char*)(&(pkt_bfield.Data)), (char*)(pkt_ptr+8), pkt_len-5-8); else - memset((char*)(&(pkt_bfield.Data)),0,128); + memset((char*)(&(pkt_bfield.Data)), 0, 128); pkt_bfield.Length=pkt_len-13; - if(check_col(pinfo->cinfo,COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL,"DECT"); + if(check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT"); /* Clear out stuff in the info column */ - if(check_col(pinfo->cinfo,COL_INFO)) + if(check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo,COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); } if(tree) { @@ -1376,55 +1376,55 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *DectTree =NULL; gint offset =0; - ti=proto_tree_add_item(tree,proto_dect,tvb,0,-1,FALSE); + ti=proto_tree_add_item(tree, proto_dect, tvb, 0, -1, FALSE); - DectTree=proto_item_add_subtree(ti,ett_dect); - proto_tree_add_item(DectTree,hf_dect_transceivermode,tvb,offset,1,FALSE); + DectTree=proto_item_add_subtree(ti, ett_dect); + proto_tree_add_item(DectTree, hf_dect_transceivermode, tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(DectTree,hf_dect_channel,tvb,offset,1,FALSE); + proto_tree_add_item(DectTree, hf_dect_channel, tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(DectTree,hf_dect_slot,tvb,offset,2,FALSE); + proto_tree_add_item(DectTree, hf_dect_slot, tvb, offset, 2, FALSE); offset+=2; - proto_tree_add_item(DectTree,hf_dect_framenumber,tvb,offset,1,FALSE); + proto_tree_add_item(DectTree, hf_dect_framenumber, tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(DectTree,hf_dect_rssi,tvb,offset,1,FALSE); + proto_tree_add_item(DectTree, hf_dect_rssi, tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(DectTree,hf_dect_preamble,tvb,offset,3,FALSE); + proto_tree_add_item(DectTree, hf_dect_preamble, tvb, offset, 3, FALSE); offset+=3; - typeti=proto_tree_add_item(DectTree,hf_dect_type,tvb,offset,2,FALSE); + typeti=proto_tree_add_item(DectTree, hf_dect_type, tvb, offset, 2, FALSE); type=tvb_get_ntohs(tvb, offset); offset+=2; switch(type) { case 0x1675: - if(check_col(pinfo->cinfo,COL_PROTOCOL)) + if(check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo,COL_PROTOCOL,"DECT PP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT PP"); } - proto_item_append_text(typeti," Phone Packet"); - dissect_decttype(0,&pkt_afield,&pkt_bfield,pinfo,pkt_ptr,tvb,ti,DectTree); + proto_item_append_text(typeti, " Phone Packet"); + dissect_decttype(0, &pkt_afield, &pkt_bfield, pinfo, pkt_ptr, tvb, ti, DectTree); break; case 0xe98a: - if(check_col(pinfo->cinfo,COL_PROTOCOL)) + if(check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo,COL_PROTOCOL,"DECT RFP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT RFP"); } - proto_item_append_text(typeti," Station Packet"); - dissect_decttype(1,&pkt_afield,&pkt_bfield,pinfo,pkt_ptr,tvb,ti,DectTree); + proto_item_append_text(typeti, " Station Packet"); + dissect_decttype(1, &pkt_afield, &pkt_bfield, pinfo, pkt_ptr, tvb, ti, DectTree); break; default: - if(check_col(pinfo->cinfo,COL_PROTOCOL)) + if(check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo,COL_PROTOCOL,"DECT Unk"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT Unk"); } - proto_item_append_text(typeti," Unknown Packet"); + proto_item_append_text(typeti, " Unknown Packet"); break; } } @@ -1436,265 +1436,265 @@ proto_register_dect(void) static hf_register_info hf[]= { { &hf_dect_transceivermode, - {"Tranceiver-Mode","dect.tranceivermode",FT_UINT8,BASE_HEX,VALS(tranceiver_mode), - 0x0,NULL,HFILL}}, + {"Tranceiver-Mode", "dect.tranceivermode", FT_UINT8, BASE_HEX, VALS(tranceiver_mode), + 0x0, NULL, HFILL}}, { &hf_dect_channel, - {"Channel","dect.channel",FT_UINT8,BASE_DEC,NULL, - 0x0,NULL,HFILL}}, + {"Channel", "dect.channel", FT_UINT8, BASE_DEC, NULL, + 0x0, NULL, HFILL}}, { &hf_dect_framenumber, - {"Frame#","dect.framenumber",FT_UINT16,BASE_DEC,NULL, - 0x0,NULL,HFILL}}, + {"Frame#", "dect.framenumber", FT_UINT16, BASE_DEC, NULL, + 0x0, NULL, HFILL}}, { &hf_dect_rssi, - {"RSSI","dect.rssi",FT_UINT8,BASE_DEC,NULL, - 0x0,NULL,HFILL}}, + {"RSSI", "dect.rssi", FT_UINT8, BASE_DEC, NULL, + 0x0, NULL, HFILL}}, { &hf_dect_slot, - {"Slot","dect.slot",FT_UINT16,BASE_DEC,NULL, - 0x0,NULL,HFILL}}, + {"Slot", "dect.slot", FT_UINT16, BASE_DEC, NULL, + 0x0, NULL, HFILL}}, { &hf_dect_preamble, - {"Preamble","dect.preamble",FT_BYTES,BASE_NONE,NULL, - 0x0,NULL,HFILL}}, + {"Preamble", "dect.preamble", FT_BYTES, BASE_NONE, NULL, + 0x0, NULL, HFILL}}, { &hf_dect_type, - {"Packet-Type","dect.type",FT_BYTES,BASE_NONE,NULL, - 0x0,NULL,HFILL}}, + {"Packet-Type", "dect.type", FT_BYTES, BASE_NONE, NULL, + 0x0, NULL, HFILL}}, /* **************** A-Field ******************************/ - /* ***** Header ***** */ + /* ***** Header ***** */ { &hf_dect_A, - {"A-Field","dect.afield", FT_UINT8, BASE_DEC, NULL, - 0x0,NULL, HFILL}}, + {"A-Field", "dect.afield", FT_UINT8, BASE_DEC, NULL, + 0x0, NULL, HFILL}}, { &hf_dect_A_Head, - {"A-Field Header","dect.afield.head",FT_UINT8,BASE_DEC, NULL, - 0x0,NULL,HFILL}}, + {"A-Field Header", "dect.afield.head", FT_UINT8, BASE_DEC, NULL, + 0x0, NULL, HFILL}}, { &hf_dect_A_Head_TA, - {"TA","dect.afield.head.TA",FT_UINT8,BASE_DEC,VALS(TA_vals), - 0xE0,NULL,HFILL}}, + {"TA", "dect.afield.head.TA", FT_UINT8, BASE_DEC, VALS(TA_vals), + 0xE0, NULL, HFILL}}, { &hf_dect_A_Head_Q1, - {"Q1","dect.afield.head.Q1",FT_UINT8,BASE_DEC,NULL, - 0x10,NULL,HFILL}}, + {"Q1", "dect.afield.head.Q1", FT_UINT8, BASE_DEC, NULL, + 0x10, NULL, HFILL}}, { &hf_dect_A_Head_BA, - {"BA","dect.afield.head.BA",FT_UINT8,BASE_DEC,VALS(BA_vals), - 0x0E,NULL,HFILL}}, + {"BA", "dect.afield.head.BA", FT_UINT8, BASE_DEC, VALS(BA_vals), + 0x0E, NULL, HFILL}}, { &hf_dect_A_Head_Q2, - {"Q2","dect.afield.head.Q2",FT_UINT8,BASE_DEC,NULL, - 0x01,NULL,HFILL}}, + {"Q2", "dect.afield.head.Q2", FT_UINT8, BASE_DEC, NULL, + 0x01, NULL, HFILL}}, - /* ***** Tail ***** */ + /* ***** Tail ***** */ { &hf_dect_A_Tail, - {"A-Field Tail","dect.afield.tail",FT_UINT8,BASE_DEC, NULL, - 0x0,NULL,HFILL}}, + {"A-Field Tail", "dect.afield.tail", FT_UINT8, BASE_DEC, NULL, + 0x0, NULL, HFILL}}, /* Nt */ { &hf_dect_A_Tail_Nt, - {"A-Field Header","dect.afield.tail.Nt",FT_UINT8,BASE_DEC, NULL, - 0x0,NULL,HFILL}}, + {"A-Field Header", "dect.afield.tail.Nt", FT_UINT8, BASE_DEC, NULL, + 0x0, NULL, HFILL}}, /* Qt */ { &hf_dect_A_Tail_Qt_Qh, - {"Qh","dect.afield.tail.Qt.Qh",FT_UINT8,BASE_DEC,VALS(QTHead_vals), - 0xF0,NULL,HFILL}}, + {"Qh", "dect.afield.tail.Qt.Qh", FT_UINT8, BASE_DEC, VALS(QTHead_vals), + 0xF0, NULL, HFILL}}, /* Qt Static System Information */ /* Byte 0 */ { &hf_dect_A_Tail_Qt_0_Nr, - {"NR","dect.afield.tail.Qt.NR",FT_UINT8,BASE_DEC,VALS(QTNormalReverse_vals), - 0x10,NULL,HFILL}}, + {"NR", "dect.afield.tail.Qt.NR", FT_UINT8, BASE_DEC, VALS(QTNormalReverse_vals), + 0x10, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_0_Sn, - {"SN","dect.afield.tail.Qt.SN",FT_UINT8,BASE_DEC,VALS(QTSlotNumber_vals), - 0x0F,NULL,HFILL}}, + {"SN", "dect.afield.tail.Qt.SN", FT_UINT8, BASE_DEC, VALS(QTSlotNumber_vals), + 0x0F, NULL, HFILL}}, /* Byte 1 */ { &hf_dect_A_Tail_Qt_0_Sp, - {"SP","dect.afield.tail.Qt.SP",FT_UINT8,BASE_DEC,VALS(QTStartPosition_vals), - 0xC0,NULL,HFILL}}, + {"SP", "dect.afield.tail.Qt.SP", FT_UINT8, BASE_DEC, VALS(QTStartPosition_vals), + 0xC0, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_0_Esc, - {"Esc","dect.afield.tail.Qt.Esc",FT_UINT8,BASE_DEC,VALS(QTEscape_vals), - 0x20,NULL,HFILL}}, + {"Esc", "dect.afield.tail.Qt.Esc", FT_UINT8, BASE_DEC, VALS(QTEscape_vals), + 0x20, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_0_Txs, - {"Txs","dect.afield.tail.Qt.Txs",FT_UINT8,BASE_DEC,VALS(QTTranceiver_vals), - 0x18,NULL,HFILL}}, + {"Txs", "dect.afield.tail.Qt.Txs", FT_UINT8, BASE_DEC, VALS(QTTranceiver_vals), + 0x18, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_0_Mc, - {"Mc","dect.afield.tail.Qt.Mc",FT_UINT8,BASE_DEC,VALS(QTExtendedCarrier_vals), - 0x04,NULL,HFILL}}, + {"Mc", "dect.afield.tail.Qt.Mc", FT_UINT8, BASE_DEC, VALS(QTExtendedCarrier_vals), + 0x04, NULL, HFILL}}, /* Byte 3 */ { &hf_dect_A_Tail_Qt_0_Spr1, - {"Spr","dect.afield.tail.Qt.Spr1",FT_UINT8,BASE_DEC,VALS(QTSpr_vals), - 0xC0,NULL,HFILL}}, + {"Spr", "dect.afield.tail.Qt.Spr1", FT_UINT8, BASE_DEC, VALS(QTSpr_vals), + 0xC0, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_0_Cn, - {"CN","dect.afield.tail.Qt.CN",FT_UINT8,BASE_DEC,VALS(QTCarrierNumber_vals), - 0x3F,NULL,HFILL}}, + {"CN", "dect.afield.tail.Qt.CN", FT_UINT8, BASE_DEC, VALS(QTCarrierNumber_vals), + 0x3F, NULL, HFILL}}, /* Byte 4 */ { &hf_dect_A_Tail_Qt_0_Spr2, - {"Spr","dect.afield.tail.Qt.Spr2",FT_UINT8,BASE_DEC,VALS(QTSpr_vals), - 0xC0,NULL,HFILL}}, + {"Spr", "dect.afield.tail.Qt.Spr2", FT_UINT8, BASE_DEC, VALS(QTSpr_vals), + 0xC0, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_0_PSCN, - {"PSCN","dect.afield.tail.Qt.PSCN",FT_UINT8,BASE_DEC,VALS(QTScanCarrierNum_vals), - 0x3F,NULL,HFILL}}, + {"PSCN", "dect.afield.tail.Qt.PSCN", FT_UINT8, BASE_DEC, VALS(QTScanCarrierNum_vals), + 0x3F, NULL, HFILL}}, /* Qt Fixed Part Capabilities */ { &hf_dect_A_Tail_Qt_3_A12, - {"A12","dect.afield.tail.Qt.Fp.A12",FT_UINT8,BASE_DEC,VALS(Qt_A12_vals), - 0x08,NULL,HFILL}}, + {"A12", "dect.afield.tail.Qt.Fp.A12", FT_UINT8, BASE_DEC, VALS(Qt_A12_vals), + 0x08, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A13, - {"A13","dect.afield.tail.Qt.Fp.A13",FT_UINT8,BASE_DEC,VALS(Qt_A13_vals), - 0x04,NULL,HFILL}}, + {"A13", "dect.afield.tail.Qt.Fp.A13", FT_UINT8, BASE_DEC, VALS(Qt_A13_vals), + 0x04, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A14, - {"A14","dect.afield.tail.Qt.Fp.A14",FT_UINT8,BASE_DEC,VALS(Qt_A14_vals), - 0x02,NULL,HFILL}}, + {"A14", "dect.afield.tail.Qt.Fp.A14", FT_UINT8, BASE_DEC, VALS(Qt_A14_vals), + 0x02, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A15, - {"A15","dect.afield.tail.Qt.Fp.A15",FT_UINT8,BASE_DEC,VALS(Qt_A15_vals), - 0x01,NULL,HFILL}}, + {"A15", "dect.afield.tail.Qt.Fp.A15", FT_UINT8, BASE_DEC, VALS(Qt_A15_vals), + 0x01, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A16, - {"A16","dect.afield.tail.Qt.Fp.A16",FT_UINT8,BASE_DEC,VALS(Qt_A16_vals), - 0x80,NULL,HFILL}}, + {"A16", "dect.afield.tail.Qt.Fp.A16", FT_UINT8, BASE_DEC, VALS(Qt_A16_vals), + 0x80, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A17, - {"A17","dect.afield.tail.Qt.Fp.A17",FT_UINT8,BASE_DEC,VALS(Qt_A17_vals), - 0x40,NULL,HFILL}}, + {"A17", "dect.afield.tail.Qt.Fp.A17", FT_UINT8, BASE_DEC, VALS(Qt_A17_vals), + 0x40, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A18, - {"A18","dect.afield.tail.Qt.Fp.A18",FT_UINT8,BASE_DEC,VALS(Qt_A18_vals), - 0x20,NULL,HFILL}}, + {"A18", "dect.afield.tail.Qt.Fp.A18", FT_UINT8, BASE_DEC, VALS(Qt_A18_vals), + 0x20, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A19, - {"A19","dect.afield.tail.Qt.Fp.A19",FT_UINT8,BASE_DEC,VALS(Qt_A19_vals), - 0x10,NULL,HFILL}}, + {"A19", "dect.afield.tail.Qt.Fp.A19", FT_UINT8, BASE_DEC, VALS(Qt_A19_vals), + 0x10, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A20, - {"A20","dect.afield.tail.Qt.Fp.A20",FT_UINT8,BASE_DEC,VALS(Qt_A20_vals), - 0x08,NULL,HFILL}}, + {"A20", "dect.afield.tail.Qt.Fp.A20", FT_UINT8, BASE_DEC, VALS(Qt_A20_vals), + 0x08, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A21, - {"A21","dect.afield.tail.Qt.Fp.A21",FT_UINT8,BASE_DEC,VALS(Qt_A21_vals), - 0x04,NULL,HFILL}}, + {"A21", "dect.afield.tail.Qt.Fp.A21", FT_UINT8, BASE_DEC, VALS(Qt_A21_vals), + 0x04, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A22, - {"A22","dect.afield.tail.Qt.Fp.A22",FT_UINT8,BASE_DEC,VALS(Qt_A22_vals), - 0x02,NULL,HFILL}}, + {"A22", "dect.afield.tail.Qt.Fp.A22", FT_UINT8, BASE_DEC, VALS(Qt_A22_vals), + 0x02, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A23, - {"A23","dect.afield.tail.Qt.Fp.A23",FT_UINT8,BASE_DEC,VALS(Qt_A23_vals), - 0x01,NULL,HFILL}}, + {"A23", "dect.afield.tail.Qt.Fp.A23", FT_UINT8, BASE_DEC, VALS(Qt_A23_vals), + 0x01, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A24, - {"A24","dect.afield.tail.Qt.Fp.A24",FT_UINT8,BASE_DEC,VALS(Qt_A24_vals), - 0x80,NULL,HFILL}}, + {"A24", "dect.afield.tail.Qt.Fp.A24", FT_UINT8, BASE_DEC, VALS(Qt_A24_vals), + 0x80, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A25, - {"A25","dect.afield.tail.Qt.Fp.A25",FT_UINT8,BASE_DEC,VALS(Qt_A25_vals), - 0x40,NULL,HFILL}}, + {"A25", "dect.afield.tail.Qt.Fp.A25", FT_UINT8, BASE_DEC, VALS(Qt_A25_vals), + 0x40, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A26, - {"A26","dect.afield.tail.Qt.Fp.A26",FT_UINT8,BASE_DEC,VALS(Qt_A26_vals), - 0x20,NULL,HFILL}}, + {"A26", "dect.afield.tail.Qt.Fp.A26", FT_UINT8, BASE_DEC, VALS(Qt_A26_vals), + 0x20, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A27, - {"A27","dect.afield.tail.Qt.Fp.A27",FT_UINT8,BASE_DEC,VALS(Qt_A27_vals), - 0x10,NULL,HFILL}}, + {"A27", "dect.afield.tail.Qt.Fp.A27", FT_UINT8, BASE_DEC, VALS(Qt_A27_vals), + 0x10, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A28, - {"A28","dect.afield.tail.Qt.Fp.A28",FT_UINT8,BASE_DEC,VALS(Qt_A28_vals), - 0x08,NULL,HFILL}}, + {"A28", "dect.afield.tail.Qt.Fp.A28", FT_UINT8, BASE_DEC, VALS(Qt_A28_vals), + 0x08, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A29, - {"A29","dect.afield.tail.Qt.Fp.A29",FT_UINT8,BASE_DEC,VALS(Qt_A29_vals), - 0x04,NULL,HFILL}}, + {"A29", "dect.afield.tail.Qt.Fp.A29", FT_UINT8, BASE_DEC, VALS(Qt_A29_vals), + 0x04, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A30, - {"A30","dect.afield.tail.Qt.Fp.A30",FT_UINT8,BASE_DEC,VALS(Qt_A30_vals), - 0x02,NULL,HFILL}}, + {"A30", "dect.afield.tail.Qt.Fp.A30", FT_UINT8, BASE_DEC, VALS(Qt_A30_vals), + 0x02, NULL, HFILL}}, { &hf_dect_A_Tail_Qt_3_A31, - {"A31","dect.afield.tail.Qt.Fp.A31",FT_UINT8,BASE_DEC,VALS(Qt_A31_vals), - 0x01,NULL,HFILL}}, + {"A31", "dect.afield.tail.Qt.Fp.A31", FT_UINT8, BASE_DEC, VALS(Qt_A31_vals), + 0x01, NULL, HFILL}}, /* Mt */ { &hf_dect_A_Tail_Mt_Mh, - {"Mh","dect.afield.tail.Mt.Mh",FT_UINT8,BASE_DEC,VALS(MTHead_vals), - 0xF0,NULL,HFILL}}, + {"Mh", "dect.afield.tail.Mt.Mh", FT_UINT8, BASE_DEC, VALS(MTHead_vals), + 0xF0, NULL, HFILL}}, /* Mt Basic Connection Control */ { &hf_dect_A_Tail_Mt_BasicConCtrl, - {"Cmd","dect.afield.tail.Mt.BasicConCtrl",FT_UINT8,BASE_DEC,VALS(MTBasicConCtrl_vals), - 0x0F,NULL,HFILL}}, + {"Cmd", "dect.afield.tail.Mt.BasicConCtrl", FT_UINT8, BASE_DEC, VALS(MTBasicConCtrl_vals), + 0x0F, NULL, HFILL}}, /* Mt Encryption Control */ { &hf_dect_A_Tail_Mt_Encr_Cmd1, - {"Cmd1","dect.afield.tail.Mt.Encr.Cmd1",FT_UINT8,BASE_DEC,VALS(MTEncrCmd1_vals), - 0x0C,NULL,HFILL}}, + {"Cmd1", "dect.afield.tail.Mt.Encr.Cmd1", FT_UINT8, BASE_DEC, VALS(MTEncrCmd1_vals), + 0x0C, NULL, HFILL}}, { &hf_dect_A_Tail_Mt_Encr_Cmd2, - {"Cmd2","dect.afield.tail.Mt.Encr.Cmd2",FT_UINT8,BASE_DEC,VALS(MTEncrCmd2_vals), + {"Cmd2", "dect.afield.tail.Mt.Encr.Cmd2", FT_UINT8, BASE_DEC, VALS(MTEncrCmd2_vals), 0x03, NULL, HFILL}}, /* Pt */ { &hf_dect_A_Tail_Pt_ExtFlag, - {"ExtFlag","dect.afield.tail.Pt.ExtFlag",FT_UINT8,BASE_DEC,VALS(PTExtFlag_vals), + {"ExtFlag", "dect.afield.tail.Pt.ExtFlag", FT_UINT8, BASE_DEC, VALS(PTExtFlag_vals), 0x80, NULL, HFILL}}, { &hf_dect_A_Tail_Pt_SDU, - {"SDU","dect.afield.tail.Pt.SDU",FT_UINT8,BASE_DEC,VALS(PTSDU_vals), + {"SDU", "dect.afield.tail.Pt.SDU", FT_UINT8, BASE_DEC, VALS(PTSDU_vals), 0x70, NULL, HFILL}}, { &hf_dect_A_Tail_Pt_InfoType, - {"InfoType","dect.afield.tail.Pt.InfoType",FT_UINT8,BASE_DEC,VALS(PTInfoType_vals), + {"InfoType", "dect.afield.tail.Pt.InfoType", FT_UINT8, BASE_DEC, VALS(PTInfoType_vals), 0xF0, NULL, HFILL}}, { &hf_dect_A_Tail_Pt_Fill_Fillbits, - {"FillBits","dect.afield.tail.Pt.InfoType.FillBits",FT_UINT8,BASE_DEC,NULL, + {"FillBits", "dect.afield.tail.Pt.InfoType.FillBits", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, { &hf_dect_A_Tail_Pt_Bearer_Sn, - {"SN","dect.afield.tail.Pt.SN",FT_UINT8,BASE_DEC,VALS(QTSlotNumber_vals), - 0x0F,NULL,HFILL}}, + {"SN", "dect.afield.tail.Pt.SN", FT_UINT8, BASE_DEC, VALS(QTSlotNumber_vals), + 0x0F, NULL, HFILL}}, { &hf_dect_A_Tail_Pt_Bearer_Sp, - {"SP","dect.afield.tail.Pt.SP",FT_UINT8,BASE_DEC,VALS(QTStartPosition_vals), + {"SP", "dect.afield.tail.Pt.SP", FT_UINT8, BASE_DEC, VALS(QTStartPosition_vals), 0xC0, NULL, HFILL}}, { &hf_dect_A_Tail_Pt_Bearer_Cn, - {"CN", "dect.afield.tail.Pt.CN", FT_UINT8,BASE_DEC,VALS(QTCarrierNumber_vals), + {"CN", "dect.afield.tail.Pt.CN", FT_UINT8, BASE_DEC, VALS(QTCarrierNumber_vals), 0x3F, NULL, HFILL}}, - /* ***** R-CRC ***** */ + /* ***** R-CRC ***** */ { &hf_dect_A_RCRC, {"A-Field R-CRC", "dect.afield.rcrc", FT_UINT8, BASE_DEC, NULL, - 0x0, NULL, HFILL}}, + 0x0, NULL, HFILL}}, /* ***************** B-Field *************************** */ { &hf_dect_B, {"B-Field", "dect.bfield", FT_UINT8, BASE_DEC, - NULL, 0x0,NULL, HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_dect_B_Data, - {"B-Field","dect.bfield.data", FT_UINT8, BASE_DEC, NULL, + {"B-Field", "dect.bfield.data", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - /* ***** X-CRC ***** */ + /* ***** X-CRC ***** */ { &hf_dect_B_XCRC, - {"B-Field X-CRC", "dect.bfield.xcrc", FT_UINT8,BASE_DEC, NULL, + {"B-Field X-CRC", "dect.bfield.xcrc", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}} }; @@ -1710,9 +1710,9 @@ proto_register_dect(void) &ett_bfield }; - proto_dect=proto_register_protocol("DECT Protocol","DECT","dect"); - proto_register_field_array(proto_dect,hf,array_length(hf)); - proto_register_subtree_array(ett,array_length(ett)); + proto_dect=proto_register_protocol("DECT Protocol", "DECT", "dect"); + proto_register_field_array(proto_dect, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); } void @@ -1720,7 +1720,7 @@ proto_reg_handoff_dect(void) { dissector_handle_t dect_handle; - dect_handle = create_dissector_handle(dissect_dect,proto_dect); - dissector_add("ethertype",ETHERTYPE_DECT ,dect_handle); + dect_handle = create_dissector_handle(dissect_dect, proto_dect); + dissector_add("ethertype", ETHERTYPE_DECT , dect_handle); } -- cgit v1.2.1