ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-04-05 05:09:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for -pedantic -ansi compilation, change // to /**/, plus some signedness

Browse Source 
and trailing-comma-in-array issues

--HG--
extra : convert_revision : c22be8b8f570b48e9662dac32c7b3e7148a42206
This commit is contained in:
Matt Johnston 2007-02-16 14:42:08 +00:00
parent 41fd735d4b
commit 7f12251fbb
8 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli-session.c
View File

@ -215,8 +215,8 @@ static void cli_sessionloop() {
if (cli_opts.backgrounded) { if (cli_opts.backgrounded) {
int devnull; int devnull;
// keeping stdin open steals input from the terminal and /* keeping stdin open steals input from the terminal and
// is confusing, though stdout/stderr could be useful. is confusing, though stdout/stderr could be useful. */
devnull = open(_PATH_DEVNULL, O_RDONLY); devnull = open(_PATH_DEVNULL, O_RDONLY);
if (devnull < 0) { if (devnull < 0) {
dropbear_exit("opening /dev/null: %d %s", dropbear_exit("opening /dev/null: %d %s",

4
common-channel.c
View File

@ -461,7 +461,7 @@ void setchannelfds(fd_set *readfds, fd_set *writefds) {
FD_SET(channel->writefd, writefds); FD_SET(channel->writefd, writefds);
} }
if (ERRFD_IS_WRITE(channel) != NULL && channel->errfd >= 0 if (ERRFD_IS_WRITE(channel) && channel->errfd >= 0
&& cbuf_getused(channel->extrabuf) > 0 ) { && cbuf_getused(channel->extrabuf) > 0 ) {
FD_SET(channel->errfd, writefds); FD_SET(channel->errfd, writefds);
} }
@ -640,7 +640,7 @@ static void send_msg_channel_data(struct Channel *channel, int isextended) {
/* If we receive less data than we requested when flushing, we've /* If we receive less data than we requested when flushing, we've
reached the equivalent of EOF */ reached the equivalent of EOF */
if (channel->flushing && len < maxlen) if (channel->flushing && len < (ssize_t)maxlen)
{ {
TRACE(("closing from channel, flushing out.")) TRACE(("closing from channel, flushing out."))
close_chan_fd(channel, fd, SHUT_RD); close_chan_fd(channel, fd, SHUT_RD);

8
dbutil.c
View File

@ -199,10 +199,10 @@ int dropbear_listen(const char* address, const char* port,
hints.ai_family = AF_UNSPEC; /* TODO: let them flag v4 only etc */ hints.ai_family = AF_UNSPEC; /* TODO: let them flag v4 only etc */
hints.ai_socktype = SOCK_STREAM; hints.ai_socktype = SOCK_STREAM;
// for calling getaddrinfo: /* for calling getaddrinfo:
// address == NULL and !AI_PASSIVE: local loopback address == NULL and !AI_PASSIVE: local loopback
// address == NULL and AI_PASSIVE: all interfaces address == NULL and AI_PASSIVE: all interfaces
// address != NULL: whatever the address says address != NULL: whatever the address says */
if (!address) { if (!address) {
TRACE(("dropbear_listen: local loopback")) TRACE(("dropbear_listen: local loopback"))
} else { } else {

2
random.c
View File

@ -214,7 +214,7 @@ void gen_random_mpint(mp_int *max, mp_int *rand) {
unsigned char *randbuf = NULL; unsigned char *randbuf = NULL;
unsigned int len = 0; unsigned int len = 0;
const char masks[] = {0xff, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f}; const unsigned char masks[] = {0xff, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f};
const int size_bits = mp_count_bits(max); const int size_bits = mp_count_bits(max);

6
session.h
View File

@ -190,8 +190,7 @@ typedef enum {
KEX_NOTHING, KEX_NOTHING,
KEXINIT_RCVD, KEXINIT_RCVD,
KEXDH_INIT_SENT, KEXDH_INIT_SENT,
KEXDONE, KEXDONE
} cli_kex_state; } cli_kex_state;
typedef enum { typedef enum {
@ -203,8 +202,7 @@ typedef enum {
USERAUTH_REQ_SENT, USERAUTH_REQ_SENT,
USERAUTH_FAIL_RCVD, USERAUTH_FAIL_RCVD,
USERAUTH_SUCCESS_RCVD, USERAUTH_SUCCESS_RCVD,
SESSION_RUNNING, SESSION_RUNNING
} cli_state; } cli_state;
struct clientsession { struct clientsession {

5
svr-main.c
View File

@ -125,8 +125,9 @@ void main_noinetd() {
int childsock; int childsock;
int childpipe[2]; int childpipe[2];
// Note: commonsetup() must happen before we daemon()ise. Otherwise /* Note: commonsetup() must happen before we daemon()ise. Otherwise
// daemon() will chdir("/"), and we won't be able to find local-dir hostkeys. daemon() will chdir("/"), and we won't be able to find local-dir
hostkeys. */
commonsetup(); commonsetup();
/* fork */ /* fork */

2
svr-session.c
View File

@ -188,7 +188,7 @@ void svr_dropbear_log(int priority, const char* format, va_list param) {
|| strftime(datestr, sizeof(datestr), "%b %d %H:%M:%S", || strftime(datestr, sizeof(datestr), "%b %d %H:%M:%S",
localtime(&timesec)) == 0) localtime(&timesec)) == 0)
{ {
// upon failure, just print the epoch-seconds time. /* upon failure, just print the epoch-seconds time. */
snprintf(datestr, sizeof(datestr), "%d", timesec); snprintf(datestr, sizeof(datestr), "%d", timesec);
} }
fprintf(stderr, "[%d] %s %s\n", getpid(), datestr, printbuf); fprintf(stderr, "[%d] %s %s\n", getpid(), datestr, printbuf);

2
tcp-accept.c
View File

@ -104,7 +104,7 @@ int listen_tcpfwd(struct TCPListener* tcpinfo) {
struct Listener *listener = NULL; struct Listener *listener = NULL;
int nsocks; int nsocks;
char* errstring = NULL; char* errstring = NULL;
// listen_spec = NULL indicates localhost /* listen_spec = NULL indicates localhost */
const char* listen_spec = NULL; const char* listen_spec = NULL;
TRACE(("enter listen_tcpfwd")) TRACE(("enter listen_tcpfwd"))