Skip to content

Commit 7bedeee

Browse files
authored
Merge pull request #13 from spale75/dev
v1.1.4
2 parents 3fcbd36 + 121604a commit 7bedeee

18 files changed

+408
-167
lines changed

src/p_dump.c

+15-15
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ void p_dump_add_announce4(struct peer_t *peer, int id, struct timeval *ts,
260260
int i;
261261
for(i=0; i<communitylen; i++)
262262
{
263-
opt_community.data[i].asn = *(uint16_t*)community+(i*2);
264-
opt_community.data[i].num = *(uint16_t*)community+(i*2)+1;
263+
opt_community.data[i].asn = *((uint16_t*)community+(i*2));
264+
opt_community.data[i].num = *((uint16_t*)community+(i*2)+1);
265265
}
266266
}
267267

@@ -270,8 +270,8 @@ void p_dump_add_announce4(struct peer_t *peer, int id, struct timeval *ts,
270270
int i;
271271
for(i=0; i<extcommunitylen4; i++)
272272
{
273-
opt_extcommunity4.data[i].type = *(uint8_t*)extcommunity4+(i*8);
274-
opt_extcommunity4.data[i].subtype = *(uint8_t*)extcommunity4+(i*8)+1;
273+
opt_extcommunity4.data[i].type = *((uint8_t*)extcommunity4+(i*8));
274+
opt_extcommunity4.data[i].subtype = *((uint8_t*)extcommunity4+(i*8)+1);
275275
memcpy(opt_extcommunity4.data[i].value, (uint8_t*)extcommunity4+(i*8)+2, 6);
276276
}
277277
}
@@ -281,9 +281,9 @@ void p_dump_add_announce4(struct peer_t *peer, int id, struct timeval *ts,
281281
int i;
282282
for(i=0; i<largecommunitylen; i++)
283283
{
284-
opt_largecommunity.data[i].global = *(uint32_t*)largecommunity+(i*12);
285-
opt_largecommunity.data[i].local1 = *(uint32_t*)largecommunity+(i*12)+1;
286-
opt_largecommunity.data[i].local2 = *(uint32_t*)largecommunity+(i*12)+1;
284+
opt_largecommunity.data[i].global = *((uint32_t*)largecommunity+(i*12));
285+
opt_largecommunity.data[i].local1 = *((uint32_t*)largecommunity+(i*12)+1);
286+
opt_largecommunity.data[i].local2 = *((uint32_t*)largecommunity+(i*12)+1);
287287
}
288288
}
289289

@@ -368,8 +368,8 @@ void p_dump_add_announce6(struct peer_t *peer, int id, struct timeval *ts,
368368
int i;
369369
for(i=0; i<communitylen; i++)
370370
{
371-
opt_community.data[i].asn = *(uint16_t*)community+(i*2);
372-
opt_community.data[i].num = *(uint16_t*)community+(i*2)+1;
371+
opt_community.data[i].asn = *((uint16_t*)community+(i*2));
372+
opt_community.data[i].num = *((uint16_t*)community+(i*2)+1);
373373
}
374374
}
375375

@@ -378,10 +378,10 @@ void p_dump_add_announce6(struct peer_t *peer, int id, struct timeval *ts,
378378
int i;
379379
for(i=0; i<extcommunitylen6; i++)
380380
{
381-
opt_extcommunity6.data[i].type = *(uint8_t*)extcommunity6+(i*20);
382-
opt_extcommunity6.data[i].subtype = *(uint8_t*)extcommunity6+(i*20)+1;
381+
opt_extcommunity6.data[i].type = *((uint8_t*)extcommunity6+(i*20));
382+
opt_extcommunity6.data[i].subtype = *((uint8_t*)extcommunity6+(i*20)+1);
383383
memcpy(opt_extcommunity6.data[i].global, (uint8_t*)extcommunity6+(i*8)+2, 16);
384-
opt_extcommunity6.data[i].local = *(uint16_t*)(uint8_t*)extcommunity6+(i*8)+18;
384+
opt_extcommunity6.data[i].local = *((uint16_t*)(uint8_t*)extcommunity6+(i*8)+18);
385385
}
386386
}
387387

@@ -390,9 +390,9 @@ void p_dump_add_announce6(struct peer_t *peer, int id, struct timeval *ts,
390390
int i;
391391
for(i=0; i<largecommunitylen; i++)
392392
{
393-
opt_largecommunity.data[i].global = *(uint32_t*)largecommunity+(i*12);
394-
opt_largecommunity.data[i].local1 = *(uint32_t*)largecommunity+(i*12)+1;
395-
opt_largecommunity.data[i].local2 = *(uint32_t*)largecommunity+(i*12)+1;
393+
opt_largecommunity.data[i].global = *((uint32_t*)largecommunity+(i*12));
394+
opt_largecommunity.data[i].local1 = *((uint32_t*)largecommunity+(i*12)+1);
395+
opt_largecommunity.data[i].local2 = *((uint32_t*)largecommunity+(i*12)+1);
396396
}
397397
}
398398

test/input_ipv4.bin

10.3 KB
Binary file not shown.

test/input_ipv6.bin

631 Bytes
Binary file not shown.

test/ipv4.input

-2.67 KB
Binary file not shown.

test/ipv4.output.H

-41
This file was deleted.

test/ipv4.output.j

-41
This file was deleted.

0 commit comments

Comments
 (0)