Skip to content

L
linux
Commit 1f807d6e authored by Jan Engelhardt's avatar Jan Engelhardt Committed by David S. Miller
Browse files
Options

[NETFILTER]: nf_conntrack_h323: clean up code a bit 

-total: 81 errors, 3 warnings, 876 lines checked
+total: 44 errors, 3 warnings, 876 lines checked

There is still work to be done, but that's for another patch.
Signed-off-by: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 02502f62
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 64 deletions
net/netfilter/nf_conntrack_h323_asn1.c
View file @ 1f807d6e
...@@ -96,7 +96,7 @@ typedef struct { ...@@ -96,7 +96,7 @@ typedef struct {
unsigned char *beg; unsigned char *beg;
unsigned char *end; unsigned char *end;
unsigned char *cur; unsigned char *cur;
unsigned bit; unsigned int bit;
} bitstr_t; } bitstr_t;
/* Tool Functions */ /* Tool Functions */
...@@ -104,28 +104,28 @@ typedef struct { ...@@ -104,28 +104,28 @@ typedef struct {
#define INC_BITS(bs,b) if(((bs)->bit+=(b))>7){(bs)->cur+=(bs)->bit>>3;(bs)->bit&=7;} #define INC_BITS(bs,b) if(((bs)->bit+=(b))>7){(bs)->cur+=(bs)->bit>>3;(bs)->bit&=7;}
#define BYTE_ALIGN(bs) if((bs)->bit){(bs)->cur++;(bs)->bit=0;} #define BYTE_ALIGN(bs) if((bs)->bit){(bs)->cur++;(bs)->bit=0;}
#define CHECK_BOUND(bs,n) if((bs)->cur+(n)>(bs)->end)return(H323_ERROR_BOUND) #define CHECK_BOUND(bs,n) if((bs)->cur+(n)>(bs)->end)return(H323_ERROR_BOUND)
static unsigned get_len(bitstr_t * bs); static unsigned int get_len(bitstr_t *bs);
static unsigned get_bit(bitstr_t * bs); static unsigned int get_bit(bitstr_t *bs);
static unsigned get_bits(bitstr_t * bs, unsigned b); static unsigned int get_bits(bitstr_t *bs, unsigned int b);
static unsigned get_bitmap(bitstr_t * bs, unsigned b); static unsigned int get_bitmap(bitstr_t *bs, unsigned int b);
static unsigned get_uint(bitstr_t * bs, int b); static unsigned int get_uint(bitstr_t *bs, int b);
/* Decoder Functions */ /* Decoder Functions */
static int decode_nul(bitstr_t * bs, field_t * f, char *base, int level); static int decode_nul(bitstr_t *bs, field_t *f, char *base, int level);
static int decode_bool(bitstr_t * bs, field_t * f, char *base, int level); static int decode_bool(bitstr_t *bs, field_t *f, char *base, int level);
static int decode_oid(bitstr_t * bs, field_t * f, char *base, int level); static int decode_oid(bitstr_t *bs, field_t *f, char *base, int level);
static int decode_int(bitstr_t * bs, field_t * f, char *base, int level); static int decode_int(bitstr_t *bs, field_t *f, char *base, int level);
static int decode_enum(bitstr_t * bs, field_t * f, char *base, int level); static int decode_enum(bitstr_t *bs, field_t *f, char *base, int level);
static int decode_bitstr(bitstr_t * bs, field_t * f, char *base, int level); static int decode_bitstr(bitstr_t *bs, field_t *f, char *base, int level);
static int decode_numstr(bitstr_t * bs, field_t * f, char *base, int level); static int decode_numstr(bitstr_t *bs, field_t *f, char *base, int level);
static int decode_octstr(bitstr_t * bs, field_t * f, char *base, int level); static int decode_octstr(bitstr_t *bs, field_t *f, char *base, int level);
static int decode_bmpstr(bitstr_t * bs, field_t * f, char *base, int level); static int decode_bmpstr(bitstr_t *bs, field_t *f, char *base, int level);
static int decode_seq(bitstr_t * bs, field_t * f, char *base, int level); static int decode_seq(bitstr_t *bs, field_t *f, char *base, int level);
static int decode_seqof(bitstr_t * bs, field_t * f, char *base, int level); static int decode_seqof(bitstr_t *bs, field_t *f, char *base, int level);
static int decode_choice(bitstr_t * bs, field_t * f, char *base, int level); static int decode_choice(bitstr_t *bs, field_t *f, char *base, int level);
/* Decoder Functions Vector */ /* Decoder Functions Vector */
typedef int (*decoder_t) (bitstr_t *, field_t *, char *, int); typedef int (*decoder_t)(bitstr_t *, field_t *, char *, int);
static const decoder_t Decoders[] = { static const decoder_t Decoders[] = {
decode_nul, decode_nul,
decode_bool, decode_bool,
...@@ -150,9 +150,9 @@ static const decoder_t Decoders[] = { ...@@ -150,9 +150,9 @@ static const decoder_t Decoders[] = {
* Functions * Functions
****************************************************************************/ ****************************************************************************/
/* Assume bs is aligned && v < 16384 */ /* Assume bs is aligned && v < 16384 */
static unsigned get_len(bitstr_t * bs) static unsigned int get_len(bitstr_t *bs)
{ {
unsigned v; unsigned int v;
v = *bs->cur++; v = *bs->cur++;
...@@ -166,9 +166,9 @@ static unsigned get_len(bitstr_t * bs) ...@@ -166,9 +166,9 @@ static unsigned get_len(bitstr_t * bs)
} }
/****************************************************************************/ /****************************************************************************/
static unsigned get_bit(bitstr_t * bs) static unsigned int get_bit(bitstr_t *bs)
{ {
unsigned b = (*bs->cur) & (0x80 >> bs->bit); unsigned int b = (*bs->cur) & (0x80 >> bs->bit);
INC_BIT(bs); INC_BIT(bs);
...@@ -177,9 +177,9 @@ static unsigned get_bit(bitstr_t * bs) ...@@ -177,9 +177,9 @@ static unsigned get_bit(bitstr_t * bs)
/****************************************************************************/ /****************************************************************************/
/* Assume b <= 8 */ /* Assume b <= 8 */
static unsigned get_bits(bitstr_t * bs, unsigned b) static unsigned int get_bits(bitstr_t *bs, unsigned int b)
{ {
unsigned v, l; unsigned int v, l;
v = (*bs->cur) & (0xffU >> bs->bit); v = (*bs->cur) & (0xffU >> bs->bit);
l = b + bs->bit; l = b + bs->bit;
...@@ -203,9 +203,9 @@ static unsigned get_bits(bitstr_t * bs, unsigned b) ...@@ -203,9 +203,9 @@ static unsigned get_bits(bitstr_t * bs, unsigned b)
/****************************************************************************/ /****************************************************************************/
/* Assume b <= 32 */ /* Assume b <= 32 */
static unsigned get_bitmap(bitstr_t * bs, unsigned b) static unsigned int get_bitmap(bitstr_t *bs, unsigned int b)
{ {
unsigned v, l, shift, bytes; unsigned int v, l, shift, bytes;
if (!b) if (!b)
return 0; return 0;
...@@ -213,18 +213,18 @@ static unsigned get_bitmap(bitstr_t * bs, unsigned b) ...@@ -213,18 +213,18 @@ static unsigned get_bitmap(bitstr_t * bs, unsigned b)
l = bs->bit + b; l = bs->bit + b;
if (l < 8) { if (l < 8) {
v = (unsigned) (*bs->cur) << (bs->bit + 24); v = (unsigned int)(*bs->cur) << (bs->bit + 24);
bs->bit = l; bs->bit = l;
} else if (l == 8) { } else if (l == 8) {
v = (unsigned) (*bs->cur++) << (bs->bit + 24); v = (unsigned int)(*bs->cur++) << (bs->bit + 24);
bs->bit = 0; bs->bit = 0;
} else { } else {
for (bytes = l >> 3, shift = 24, v = 0; bytes; for (bytes = l >> 3, shift = 24, v = 0; bytes;
bytes--, shift -= 8) bytes--, shift -= 8)
v |= (unsigned) (*bs->cur++) << shift; v |= (unsigned int)(*bs->cur++) << shift;
if (l < 32) { if (l < 32) {
v |= (unsigned) (*bs->cur) << shift; v |= (unsigned int)(*bs->cur) << shift;
v <<= bs->bit; v <<= bs->bit;
} else if (l > 32) { } else if (l > 32) {
v <<= bs->bit; v <<= bs->bit;
...@@ -242,9 +242,9 @@ static unsigned get_bitmap(bitstr_t * bs, unsigned b) ...@@ -242,9 +242,9 @@ static unsigned get_bitmap(bitstr_t * bs, unsigned b)
/**************************************************************************** /****************************************************************************
* Assume bs is aligned and sizeof(unsigned int) == 4 * Assume bs is aligned and sizeof(unsigned int) == 4
****************************************************************************/ ****************************************************************************/
static unsigned get_uint(bitstr_t * bs, int b) static unsigned int get_uint(bitstr_t *bs, int b)
{ {
unsigned v = 0; unsigned int v = 0;
switch (b) { switch (b) {
case 4: case 4:
...@@ -264,7 +264,7 @@ static unsigned get_uint(bitstr_t * bs, int b) ...@@ -264,7 +264,7 @@ static unsigned get_uint(bitstr_t * bs, int b)
} }
/****************************************************************************/ /****************************************************************************/
static int decode_nul(bitstr_t * bs, field_t * f, char *base, int level) static int decode_nul(bitstr_t *bs, field_t *f, char *base, int level)
{ {
PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
...@@ -272,7 +272,7 @@ static int decode_nul(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -272,7 +272,7 @@ static int decode_nul(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
static int decode_bool(bitstr_t * bs, field_t * f, char *base, int level) static int decode_bool(bitstr_t *bs, field_t *f, char *base, int level)
{ {
PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
...@@ -283,7 +283,7 @@ static int decode_bool(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -283,7 +283,7 @@ static int decode_bool(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
static int decode_oid(bitstr_t * bs, field_t * f, char *base, int level) static int decode_oid(bitstr_t *bs, field_t *f, char *base, int level)
{ {
int len; int len;
...@@ -299,9 +299,9 @@ static int decode_oid(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -299,9 +299,9 @@ static int decode_oid(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
static int decode_int(bitstr_t * bs, field_t * f, char *base, int level) static int decode_int(bitstr_t *bs, field_t *f, char *base, int level)
{ {
unsigned len; unsigned int len;
PRINT("%*.s%s", level * TAB_SIZE, " ", f->name); PRINT("%*.s%s", level * TAB_SIZE, " ", f->name);
...@@ -318,9 +318,9 @@ static int decode_int(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -318,9 +318,9 @@ static int decode_int(bitstr_t * bs, field_t * f, char *base, int level)
len = get_bits(bs, 2) + 1; len = get_bits(bs, 2) + 1;
BYTE_ALIGN(bs); BYTE_ALIGN(bs);
if (base && (f->attr & DECODE)) { /* timeToLive */ if (base && (f->attr & DECODE)) { /* timeToLive */
unsigned v = get_uint(bs, len) + f->lb; unsigned int v = get_uint(bs, len) + f->lb;
PRINT(" = %u", v); PRINT(" = %u", v);
*((unsigned *) (base + f->offset)) = v; *((unsigned int *)(base + f->offset)) = v;
} }
bs->cur += len; bs->cur += len;
break; break;
...@@ -342,7 +342,7 @@ static int decode_int(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -342,7 +342,7 @@ static int decode_int(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
static int decode_enum(bitstr_t * bs, field_t * f, char *base, int level) static int decode_enum(bitstr_t *bs, field_t *f, char *base, int level)
{ {
PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
...@@ -357,9 +357,9 @@ static int decode_enum(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -357,9 +357,9 @@ static int decode_enum(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
static int decode_bitstr(bitstr_t * bs, field_t * f, char *base, int level) static int decode_bitstr(bitstr_t *bs, field_t *f, char *base, int level)
{ {
unsigned len; unsigned int len;
PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
...@@ -390,9 +390,9 @@ static int decode_bitstr(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -390,9 +390,9 @@ static int decode_bitstr(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
static int decode_numstr(bitstr_t * bs, field_t * f, char *base, int level) static int decode_numstr(bitstr_t *bs, field_t *f, char *base, int level)
{ {
unsigned len; unsigned int len;
PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
...@@ -407,9 +407,9 @@ static int decode_numstr(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -407,9 +407,9 @@ static int decode_numstr(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
static int decode_octstr(bitstr_t * bs, field_t * f, char *base, int level) static int decode_octstr(bitstr_t *bs, field_t *f, char *base, int level)
{ {
unsigned len; unsigned int len;
PRINT("%*.s%s", level * TAB_SIZE, " ", f->name); PRINT("%*.s%s", level * TAB_SIZE, " ", f->name);
...@@ -424,7 +424,7 @@ static int decode_octstr(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -424,7 +424,7 @@ static int decode_octstr(bitstr_t * bs, field_t * f, char *base, int level)
bs->cur[0], bs->cur[1], bs->cur[0], bs->cur[1],
bs->cur[2], bs->cur[3], bs->cur[2], bs->cur[3],
bs->cur[4] * 256 + bs->cur[5])); bs->cur[4] * 256 + bs->cur[5]));
*((unsigned *) (base + f->offset)) = *((unsigned int *)(base + f->offset)) =
bs->cur - bs->buf; bs->cur - bs->buf;
} }
} }
...@@ -455,9 +455,9 @@ static int decode_octstr(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -455,9 +455,9 @@ static int decode_octstr(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
static int decode_bmpstr(bitstr_t * bs, field_t * f, char *base, int level) static int decode_bmpstr(bitstr_t *bs, field_t *f, char *base, int level)
{ {
unsigned len; unsigned int len;
PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
...@@ -480,9 +480,9 @@ static int decode_bmpstr(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -480,9 +480,9 @@ static int decode_bmpstr(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
static int decode_seq(bitstr_t * bs, field_t * f, char *base, int level) static int decode_seq(bitstr_t *bs, field_t *f, char *base, int level)
{ {
unsigned ext, bmp, i, opt, len = 0, bmp2, bmp2_len; unsigned int ext, bmp, i, opt, len = 0, bmp2, bmp2_len;
int err; int err;
field_t *son; field_t *son;
unsigned char *beg = NULL; unsigned char *beg = NULL;
...@@ -498,7 +498,7 @@ static int decode_seq(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -498,7 +498,7 @@ static int decode_seq(bitstr_t * bs, field_t * f, char *base, int level)
/* Get fields bitmap */ /* Get fields bitmap */
bmp = get_bitmap(bs, f->sz); bmp = get_bitmap(bs, f->sz);
if (base) if (base)
*(unsigned *) base = bmp; *(unsigned int *)base = bmp;
/* Decode the root components */ /* Decode the root components */
for (i = opt = 0, son = f->fields; i < f->lb; i++, son++) { for (i = opt = 0, son = f->fields; i < f->lb; i++, son++) {
...@@ -550,7 +550,7 @@ static int decode_seq(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -550,7 +550,7 @@ static int decode_seq(bitstr_t * bs, field_t * f, char *base, int level)
bmp2 = get_bitmap(bs, bmp2_len); bmp2 = get_bitmap(bs, bmp2_len);
bmp |= bmp2 >> f->sz; bmp |= bmp2 >> f->sz;
if (base) if (base)
*(unsigned *) base = bmp; *(unsigned int *)base = bmp;
BYTE_ALIGN(bs); BYTE_ALIGN(bs);
/* Decode the extension components */ /* Decode the extension components */
...@@ -596,9 +596,9 @@ static int decode_seq(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -596,9 +596,9 @@ static int decode_seq(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
static int decode_seqof(bitstr_t * bs, field_t * f, char *base, int level) static int decode_seqof(bitstr_t *bs, field_t *f, char *base, int level)
{ {
unsigned count, effective_count = 0, i, len = 0; unsigned int count, effective_count = 0, i, len = 0;
int err; int err;
field_t *son; field_t *son;
unsigned char *beg = NULL; unsigned char *beg = NULL;
...@@ -636,8 +636,8 @@ static int decode_seqof(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -636,8 +636,8 @@ static int decode_seqof(bitstr_t * bs, field_t * f, char *base, int level)
/* Write Count */ /* Write Count */
if (base) { if (base) {
effective_count = count > f->ub ? f->ub : count; effective_count = count > f->ub ? f->ub : count;
*(unsigned *) base = effective_count; *(unsigned int *)base = effective_count;
base += sizeof(unsigned); base += sizeof(unsigned int);
} }
/* Decode nested field */ /* Decode nested field */
...@@ -685,9 +685,9 @@ static int decode_seqof(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -685,9 +685,9 @@ static int decode_seqof(bitstr_t * bs, field_t * f, char *base, int level)
/****************************************************************************/ /****************************************************************************/
static int decode_choice(bitstr_t * bs, field_t * f, char *base, int level) static int decode_choice(bitstr_t *bs, field_t *f, char *base, int level)
{ {
unsigned type, ext, len = 0; unsigned int type, ext, len = 0;
int err; int err;
field_t *son; field_t *son;
unsigned char *beg = NULL; unsigned char *beg = NULL;
...@@ -710,7 +710,7 @@ static int decode_choice(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -710,7 +710,7 @@ static int decode_choice(bitstr_t * bs, field_t * f, char *base, int level)
/* Write Type */ /* Write Type */
if (base) if (base)
*(unsigned *) base = type; *(unsigned int *)base = type;
/* Check Range */ /* Check Range */
if (type >= f->ub) { /* Newer version? */ if (type >= f->ub) { /* Newer version? */
...@@ -754,7 +754,7 @@ static int decode_choice(bitstr_t * bs, field_t * f, char *base, int level) ...@@ -754,7 +754,7 @@ static int decode_choice(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
int DecodeRasMessage(unsigned char *buf, size_t sz, RasMessage * ras) int DecodeRasMessage(unsigned char *buf, size_t sz, RasMessage *ras)
{ {
static field_t ras_message = { static field_t ras_message = {
FNAME("RasMessage") CHOICE, 5, 24, 32, DECODE | EXT, FNAME("RasMessage") CHOICE, 5, 24, 32, DECODE | EXT,
...@@ -771,7 +771,7 @@ int DecodeRasMessage(unsigned char *buf, size_t sz, RasMessage * ras) ...@@ -771,7 +771,7 @@ int DecodeRasMessage(unsigned char *buf, size_t sz, RasMessage * ras)
/****************************************************************************/ /****************************************************************************/
static int DecodeH323_UserInformation(unsigned char *buf, unsigned char *beg, static int DecodeH323_UserInformation(unsigned char *buf, unsigned char *beg,
size_t sz, H323_UserInformation * uuie) size_t sz, H323_UserInformation *uuie)
{ {
static field_t h323_userinformation = { static field_t h323_userinformation = {
FNAME("H323-UserInformation") SEQ, 1, 2, 2, DECODE | EXT, FNAME("H323-UserInformation") SEQ, 1, 2, 2, DECODE | EXT,
...@@ -807,7 +807,7 @@ int DecodeMultimediaSystemControlMessage(unsigned char *buf, size_t sz, ...@@ -807,7 +807,7 @@ int DecodeMultimediaSystemControlMessage(unsigned char *buf, size_t sz,
} }
/****************************************************************************/ /****************************************************************************/
int DecodeQ931(unsigned char *buf, size_t sz, Q931 * q931) int DecodeQ931(unsigned char *buf, size_t sz, Q931 *q931)
{ {
unsigned char *p = buf; unsigned char *p = buf;
int len; int len;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7