diff options
| -rw-r--r-- | common-runopts.c | 4 | ||||
| -rw-r--r-- | dbutil.h | 6 | ||||
| -rwxr-xr-x | release.sh | 40 | ||||
| -rw-r--r-- | runopts.h | 2 | ||||
| -rw-r--r-- | svr-runopts.c | 2 | ||||
| -rw-r--r-- | tcpfwd.h | 3 |
6 files changed, 49 insertions, 8 deletions
diff --git a/common-runopts.c b/common-runopts.c index cdac77e..4c07e1f 100644 --- a/common-runopts.c +++ b/common-runopts.c @@ -106,8 +106,8 @@ parse_ciphers_macs() } #endif -void print_version(const char* name) { - fprintf(stderr, "Dropbear %s v%s\n", name, DROPBEAR_VERSION); +void print_version() { + fprintf(stderr, "Dropbear v%s\n", DROPBEAR_VERSION); } @@ -62,9 +62,9 @@ extern int debug_trace; #endif enum dropbear_prio { - DROPBEAR_PRIO_DEFAULT = 'dffd', - DROPBEAR_PRIO_LOWDELAY = 'lddl', - DROPBEAR_PRIO_BULK = 'bllb', + DROPBEAR_PRIO_DEFAULT = 10, + DROPBEAR_PRIO_LOWDELAY = 11, + DROPBEAR_PRIO_BULK = 12, }; char * stripcontrol(const char * text); diff --git a/release.sh b/release.sh new file mode 100755 index 0000000..53bbd61 --- /dev/null +++ b/release.sh @@ -0,0 +1,40 @@ +#!/bin/sh +VERSION=$(echo '#include "sysoptions.h"\necho DROPBEAR_VERSION' | cpp - | sh) +echo Releasing version "$VERSION" ... +if ! head -n1 CHANGES | grep -q $VERSION ; then + echo "CHANGES needs updating" + exit 1 +fi + +if ! head -n1 debian/changelog | grep -q $VERSION ; then + echo "CHANGES needs updating" + exit 1 +fi + +head -n1 CHANGES + +#sleep 3 + +RELDIR=$PWD/../dropbear-$VERSION +ARCHIVE=${RELDIR}.tar.bz2 +if test -e $RELDIR; then + echo "$RELDIR exists" + exit 1 +fi + +if test -e $ARCHIVE; then + echo "$ARCHIVE exists" + exit 1 +fi + +hg archive "$RELDIR" || exit 2 + +(cd "$RELDIR" && autoconf && autoheader) || exit 2 + +rm -r "$RELDIR/autom4te.cache" || exit 2 + +(cd $RELDIR/.. && tar czf $ARCHIVE `basename "$RELDIR"`) || exit 2 + +ls -l $ARCHIVE +openssl sha1 $ARCHIVE +echo "Done to $ARCHIVE" @@ -164,6 +164,6 @@ void cli_getopts(int argc, char ** argv); void parse_ciphers_macs(); #endif -void print_version(const char* name); +void print_version(void); #endif /* _RUNOPTS_H_ */ diff --git a/svr-runopts.c b/svr-runopts.c index ad946bc..8380de3 100644 --- a/svr-runopts.c +++ b/svr-runopts.c @@ -268,7 +268,7 @@ void svr_getopts(int argc, char ** argv) { break; #endif case 'V': - print_version("server"); + print_version(); exit(EXIT_SUCCESS); break; default: @@ -72,6 +72,7 @@ void cli_recv_msg_request_failure(); int listen_tcpfwd(struct TCPListener* tcpinfo); int tcp_prio_inithandler(struct Channel* chan); -#define CHANNEL_ID_TCPFORWARDED 'tcpf' +/* A random identifier */ +#define CHANNEL_ID_TCPFORWARDED 0x43612c67 #endif |