diff options
author | brian <brian@FreeBSD.org> | 1997-08-25 00:29:32 +0000 |
---|---|---|
committer | brian <brian@FreeBSD.org> | 1997-08-25 00:29:32 +0000 |
commit | 1a67d257255b14fb46fc02630bf861a49bebd625 (patch) | |
tree | 5a0190bb42d398d91fc5bbdd17de31f54aec2459 /usr.sbin/ppp/server.c | |
parent | bbf38e6e36ecd35771c55badcb09ca745a61d881 (diff) | |
download | FreeBSD-src-1a67d257255b14fb46fc02630bf861a49bebd625.zip FreeBSD-src-1a67d257255b14fb46fc02630bf861a49bebd625.tar.gz |
Make the code format more in line with style(9).
Update loadalias to use the new libalias api.
Update to version 1.1.
Diffstat (limited to 'usr.sbin/ppp/server.c')
-rw-r--r-- | usr.sbin/ppp/server.c | 125 |
1 files changed, 62 insertions, 63 deletions
diff --git a/usr.sbin/ppp/server.c b/usr.sbin/ppp/server.c index ddff807..db9635e 100644 --- a/usr.sbin/ppp/server.c +++ b/usr.sbin/ppp/server.c @@ -23,78 +23,77 @@ static char *rm; int ServerLocalOpen(const char *name, mode_t mask) { - int s; + int s; - ifsun.sun_len = strlen(name); - if (ifsun.sun_len > sizeof ifsun.sun_path - 1) { - LogPrintf(LogERROR, "Local: %s: Path too long\n", name); - return 1; - } - ifsun.sun_family = AF_LOCAL; - strcpy(ifsun.sun_path, name); - - s = socket(PF_LOCAL, SOCK_STREAM, 0); - if (s < 0) { - LogPrintf(LogERROR, "Local: socket: %s\n", strerror(errno)); - return 2; - } + ifsun.sun_len = strlen(name); + if (ifsun.sun_len > sizeof ifsun.sun_path - 1) { + LogPrintf(LogERROR, "Local: %s: Path too long\n", name); + return 1; + } + ifsun.sun_family = AF_LOCAL; + strcpy(ifsun.sun_path, name); - setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &s, sizeof s); - mask = umask(mask); - if (bind(s, (struct sockaddr *) &ifsun, sizeof(ifsun)) < 0) { - umask(mask); - LogPrintf(LogERROR, "Local: bind: %s\n", strerror(errno)); - if (errno == EADDRINUSE && VarTerm) - fprintf(VarTerm, "Wait for a while, then try again.\n"); - close(s); - unlink(name); - return 3; - } + s = socket(PF_LOCAL, SOCK_STREAM, 0); + if (s < 0) { + LogPrintf(LogERROR, "Local: socket: %s\n", strerror(errno)); + return 2; + } + setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &s, sizeof s); + mask = umask(mask); + if (bind(s, (struct sockaddr *) & ifsun, sizeof(ifsun)) < 0) { umask(mask); - if (listen(s, 5) != 0) { - LogPrintf(LogERROR, "Local: Unable to listen to socket - OS overload?\n"); - close(s); - unlink(name); - return 4; - } - ServerClose(); - server = s; - rm = ifsun.sun_path; - LogPrintf(LogPHASE, "Listening at local socket %s.\n", name); - return 0; + LogPrintf(LogERROR, "Local: bind: %s\n", strerror(errno)); + if (errno == EADDRINUSE && VarTerm) + fprintf(VarTerm, "Wait for a while, then try again.\n"); + close(s); + unlink(name); + return 3; + } + umask(mask); + if (listen(s, 5) != 0) { + LogPrintf(LogERROR, "Local: Unable to listen to socket - OS overload?\n"); + close(s); + unlink(name); + return 4; + } + ServerClose(); + server = s; + rm = ifsun.sun_path; + LogPrintf(LogPHASE, "Listening at local socket %s.\n", name); + return 0; } int ServerTcpOpen(int port) { - struct sockaddr_in ifsin; - int s; + struct sockaddr_in ifsin; + int s; - s = socket(PF_INET, SOCK_STREAM, 0); - if (s < 0) { - LogPrintf(LogERROR, "Tcp: socket: %s\n", strerror(errno)); - return 5; - } - ifsin.sin_family = AF_INET; - ifsin.sin_addr.s_addr = INADDR_ANY; - ifsin.sin_port = htons(port); - setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &s, sizeof s); - if (bind(s, (struct sockaddr *) &ifsin, sizeof(ifsin)) < 0) { - LogPrintf(LogERROR, "Tcp: bind: %s\n", strerror(errno)); - if (errno == EADDRINUSE && VarTerm) - fprintf(VarTerm, "Wait for a while, then try again.\n"); - close(s); - return 6; - } - if (listen(s, 5) != 0) { - LogPrintf(LogERROR, "Tcp: Unable to listen to socket - OS overload?\n"); - close(s); - return 7; - } - ServerClose(); - server = s; - LogPrintf(LogPHASE, "Listening at port %d.\n", port); - return 0; + s = socket(PF_INET, SOCK_STREAM, 0); + if (s < 0) { + LogPrintf(LogERROR, "Tcp: socket: %s\n", strerror(errno)); + return 5; + } + ifsin.sin_family = AF_INET; + ifsin.sin_addr.s_addr = INADDR_ANY; + ifsin.sin_port = htons(port); + setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &s, sizeof s); + if (bind(s, (struct sockaddr *) & ifsin, sizeof(ifsin)) < 0) { + LogPrintf(LogERROR, "Tcp: bind: %s\n", strerror(errno)); + if (errno == EADDRINUSE && VarTerm) + fprintf(VarTerm, "Wait for a while, then try again.\n"); + close(s); + return 6; + } + if (listen(s, 5) != 0) { + LogPrintf(LogERROR, "Tcp: Unable to listen to socket - OS overload?\n"); + close(s); + return 7; + } + ServerClose(); + server = s; + LogPrintf(LogPHASE, "Listening at port %d.\n", port); + return 0; } void |