/* specification: RFC 2205 */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "netdissect-stdinc.h"
* out-of-band, or negotiated by other RSVP objects.
*/
struct rsvp_obj_integrity_t {
- uint8_t flags;
- uint8_t res;
- uint8_t key_id[6];
- uint8_t sequence[8];
- uint8_t digest[16];
+ nd_uint8_t flags;
+ nd_uint8_t res;
+ nd_byte key_id[6];
+ nd_byte sequence[8];
+ nd_byte digest[16];
};
static const struct tok rsvp_obj_integrity_flag_values[] = {
};
struct rsvp_obj_frr_t {
- uint8_t setup_prio;
- uint8_t hold_prio;
- uint8_t hop_limit;
- uint8_t flags;
- uint8_t bandwidth[4];
- uint8_t include_any[4];
- uint8_t exclude_any[4];
- uint8_t include_all[4];
+ nd_uint8_t setup_prio;
+ nd_uint8_t hold_prio;
+ nd_uint8_t hop_limit;
+ nd_uint8_t flags;
+ nd_float bandwidth;
+ nd_uint32_t include_any;
+ nd_uint32_t exclude_any;
+ nd_uint32_t include_all;
};
{ 6, "CT/setup priority and CT/holding priority do not form a configured TE-Class" },
{ 7, "Inconsistency between signaled PSC and signaled CT" },
{ 8, "Inconsistency between signaled PHBs and signaled CT" },
- { 0, NULL}
+ { 0, NULL}
};
/* rfc3473 / rfc 3471 */
const u_char *tptr, u_int obj_tlen)
{
u_int parameter_id,parameter_length;
- union {
- float f;
- uint32_t i;
- } bw;
ND_ICHECK_U(obj_tlen, <, 4);
parameter_id = GET_U_1(tptr);
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
if (parameter_length == 4) {
- bw.i = GET_BE_U_4(tptr + 4);
- ND_PRINT("\n\t\tPath b/w estimate: %.10g Mbps", bw.f / 125000);
+ ND_PRINT("\n\t\tPath b/w estimate: %.10g Mbps",
+ GET_BE_F_4(tptr + 4) / 125000);
}
break;
*/
if (parameter_length == 20) {
- bw.i = GET_BE_U_4(tptr + 4);
- ND_PRINT("\n\t\tToken Bucket Rate: %.10g Mbps", bw.f / 125000);
- bw.i = GET_BE_U_4(tptr + 8);
- ND_PRINT("\n\t\tToken Bucket Size: %.10g bytes", bw.f);
- bw.i = GET_BE_U_4(tptr + 12);
- ND_PRINT("\n\t\tPeak Data Rate: %.10g Mbps", bw.f / 125000);
+ ND_PRINT("\n\t\tToken Bucket Rate: %.10g Mbps",
+ GET_BE_F_4(tptr + 4) / 125000);
+ ND_PRINT("\n\t\tToken Bucket Size: %.10g bytes",
+ GET_BE_F_4(tptr + 8));
+ ND_PRINT("\n\t\tPeak Data Rate: %.10g Mbps",
+ GET_BE_F_4(tptr + 12) / 125000);
ND_PRINT("\n\t\tMinimum Policed Unit: %u bytes",
GET_BE_U_4(tptr + 16));
ND_PRINT("\n\t\tMaximum Packet Size: %u bytes",
*/
if (parameter_length == 8) {
- bw.i = GET_BE_U_4(tptr + 4);
- ND_PRINT("\n\t\tRate: %.10g Mbps", bw.f / 125000);
+ ND_PRINT("\n\t\tRate: %.10g Mbps", GET_BE_F_4(tptr + 4) / 125000);
ND_PRINT("\n\t\tSlack Term: %u", GET_BE_U_4(tptr + 8));
}
break;
u_short rsvp_obj_len,rsvp_obj_ctype,rsvp_obj_class_num;
u_int obj_tlen,intserv_serv_tlen;
int hexdump;
- u_int processed,padbytes,error_code,error_value,i,sigcheck;
- union {
- float f;
- uint32_t i;
- } bw;
+ u_int processed,padbytes,error_code,error_value,sigcheck;
u_int namelen;
u_int action, subchannel;
if (obj_tlen < 4+namelen)
goto obj_tooshort;
ND_PRINT("%s Session Name: ", indent);
- for (i = 0; i < namelen; i++)
- fn_print_char(ndo, GET_U_1(obj_tptr + 4 + i));
+ nd_printjn(ndo, obj_tptr + 4, namelen);
ND_PRINT("%s Setup Priority: %u, Holding Priority: %u, Flags: [%s] (%#x)",
indent,
GET_U_1(obj_tptr),
/* read variable length subobjects */
total_subobj_len = obj_tlen;
- while(total_subobj_len > 0) {
+ while(total_subobj_len != 0) {
/* If RFC 3476 Section 3.1 defined that a sub-object of the
* GENERALIZED_UNI RSVP object must have the Length field as
* a multiple of 4, instead of the check below it would be
case RSVP_CTYPE_1: /* new style */
if (obj_tlen < sizeof(struct rsvp_obj_frr_t))
goto obj_tooshort;
- bw.i = GET_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth);
ND_PRINT("%s Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
indent,
- obj_ptr.rsvp_obj_frr->setup_prio,
- obj_ptr.rsvp_obj_frr->hold_prio,
- obj_ptr.rsvp_obj_frr->hop_limit,
- bw.f * 8 / 1000000);
+ GET_U_1(obj_ptr.rsvp_obj_frr->setup_prio),
+ GET_U_1(obj_ptr.rsvp_obj_frr->hold_prio),
+ GET_U_1(obj_ptr.rsvp_obj_frr->hop_limit),
+ GET_BE_F_4(obj_ptr.rsvp_obj_frr->bandwidth) * 8 / 1000000);
ND_PRINT("%s Include-any: 0x%08x, Exclude-any: 0x%08x, Include-all: 0x%08x",
indent,
GET_BE_U_4(obj_ptr.rsvp_obj_frr->include_any),
case RSVP_CTYPE_TUNNEL_IPV4: /* old style */
if (obj_tlen < 16)
goto obj_tooshort;
- bw.i = GET_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth);
ND_PRINT("%s Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
indent,
- obj_ptr.rsvp_obj_frr->setup_prio,
- obj_ptr.rsvp_obj_frr->hold_prio,
- obj_ptr.rsvp_obj_frr->hop_limit,
- bw.f * 8 / 1000000);
+ GET_U_1(obj_ptr.rsvp_obj_frr->setup_prio),
+ GET_U_1(obj_ptr.rsvp_obj_frr->hold_prio),
+ GET_U_1(obj_ptr.rsvp_obj_frr->hop_limit),
+ GET_BE_F_4(obj_ptr.rsvp_obj_frr->bandwidth) * 8 / 1000000);
ND_PRINT("%s Include Colors: 0x%08x, Exclude Colors: 0x%08x",
indent,
GET_BE_U_4(obj_ptr.rsvp_obj_frr->include_any),
GET_BE_U_4(obj_ptr.rsvp_obj_integrity->sequence + 4),
bittok2str(rsvp_obj_integrity_flag_values,
"none",
- obj_ptr.rsvp_obj_integrity->flags));
+ GET_U_1(obj_ptr.rsvp_obj_integrity->flags)));
ND_PRINT("%s MD5-sum 0x%08x%08x%08x%08x ",
indent,
GET_BE_U_4(obj_ptr.rsvp_obj_integrity->digest),
* Bundle messages may not contain bundle submessages, so we don't
* need to handle bundle submessages specially.
*/
- while(tlen > 0) {
+ while(tlen != 0) {
const u_char *subpptr=tptr, *subtptr;
u_short subplen, subtlen;
projects / tcpdump / blobdiff