mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-23 18:14:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

PGM: Modernize packet parsing style.

Browse Source 
Enable ND_LONGJMP_FROM_TCHECK. Remove a few redundant ND_TCHECK_*()
instances. Report invalid packets as invalid, not truncated. Update a
custom snapshot end guard to call nd_trunc_longjmp().
This commit is contained in:
Denis Ovsienko 2021-01-02 02:09:43 +00:00
parent d53857366f
commit bff53faf16
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
print-pgm.c
View File

@ -21,6 +21,7 @@
#include "netdissect-stdinc.h"
#define ND_LONGJMP_FROM_TCHECK
#include "netdissect.h"
#include "extract.h"
#include "addrtoname.h"
@ -174,8 +175,7 @@ pgm_print(netdissect_options *ndo,
GET_IPADDR_STRING(ip->ip_src),
GET_IPADDR_STRING(ip->ip_dst));
}
nd_print_trunc(ndo);
return;
nd_trunc_longjmp(ndo);
}
sport = GET_BE_U_2(pgm->pgm_sport);
@ -240,7 +240,7 @@ pgm_print(netdissect_options *ndo,
bp += sizeof(nd_ipv6);
break;
default:
goto trunc;
goto invalid;
break;
}
@ -272,7 +272,7 @@ pgm_print(netdissect_options *ndo,
bp += sizeof(nd_ipv6);
break;
default:
goto trunc;
goto invalid;
break;
}
@ -306,7 +306,6 @@ pgm_print(netdissect_options *ndo,
const struct pgm_data *odata;
odata = (const struct pgm_data *)(pgm + 1);
ND_TCHECK_SIZE(odata);
ND_PRINT("ODATA trail %u seq %u",
GET_BE_U_4(odata->pgmd_trailseq),
GET_BE_U_4(odata->pgmd_seq));
@ -318,7 +317,6 @@ pgm_print(netdissect_options *ndo,
const struct pgm_data *rdata;
rdata = (const struct pgm_data *)(pgm + 1);
ND_TCHECK_SIZE(rdata);
ND_PRINT("RDATA trail %u seq %u",
GET_BE_U_4(rdata->pgmd_trailseq),
GET_BE_U_4(rdata->pgmd_seq));
@ -352,7 +350,7 @@ pgm_print(netdissect_options *ndo,
bp += sizeof(nd_ipv6);
break;
default:
goto trunc;
goto invalid;
break;
}
@ -373,7 +371,7 @@ pgm_print(netdissect_options *ndo,
bp += sizeof(nd_ipv6);
break;
default:
goto trunc;
goto invalid;
break;
}
@ -597,7 +595,7 @@ pgm_print(netdissect_options *ndo,
opts_len -= PGM_OPT_REDIRECT_FIXED_LEN + sizeof(nd_ipv6);
break;
default:
goto trunc;
goto invalid;
break;
}
@ -754,7 +752,7 @@ pgm_print(netdissect_options *ndo,
opts_len -= PGM_OPT_PGMCC_DATA_FIXED_LEN + sizeof(nd_ipv6);
break;
default:
goto trunc;
goto invalid;
break;
}
@ -797,7 +795,7 @@ pgm_print(netdissect_options *ndo,
opts_len -= PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN + sizeof(nd_ipv6);
break;
default:
goto trunc;
goto invalid;
break;
}
@ -823,7 +821,6 @@ pgm_print(netdissect_options *ndo,
GET_BE_U_2(pgm->pgm_length));
return;
trunc:
nd_print_trunc(ndo);
invalid:
nd_print_invalid(ndo);
}