summaryrefslogtreecommitdiffstats
path: root/kiss/net2kiss.c
diff options
context:
space:
mode:
Diffstat (limited to 'kiss/net2kiss.c')
-rw-r--r--kiss/net2kiss.c96
1 files changed, 48 insertions, 48 deletions
diff --git a/kiss/net2kiss.c b/kiss/net2kiss.c
index 716107d..04b4032 100644
--- a/kiss/net2kiss.c
+++ b/kiss/net2kiss.c
@@ -72,7 +72,7 @@ static char *namepts = NULL; /* name of the unix98 pts slave, which
/* --------------------------------------------------------------------- */
-static void die(char *func)
+static void die(char *func)
{
fprintf(stderr, "%s: %s (%i)%s%s\n", progname, strerror(errno),
errno, func ? " in " : "", func ? func : "");
@@ -88,7 +88,7 @@ static void display_packet(unsigned char *bp, unsigned int len)
unsigned char v1=1,cmd=0;
unsigned char i,j;
- if (!bp || !len)
+ if (!bp || !len)
return;
if (len < 8)
return;
@@ -100,24 +100,24 @@ static void display_packet(unsigned char *bp, unsigned int len)
cmd = (bp[1] & 2) != 0;
printf("fm ? to ");
i = (bp[2] >> 2) & 0x3f;
- if (i)
+ if (i)
printf("%c",i+0x20);
i = ((bp[2] << 4) | ((bp[3] >> 4) & 0xf)) & 0x3f;
- if (i)
+ if (i)
printf("%c",i+0x20);
i = ((bp[3] << 2) | ((bp[4] >> 6) & 3)) & 0x3f;
- if (i)
+ if (i)
printf("%c",i+0x20);
i = bp[4] & 0x3f;
- if (i)
+ if (i)
printf("%c",i+0x20);
i = (bp[5] >> 2) & 0x3f;
- if (i)
+ if (i)
printf("%c",i+0x20);
i = ((bp[5] << 4) | ((bp[6] >> 4) & 0xf)) & 0x3f;
- if (i)
+ if (i)
printf("%c",i+0x20);
- printf("-%u QSO Nr %u", bp[6] & 0xf, (bp[0] << 6) |
+ printf("-%u QSO Nr %u", bp[6] & 0xf, (bp[0] << 6) |
(bp[1] >> 2));
bp += 7;
len -= 7;
@@ -132,33 +132,33 @@ static void display_packet(unsigned char *bp, unsigned int len)
cmd = (bp[6] & 0x80);
}
printf("fm ");
- for(i = 7; i < 13; i++)
- if ((bp[i] &0xfe) != 0x40)
+ for(i = 7; i < 13; i++)
+ if ((bp[i] &0xfe) != 0x40)
printf("%c",bp[i] >> 1);
printf("-%u to ",(bp[13] >> 1) & 0xf);
- for(i = 0; i < 6; i++)
- if ((bp[i] &0xfe) != 0x40)
+ for(i = 0; i < 6; i++)
+ if ((bp[i] &0xfe) != 0x40)
printf("%c",bp[i] >> 1);
printf("-%u",(bp[6] >> 1) & 0xf);
bp += 14;
len -= 14;
if ((!(bp[-1] & 1)) && (len >= 7)) printf(" via ");
while ((!(bp[-1] & 1)) && (len >= 7)) {
- for(i = 0; i < 6; i++)
- if ((bp[i] &0xfe) != 0x40)
+ for(i = 0; i < 6; i++)
+ if ((bp[i] &0xfe) != 0x40)
printf("%c",bp[i] >> 1);
printf("-%u",(bp[6] >> 1) & 0xf);
bp += 7;
len -= 7;
- if ((!(bp[-1] & 1)) && (len >= 7))
+ if ((!(bp[-1] & 1)) && (len >= 7))
printf(",");
}
}
- if(!len)
+ if(!len)
return;
i = *bp++;
len--;
- j = v1 ? ((i & 0x10) ? '!' : ' ') :
+ j = v1 ? ((i & 0x10) ? '!' : ' ') :
((i & 0x10) ? (cmd ? '+' : '-') : (cmd ? '^' : 'v'));
if (!(i & 1)) {
/*
@@ -207,7 +207,7 @@ static void display_packet(unsigned char *bp, unsigned int len)
printf(" REJ%u%c",(i >> 5) & 7,j);
break;
default:
- printf(" unknown S (0x%x)%u%c", i & 0xf,
+ printf(" unknown S (0x%x)%u%c", i & 0xf,
(i >> 5) & 7, j);
break;
}
@@ -221,25 +221,25 @@ static void display_packet(unsigned char *bp, unsigned int len)
j = 0;
while (len) {
i = *bp++;
- if ((i >= 32) && (i < 128))
+ if ((i >= 32) && (i < 128))
printf("%c",i);
else if (i == 13) {
- if (j)
+ if (j)
printf("\n");
j = 0;
- } else
+ } else
printf(".");
- if (i >= 32)
+ if (i >= 32)
j = 1;
len--;
}
- if (j)
+ if (j)
printf("\n");
}
/* ---------------------------------------------------------------------- */
-static int openpty(int *amaster, int *aslave, char *name,
+static int openpty(int *amaster, int *aslave, char *name,
struct termios *termp, struct winsize *winp)
{
char line[PATH_MAX];
@@ -257,7 +257,7 @@ static int openpty(int *amaster, int *aslave, char *name,
return (-1); /* out of ptys */
} else {
line[5] = 't';
- (void) chown(line, getuid(),
+ (void) chown(line, getuid(),
gr ? gr->gr_gid : -1);
(void) chmod(line, S_IRUSR|S_IWUSR|S_IWGRP);
#if 0
@@ -270,11 +270,11 @@ static int openpty(int *amaster, int *aslave, char *name,
strcpy(name, line);
if (termp)
(void) tcsetattr(slave,
- TCSAFLUSH,
+ TCSAFLUSH,
termp);
if (winp)
- (void) ioctl(slave,
- TIOCSWINSZ,
+ (void) ioctl(slave,
+ TIOCSWINSZ,
(char *)winp);
return 0;
}
@@ -318,22 +318,22 @@ static void restore_ifflags(int signum)
/* --------------------------------------------------------------------- */
-static void kiss_overflow(void)
+static void kiss_overflow(void)
{
if (verbose)
printf("KISS: packet overflow\n");
}
-static void kiss_bad_escape(void)
+static void kiss_bad_escape(void)
{
if (verbose)
printf("KISS: bad escape sequence\n");
}
-static void display_kiss_packet(char *pfx, unsigned char *pkt,
- unsigned int pktlen)
+static void display_kiss_packet(char *pfx, unsigned char *pkt,
+ unsigned int pktlen)
{
- if (!verbose)
+ if (!verbose)
return;
switch (*pkt) {
case KISS_CMD_DATA:
@@ -344,7 +344,7 @@ static void display_kiss_packet(char *pfx, unsigned char *pkt,
case KISS_CMD_TXDELAY:
printf("%s: txdelay = %dms\n", pfx, (int)pkt[1] * 10);
break;
-
+
case KISS_CMD_PPERSIST:
printf("%s: p persistence = %d\n", pfx, pkt[1]);
break;
@@ -367,8 +367,8 @@ static void display_kiss_packet(char *pfx, unsigned char *pkt,
}
}
-static void kiss_packet(int fdif, char *addr,
- unsigned char *pkt, unsigned int pktlen)
+static void kiss_packet(int fdif, char *addr,
+ unsigned char *pkt, unsigned int pktlen)
{
struct sockaddr to;
int i;
@@ -410,19 +410,19 @@ static int doio(int fdif, int fdpty, char *ifaddr)
fd_set rmask, wmask;
struct sockaddr from;
socklen_t from_len;
-
+
#define ADD_CHAR(c) \
obuf[ob_wpx] = c; \
ob_wpx = (ob_wpx + 1) % sizeof(obuf); \
if (ob_wpx == ob_rp) goto kissencerr;
-
+
#define ADD_KISSCHAR(c) \
if (((c) & 0xff) == KISS_FEND) \
{ ADD_CHAR(KISS_FESC); ADD_CHAR(KISS_TFEND); } \
else if (((c) & 0xff) == KISS_FESC) \
{ ADD_CHAR(KISS_FESC); ADD_CHAR(KISS_TFESC); } \
else { ADD_CHAR(c); }
-
+
for (;;) {
FD_ZERO(&rmask);
FD_ZERO(&wmask);
@@ -436,9 +436,9 @@ static int doio(int fdif, int fdpty, char *ifaddr)
die("select");
if (FD_ISSET(fdpty, &wmask)) {
if (ob_rp > ob_wp)
- i = write(fdpty, obuf+ob_rp,
+ i = write(fdpty, obuf+ob_rp,
sizeof(obuf)-ob_rp);
- else
+ else
i = write(fdpty, obuf+ob_rp, ob_wp - ob_rp);
if (i < 0)
die("write");
@@ -468,7 +468,7 @@ static int doio(int fdif, int fdpty, char *ifaddr)
}
if (*bp == KISS_FEND) {
kiss_packet(fdif, ifaddr,
- pktbuf,
+ pktbuf,
pktptr - pktbuf);
pktptr = pktbuf;
break;
@@ -499,7 +499,7 @@ static int doio(int fdif, int fdpty, char *ifaddr)
pktstate = KISS_RX;
break;
}
- }
+ }
}
if (FD_ISSET(fdif, &rmask)) {
from_len = sizeof(from);
@@ -602,7 +602,7 @@ int main(int argc, char *argv[])
slavename[5] = 'p';
master_name = slavename;
} else {
- if ((fdpty = open(name_pname,
+ if ((fdpty = open(name_pname,
O_RDWR | O_NOCTTY | O_NONBLOCK)) < 0) {
fprintf(stderr, "%s: cannot open \"%s\"\n", progname,
name_pname);
@@ -612,17 +612,17 @@ int main(int argc, char *argv[])
i_am_unix98_pty_master = 1;
master_name = name_pname;
}
- if ((fdif = socket(PF_INET, SOCK_PACKET, proto)) < 0)
+ if ((fdif = socket(PF_INET, SOCK_PACKET, proto)) < 0)
die("socket");
memset(&sa, 0, sizeof(struct sockaddr));
memcpy(sa.sa_data, name_iface, sizeof(sa.sa_data));
sa.sa_family = AF_INET;
if (bind(fdif, &sa, sizeof(struct sockaddr)) < 0)
- die("bind");
+ die("bind");
memcpy(ifr.ifr_name, name_iface, IFNAMSIZ);
if (ioctl(fdif, SIOCGIFFLAGS, &ifr) < 0)
die("ioctl SIOCGIFFLAGS");
- ifr_new = ifr;
+ ifr_new = ifr;
ifr_new.ifr_flags |= if_newflags;
if (ioctl(fdif, SIOCSIFFLAGS, &ifr_new) < 0)
die("ioctl SIOCSIFFLAGS");