Author: phater
Date: Thu Nov 3 14:53:00 2016
New Revision: 73109
URL: http://svn.reactos.org/svn/reactos?rev=73109&view=rev
Log:
[TCPIP] Always copy back bind IP in connection. Spotted by Thomas. Thanks
CORE-12152
Modified:
trunk/reactos/sdk/lib/drivers/ip/transport/tcp/tcp.c
Modified: trunk/reactos/sdk/lib/drivers/ip/transport/tcp/tcp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/ip/transpo…
==============================================================================
--- trunk/reactos/sdk/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Thu Nov 3 14:53:00 2016
@@ -337,12 +337,8 @@
if (NT_SUCCESS(Status))
{
- /* Check if we had an unspecified address */
- if (Connection->AddressFile->Address.Address.IPv4Address != bindaddr.addr)
- {
- /* We did, so we need to copy back the address */
- Connection->AddressFile->Address.Address.IPv4Address = bindaddr.addr;
- }
+ /* Copy bind address into connection */
+ Connection->AddressFile->Address.Address.IPv4Address = bindaddr.addr;
/* Check if we had an unspecified port */
if (!Connection->AddressFile->Port)
{
Author: hbelusca
Date: Wed Nov 2 21:49:50 2016
New Revision: 73105
URL: http://svn.reactos.org/svn/reactos?rev=73105&view=rev
Log:
[BOOTDATA]: Fix the indentation of the file(..) commands, noted by Thomas.
Modified:
trunk/reactos/boot/CMakeLists.txt
Modified: trunk/reactos/boot/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=73…
==============================================================================
--- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Wed Nov 2 21:49:50 2016
@@ -20,10 +20,10 @@
DEPENDS native-fatten fat bootmgfw bcd_hive
VERBATIM)
-if(USE_MKISOFS)
# Create an 'empty' directory (guaranteed to be empty) to be able to add
# arbitrary empty directories to the ISO image using mkisofs.
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/empty)
+if(USE_MKISOFS)
+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/empty)
endif()
# Retrieve the full paths to the generated files of the 'isoboot', 'isobtrt' and 'efisys' targets
@@ -31,7 +31,6 @@
set(_isobtrt_file ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isobtrt.bin) # get_target_property(_isobtrt_file isobtrt LOCATION)
set(_efisys_file ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin) # get_target_property(_efisys_file efisys LOCATION)
-if(USE_MKISOFS)
# Create a mkisofs sort file to specify an explicit ordering for the boot files
# to place them at the beginning of the image (makes ISO image analysis easier).
# See mkisofs/schilytools/mkisofs/README.sort for more details.
@@ -46,8 +45,9 @@
# - the boot catalog file path is meaningful;
# - since its contents are included by mkisofs in the root of the ISO image,
# using the empty directory ensures that no extra unwanted files are added.
-#
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort "\
+#
+if(USE_MKISOFS)
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort "\
${CMAKE_CURRENT_BINARY_DIR}/empty/boot.catalog 4
${_isoboot_file} 3
${_isobtrt_file} 2
@@ -64,7 +64,7 @@
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.lst "")
if(USE_MKISOFS)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n")
add_custom_target(bootcd
COMMAND native-mkisofs -o ${REACTOS_BINARY_DIR}/bootcd.iso -iso-level 4
@@ -86,7 +86,7 @@
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.lst "")
if(USE_MKISOFS)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n")
add_custom_target(bootcdregtest
COMMAND native-mkisofs -o ${REACTOS_BINARY_DIR}/bootcdregtest.iso -iso-level 4
@@ -108,7 +108,7 @@
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "")
if(USE_MKISOFS)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n")
# Create the empty Desktop, Favorites, and Start Menu folders
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
@@ -140,7 +140,7 @@
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "")
if(USE_MKISOFS)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n")
# Create the empty Desktop, Favorites, and Start Menu folders
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
Author: hbelusca
Date: Wed Nov 2 21:43:46 2016
New Revision: 73104
URL: http://svn.reactos.org/svn/reactos?rev=73104&view=rev
Log:
[BOOTDATA]: Diverse improvements for mkisofs support and ISO image configuration:
- Make our build system create the required empty directory for mkisofs, instead. (It's not the purpose of the SVN to hold special files/directories just to make host tools happy; instead it's the job of the buld system to create them.)
- Place the boot files (catalog & co.) preferably at the beginning of the ISO image (it makes ISO image analysis easier, and is back-compatible with cdmake & oscdimg & windows ISOs): use the build system to generate the mkisofs sorting file. See the CMakeLists.txt for more details.
- Set in one place the ISO manufacturer & volume name strings so that it makes easier to bulk-change them (and makes features like CORE-12233 a bit easier to maintain).
- The EFI image must be set up with no emulation mode! (See section "12.3.2.1 ISO-9660 and El Torito" of the UEFI spec v2.4 errata B, for example).
[MKISOFS]: Add some useful offline documentation.
CORE-11988
Added:
trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.compression (with props)
trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.eltorito (with props)
trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.hide (with props)
trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.joliet (with props)
trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.sort (with props)
trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.ps
Removed:
trunk/reactos/boot/bootdata/empty/
Modified:
trunk/reactos/boot/CMakeLists.txt
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/reactos/boot/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=73…
Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.compression
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto…
Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.eltorito
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto…
Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.hide
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto…
Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.joliet
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto…
Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.sort
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto…
Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.ps
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto…