neozeed ircu2.9.32-linux-hacks.diff
This commit is contained in:
31
ircd/s_bsd.c
31
ircd/s_bsd.c
@@ -48,6 +48,7 @@ Computing Center and Jarkko Oikarinen";
|
||||
#include <sys/socket.h>
|
||||
#include <sys/file.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/stat.h>
|
||||
#if defined(SOL20)
|
||||
#include <sys/filio.h>
|
||||
#endif
|
||||
@@ -172,7 +173,8 @@ aClient *cptr;
|
||||
{
|
||||
Reg1 int errtmp = errno; /* debug may change 'errno' */
|
||||
Reg2 char *host;
|
||||
int err, len = sizeof(err);
|
||||
int err;
|
||||
socklen_t len = sizeof(err);
|
||||
extern char *strerror();
|
||||
|
||||
host = (cptr) ? get_client_name(cptr, FALSE) : "";
|
||||
@@ -211,7 +213,8 @@ char *name;
|
||||
int port;
|
||||
{
|
||||
static struct sockaddr_in server;
|
||||
int ad[4], len = sizeof(server), opt;
|
||||
socklen_t len = sizeof(server);
|
||||
int ad[4], opt;
|
||||
char ipname[20];
|
||||
#ifdef VIRTUAL_HOST
|
||||
struct hostent *hep;
|
||||
@@ -512,7 +515,7 @@ void init_sys()
|
||||
# endif
|
||||
{
|
||||
(void)fprintf(stderr,"ircd fd table too big\n");
|
||||
(void)fprintf(stderr,"Hard Limit: %d IRC max: %d\n",
|
||||
(void)fprintf(stderr,"Hard Limit: %lu IRC max: %d\n",
|
||||
limit.rlim_max, MAXCONNECTIONS);
|
||||
(void)fprintf(stderr,"Fix MAXCONNECTIONS\n");
|
||||
exit(-1);
|
||||
@@ -521,7 +524,7 @@ void init_sys()
|
||||
limit.rlim_cur = limit.rlim_max; /* make soft limit the max */
|
||||
if (setrlimit(RLIMIT_FD_MAX, &limit) == -1)
|
||||
{
|
||||
(void)fprintf(stderr,"error setting max fd's to %d\n",
|
||||
(void)fprintf(stderr,"error setting max fd's to %lu\n",
|
||||
limit.rlim_cur);
|
||||
exit(-1);
|
||||
}
|
||||
@@ -630,7 +633,7 @@ Reg1 aClient *cptr;
|
||||
Reg2 char *sockn;
|
||||
{
|
||||
struct sockaddr_in sk;
|
||||
int len = sizeof(struct sockaddr_in);
|
||||
socklen_t len = sizeof(struct sockaddr_in);
|
||||
|
||||
#ifdef UNIXPORT
|
||||
if (IsUnixSocket(cptr))
|
||||
@@ -1148,7 +1151,7 @@ static void set_sock_opts(fd, cptr)
|
||||
int fd;
|
||||
aClient *cptr;
|
||||
{
|
||||
int opt;
|
||||
socklen_t opt;
|
||||
#ifdef SO_REUSEADDR
|
||||
opt = 1;
|
||||
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (OPT_TYPE *)&opt, sizeof(opt)) < 0)
|
||||
@@ -1194,7 +1197,7 @@ aClient *cptr;
|
||||
else if (opt > 0 && opt != sizeof(readbuf) / 8)
|
||||
{
|
||||
for (*readbuf = '\0'; opt > 0; opt--, s+= 3)
|
||||
(void)sprintf(s, "%02.2x:", *t++);
|
||||
(void)sprintf(s, "%02x:", *t++);
|
||||
*s = '\0';
|
||||
sendto_ops("Connection %s using IP opts: (%s)",
|
||||
get_client_name(cptr, TRUE), readbuf);
|
||||
@@ -1209,7 +1212,8 @@ aClient *cptr;
|
||||
int get_sockerr(cptr)
|
||||
aClient *cptr;
|
||||
{
|
||||
int errtmp = errno, err = 0, len = sizeof(err);
|
||||
int errtmp = errno, err = 0;
|
||||
socklen_t len = sizeof(err);
|
||||
#ifdef SO_ERROR
|
||||
if (cptr->fd >= 0)
|
||||
if (!getsockopt(cptr->fd, SOL_SOCKET, SO_ERROR, (OPT_TYPE *)&err, &len))
|
||||
@@ -1287,7 +1291,7 @@ int fd;
|
||||
{
|
||||
Reg1 char *s, *t;
|
||||
struct sockaddr_in addr;
|
||||
int len = sizeof(struct sockaddr_in);
|
||||
socklen_t len = sizeof(struct sockaddr_in);
|
||||
|
||||
if (getpeername(fd, (struct sockaddr *) &addr, &len) == -1)
|
||||
{
|
||||
@@ -2389,10 +2393,10 @@ int len;
|
||||
** later for making the right one is used
|
||||
** for connecting to other hosts.
|
||||
*/
|
||||
if (!mycmp(me.name, tmp))
|
||||
if (!strcasecmp(me.name, tmp))
|
||||
break;
|
||||
}
|
||||
if (mycmp(me.name, tmp))
|
||||
if (strcasecmp(me.name, tmp))
|
||||
strncpyzt(name, hp->h_name, len);
|
||||
else
|
||||
strncpyzt(name, tmp, len);
|
||||
@@ -2473,7 +2477,8 @@ static void polludp()
|
||||
{
|
||||
Reg1 char *s;
|
||||
struct sockaddr_in from;
|
||||
int n, fromlen = sizeof(from);
|
||||
socklen_t fromlen = sizeof(from);
|
||||
int n;
|
||||
static time_t last = 0;
|
||||
static int cnt = 0, mlen = 0;
|
||||
|
||||
@@ -2579,7 +2584,7 @@ static void do_dns_async()
|
||||
if (hp)
|
||||
{
|
||||
bcopy(hp->h_addr, (char *)&cptr->ip, sizeof(struct in_addr));
|
||||
if (ping_server(cptr, NULL, hp) == -1)
|
||||
if (ping_server(cptr, hp) == -1)
|
||||
end_ping(cptr);
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user