Changeset 32786
- Timestamp:
- 2012-07-20T17:05:30+02:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/package/owipcalc/src/owipcalc.c
r32785 r32786 225 225 uint32_t net2 = b->addr.v4.s_addr & htonl(~((1 << (32 - a->prefix)) - 1)); 226 226 227 if (printed) 228 qprintf(" "); 229 227 230 if ((b->prefix >= a->prefix) && (net1 == net2)) 228 231 { 229 qprintf("1 \n");232 qprintf("1"); 230 233 return true; 231 234 } 232 235 else 233 236 { 234 qprintf("0 \n");237 qprintf("0"); 235 238 return false; 236 239 } … … 250 253 { 251 254 uint32_t x = ntohl(a->addr.v4.s_addr); 255 256 if (printed) 257 qprintf(" "); 252 258 253 259 if (((x >= 0x0A000000) && (x <= 0x0AFFFFFF)) || … … 255 261 ((x >= 0xC0A80000) && (x <= 0xC0A8FFFF))) 256 262 { 257 qprintf("1 \n");263 qprintf("1"); 258 264 return true; 259 265 } 260 266 else 261 267 { 262 qprintf("0 \n");268 qprintf("0"); 263 269 return false; 264 270 } … … 269 275 uint32_t x = ntohl(a->addr.v4.s_addr); 270 276 277 if (printed) 278 qprintf(" "); 279 271 280 if ((x >= 0xA9FE0000) && (x <= 0xA9FEFFFF)) 272 281 { 273 qprintf("1 \n");282 qprintf("1"); 274 283 return true; 275 284 } 276 285 else 277 286 { 278 qprintf("0 \n");287 qprintf("0"); 279 288 return false; 280 289 } … … 527 536 uint8_t net2 = y->s6_addr[15-i] & m; 528 537 538 if (printed) 539 qprintf(" "); 540 529 541 if ((b->prefix >= n->prefix) && (net1 == net2) && 530 542 ((i == 15) || !memcmp(&x->s6_addr, &y->s6_addr, 15-i))) 531 543 { 532 qprintf("1 \n");544 qprintf("1"); 533 545 return true; 534 546 } 535 547 else 536 548 { 537 qprintf("0 \n");549 qprintf("0"); 538 550 return false; 539 551 } … … 542 554 static bool cidr_linklocal6(struct cidr *a) 543 555 { 556 if (printed) 557 qprintf(" "); 558 544 559 if ((a->addr.v6.s6_addr[0] == 0xFE) && 545 560 (a->addr.v6.s6_addr[1] >= 0x80) && 546 561 (a->addr.v6.s6_addr[1] <= 0xBF)) 547 562 { 548 qprintf("1 \n");563 qprintf("1"); 549 564 return true; 550 565 } 551 566 else 552 567 { 553 qprintf("0 \n");568 qprintf("0"); 554 569 return false; 555 570 } … … 558 573 static bool cidr_ula6(struct cidr *a) 559 574 { 575 if (printed) 576 qprintf(" "); 577 560 578 if ((a->addr.v6.s6_addr[0] >= 0xFC) && 561 579 (a->addr.v6.s6_addr[0] <= 0xFD)) 562 580 { 563 qprintf("1 \n");581 qprintf("1"); 564 582 return true; 565 583 } 566 584 else 567 585 { 568 qprintf("0 \n");586 qprintf("0"); 569 587 return false; 570 588 } … … 653 671 static bool cidr_howmany(struct cidr *a, struct cidr *b) 654 672 { 673 if (printed) 674 qprintf(" "); 675 655 676 if (b->prefix < a->prefix) 656 qprintf("0 \n");677 qprintf("0"); 657 678 else 658 qprintf("%u \n", 1 << (b->prefix - a->prefix));679 qprintf("%u", 1 << (b->prefix - a->prefix)); 659 680 660 681 return true;
Note: See TracChangeset
for help on using the changeset viewer.