mirrors/bgpq4
1
0
Fork 0
mirror of https://github.com/bgp/bgpq4 synced 2025-02-28 08:53:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

new format chars in formatted output.

Browse Source
This commit is contained in:
Alexandre Snarskii
2015-09-23 19:29:08 +03:00
parent aed1554fca
commit 2df0a54811
5 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
sx_prefix.c
View File

@@ -47,6 +47,33 @@ sx_prefix_adjust_masklen(struct sx_prefix* p)
};
};
void
sx_prefix_mask(struct sx_prefix* p, struct sx_prefix* q)
{
int i;
memset(q->addr.addrs, 0, sizeof(q->addr.addrs));
q->family=p->family;
q->masklen=p->masklen;
for(i=0;i<p->masklen/8;i++)
q->addr.addrs[i]=0xff;
for(i=1;i<=p->masklen%8;i++)
q->addr.addrs[p->masklen/8]|=(1<<(8-i));
};
void
sx_prefix_imask(struct sx_prefix* p, struct sx_prefix* q)
{
int i;
memset(q->addr.addrs, 0xff, sizeof(q->addr.addrs));
q->family=p->family;
q->masklen=p->masklen;
for(i=0;i<p->masklen/8;i++)
q->addr.addrs[i]=0;
for(i=1;i<=p->masklen%8;i++)
q->addr.addrs[p->masklen/8]&=~(1<<(8-i));
};
int
sx_prefix_parse(struct sx_prefix* p, int af, char* text)
{
@@ -266,10 +293,11 @@ sx_prefix_snprintf(struct sx_prefix* p, char* rbuffer, int srb)
int
sx_prefix_snprintf_fmt(struct sx_prefix* p, char* buffer, int size,
const char* format)
const char* name, const char* format)
{
unsigned off=0;
const char* c=format;
struct sx_prefix q;
while(*c) {
if(*c=='%') {
switch(*(c+1)) {
@@ -284,6 +312,19 @@ sx_prefix_snprintf_fmt(struct sx_prefix* p, char* buffer, int size,
case '%':
buffer[off++]='%';
break;
case 'N':
off+=snprintf(buffer+off,size-off,"%s",name);
break;
case 'm':
sx_prefix_mask(p, &q);
inet_ntop(p->family,&q.addr,buffer+off,size-off);
off=strlen(buffer);
break;
case 'i':
sx_prefix_imask(p, &q);
inet_ntop(p->family,&q.addr,buffer+off,size-off);
off=strlen(buffer);
break;
default :
sx_report(SX_ERROR, "Unknown format char '%c'\n", *(c+1));
return 0;