Commit 89dc383a authored by Martin Mareš's avatar Martin Mareš
Browse files

Changed syntax of ip_class_mask, the old one was stupid.

parent d3dd620b
...@@ -53,7 +53,7 @@ typedef u32 ip_addr; ...@@ -53,7 +53,7 @@ typedef u32 ip_addr;
#define ipa_ntoh(x) x = _MI(ntohl(_I(x))) #define ipa_ntoh(x) x = _MI(ntohl(_I(x)))
#define ipa_classify(x) ipv4_classify(_I(x)) #define ipa_classify(x) ipv4_classify(_I(x))
#define ipa_opposite(x) _MI(_I(x) ^ 1) #define ipa_opposite(x) _MI(_I(x) ^ 1)
#define ipa_class_mask(x) x = _MI(ipv4_class_mask(_I(x))) #define ipa_class_mask(x) _MI(ipv4_class_mask(_I(x)))
#define ipa_from_u32(x) _MI(x) #define ipa_from_u32(x) _MI(x)
#define ipa_to_u32(x) _I(x) #define ipa_to_u32(x) _I(x)
#define ipa_compare(x,y) ipv4_compare(_I(x),_I(y)) #define ipa_compare(x,y) ipv4_compare(_I(x),_I(y))
......
...@@ -318,10 +318,8 @@ rip_process_packet( struct proto *p, struct rip_packet *packet, int num, ip_addr ...@@ -318,10 +318,8 @@ rip_process_packet( struct proto *p, struct rip_packet *packet, int num, ip_addr
#ifndef IPV6 #ifndef IPV6
ipa_ntoh( block->netmask ); ipa_ntoh( block->netmask );
ipa_ntoh( block->nexthop ); ipa_ntoh( block->nexthop );
if (packet->heading.version == RIP_V1) { if (packet->heading.version == RIP_V1)
block->netmask = block->network; /* MJ: why are macros like this?! */ block->netmask = ipa_class_mask(block->network);
ipa_class_mask( block->netmask );
}
#endif #endif
process_block( p, block, whotoldme ); process_block( p, block, whotoldme );
} }
......
Supports Markdown
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