mirror of
https://github.com/OpenVPN/openvpn.git
synced 2025-05-08 21:25:53 +08:00
Fixed race condition in management interface recv code on
Windows, where sending a set of several commands to the management interface in quick succession might cause the latter commands in the set to be ignored. Increased management interface input command buffer size from 256 to 1024 bytes. Minor tweaks to Windows build system. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@4414 e7ae566f-a301-0410-adde-c780ea21d3b5
This commit is contained in:
parent
423037e9fb
commit
1b3842c6c9
@ -7,7 +7,7 @@
|
||||
|
||||
GUI="$OPENVPN_GUI_DIR/$OPENVPN_GUI"
|
||||
|
||||
if [ -e "$GUI" ]; then
|
||||
if [ -f "$GUI" ]; then
|
||||
mkdir -p $GENOUT/bin &>/dev/null
|
||||
cp $GUI $GENOUT/bin
|
||||
if [ -d "$SIGNTOOL" ]; then
|
||||
@ -15,7 +15,7 @@ if [ -e "$GUI" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -e "$GENOUT/bin/$OPENVPN_GUI" ]; then
|
||||
if [ -f "$GENOUT/bin/$OPENVPN_GUI" ]; then
|
||||
echo '!define OPENVPN_GUI_DEFINED' >autodefs/guidefs.nsi
|
||||
else
|
||||
cat /dev/null >autodefs/guidefs.nsi
|
||||
|
@ -41,7 +41,7 @@ cp install-win32/setpath.nsi $n
|
||||
cp install-win32/GetWindowsVersion.nsi $n
|
||||
|
||||
if [ -n "$EXTRACT_FILES" ]; then
|
||||
cp install-win32/MultiFileExtract.nsi $n
|
||||
cp "$EXTRACT_FILES/MultiFileExtract.nsi" $n
|
||||
fi
|
||||
|
||||
# get OpenVPN client config files
|
||||
|
5
manage.c
5
manage.c
@ -1914,7 +1914,7 @@ man_connection_init (struct management *man)
|
||||
* Allocate helper objects for command line input and
|
||||
* command output from/to the socket.
|
||||
*/
|
||||
man->connection.in = command_line_new (256);
|
||||
man->connection.in = command_line_new (1024);
|
||||
man->connection.out = buffer_list_new (0);
|
||||
|
||||
/*
|
||||
@ -2323,7 +2323,8 @@ management_io (struct management *man)
|
||||
{
|
||||
if (net_events & FD_READ)
|
||||
{
|
||||
man_read (man);
|
||||
while (man_read (man) > 0)
|
||||
;
|
||||
net_event_win32_clear_selected_events (&man->connection.ne32, FD_READ);
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user