Commit 923fc908 authored by Matt Johnston's avatar Matt Johnston
Browse files

- Don't use multichar constants since recent gcc complains

- Add release script
- Simplify print_version
parent 83511fec
...@@ -106,8 +106,8 @@ parse_ciphers_macs() ...@@ -106,8 +106,8 @@ parse_ciphers_macs()
} }
#endif #endif
void print_version(const char* name) { void print_version() {
fprintf(stderr, "Dropbear %s v%s\n", name, DROPBEAR_VERSION); fprintf(stderr, "Dropbear v%s\n", DROPBEAR_VERSION);
} }
...@@ -62,9 +62,9 @@ extern int debug_trace; ...@@ -62,9 +62,9 @@ extern int debug_trace;
#endif #endif
enum dropbear_prio { enum dropbear_prio {
DROPBEAR_PRIO_DEFAULT = 'dffd', DROPBEAR_PRIO_DEFAULT = 10,
DROPBEAR_PRIO_LOWDELAY = 'lddl', DROPBEAR_PRIO_LOWDELAY = 11,
DROPBEAR_PRIO_BULK = 'bllb', DROPBEAR_PRIO_BULK = 12,
}; };
char * stripcontrol(const char * text); char * stripcontrol(const char * text);
......
#!/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); ...@@ -164,6 +164,6 @@ void cli_getopts(int argc, char ** argv);
void parse_ciphers_macs(); void parse_ciphers_macs();
#endif #endif
void print_version(const char* name); void print_version(void);
#endif /* _RUNOPTS_H_ */ #endif /* _RUNOPTS_H_ */
...@@ -268,7 +268,7 @@ void svr_getopts(int argc, char ** argv) { ...@@ -268,7 +268,7 @@ void svr_getopts(int argc, char ** argv) {
break; break;
#endif #endif
case 'V': case 'V':
print_version("server"); print_version();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;
default: default:
......
...@@ -72,6 +72,7 @@ void cli_recv_msg_request_failure(); ...@@ -72,6 +72,7 @@ void cli_recv_msg_request_failure();
int listen_tcpfwd(struct TCPListener* tcpinfo); int listen_tcpfwd(struct TCPListener* tcpinfo);
int tcp_prio_inithandler(struct Channel* chan); int tcp_prio_inithandler(struct Channel* chan);
#define CHANNEL_ID_TCPFORWARDED 'tcpf' /* A random identifier */
#define CHANNEL_ID_TCPFORWARDED 0x43612c67
#endif #endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment