From 06c920c4be566bd815045fb4e3cac22fcf63a238 Mon Sep 17 00:00:00 2001 From: Kei Date: Wed, 19 Apr 2017 13:18:19 +0900 Subject: [PATCH] Add inactivity time function in Server/Mixed Mode --- README.md | 4 +- WIZ550S2E_App/Release/makefile | 69 --------------------- WIZ550S2E_App/src/S2E/S2E.c | 6 ++ WIZ550S2E_App/src/common.h | 2 +- WIZ550S2E_Boot/Release/makefile | 56 ----------------- lpc_chip_11exx/Release/makefile | 50 --------------- wiznet_s2e_wiz550s2e_board/Release/makefile | 50 --------------- 7 files changed, 10 insertions(+), 227 deletions(-) delete mode 100644 WIZ550S2E_App/Release/makefile delete mode 100644 WIZ550S2E_Boot/Release/makefile delete mode 100644 lpc_chip_11exx/Release/makefile delete mode 100644 wiznet_s2e_wiz550s2e_board/Release/makefile diff --git a/README.md b/README.md index 8146421..a79f0f3 100644 --- a/README.md +++ b/README.md @@ -169,4 +169,6 @@ v1.1.0 - ioLibrary Update - Dependency Removal (remove "board.h" in "w5500.h") - Remove garbage file - \ No newline at end of file + +v1.1.1 +- Add inactivity time function in Server/Mixed Mode \ No newline at end of file diff --git a/WIZ550S2E_App/Release/makefile b/WIZ550S2E_App/Release/makefile deleted file mode 100644 index 0a37c68..0000000 --- a/WIZ550S2E_App/Release/makefile +++ /dev/null @@ -1,69 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - --include ../makefile.init - -RM := rm -rf - -# All of the sources participating in the build are defined here --include sources.mk --include src/netutil/subdir.mk --include src/callback/subdir.mk --include src/S2E/subdir.mk --include src/PlatformHandler/subdir.mk --include src/Internet/httpServer/subdir.mk --include src/Internet/TFTP/subdir.mk --include src/Internet/SNTP/subdir.mk --include src/Internet/SNMP/subdir.mk --include src/Internet/MQTT/MQTTPacket/src/subdir.mk --include src/Internet/MQTT/subdir.mk --include src/Internet/FTPServer/subdir.mk --include src/Internet/FTPClient/subdir.mk --include src/Internet/DNS/subdir.mk --include src/Internet/DHCP/subdir.mk --include src/Ethernet/W5500/subdir.mk --include src/Ethernet/subdir.mk --include src/Configuration/subdir.mk --include src/ATcmd/library/subdir.mk --include src/ATcmd/subdir.mk --include src/subdir.mk --include subdir.mk --include objects.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif -endif - --include ../makefile.defs - -# Add inputs and outputs from these tool invocations to the build variables - -# All Target -all: WIZ550S2E_App.axf - -# Tool invocations -WIZ550S2E_App.axf: $(OBJS) $(USER_OBJS) - @echo 'Building target: $@' - @echo 'Invoking: MCU Linker' - arm-none-eabi-gcc -nostdlib -L"D:\__Workspace\___Source\WIZnet\WIZ550S2E\wiznet_s2e_wiz550s2e_board\Release" -L"D:\__Workspace\___Source\WIZnet\WIZ550S2E\lpc_chip_11exx\Release" -Xlinker -Map="WIZ550S2E_App.map" -Xlinker --gc-sections -Xlinker --allow-multiple-definition -mcpu=cortex-m0 -mthumb -T "WIZ550S2E.ld" -L ../linkscripts -o "WIZ550S2E_App.axf" $(OBJS) $(USER_OBJS) $(LIBS) - @echo 'Finished building target: $@' - @echo ' ' - $(MAKE) --no-print-directory post-build - -# Other Targets -clean: - -$(RM) $(OBJS)$(C_DEPS)$(EXECUTABLES) WIZ550S2E_App.axf - -@echo ' ' - -post-build: - -@echo 'Performing post-build steps' - -arm-none-eabi-size "WIZ550S2E_App.axf" ; arm-none-eabi-objcopy -O ihex "WIZ550S2E_App.axf" "WIZ550S2E_App.hex" ; arm-none-eabi-objcopy -v -O binary "WIZ550S2E_App.axf" "WIZ550S2E_App.bin" ; # checksum -p LPC11E36_501 -d "WIZ550S2E_App.bin" - -@echo ' ' - -.PHONY: all clean dependents -.SECONDARY: post-build - --include ../makefile.targets diff --git a/WIZ550S2E_App/src/S2E/S2E.c b/WIZ550S2E_App/src/S2E/S2E.c index f98d922..7182924 100644 --- a/WIZ550S2E_App/src/S2E/S2E.c +++ b/WIZ550S2E_App/src/S2E/S2E.c @@ -527,6 +527,12 @@ static void s2e_sockestablished_process(uint8_t sock) auth_process(sock); return; } + if((inactive_flag == 0) && net->inactivity) + inactive_flag = 1; + else if(inactive_flag == 2) { + inactive_flag = 0; + disconnect(sock); + } case TCP_CLIENT_MODE: if((inactive_flag == 0) && net->inactivity) inactive_flag = 1; diff --git a/WIZ550S2E_App/src/common.h b/WIZ550S2E_App/src/common.h index 87c5fa6..c83ea21 100644 --- a/WIZ550S2E_App/src/common.h +++ b/WIZ550S2E_App/src/common.h @@ -9,7 +9,7 @@ #define MAJOR_VER 1 #define MINOR_VER 1 -#define MAINTENANCE_VER 0 +#define MAINTENANCE_VER 1 #define SOCK_DATA 0 #define SOCK_CONFIG 1 diff --git a/WIZ550S2E_Boot/Release/makefile b/WIZ550S2E_Boot/Release/makefile deleted file mode 100644 index 7102de5..0000000 --- a/WIZ550S2E_Boot/Release/makefile +++ /dev/null @@ -1,56 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - --include ../makefile.init - -RM := rm -rf - -# All of the sources participating in the build are defined here --include sources.mk --include src/netutil/subdir.mk --include src/PlatformHandler/subdir.mk --include src/Internet/TFTP/subdir.mk --include src/Ethernet/W5500/subdir.mk --include src/Ethernet/subdir.mk --include src/Configuration/subdir.mk --include src/subdir.mk --include subdir.mk --include objects.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif -endif - --include ../makefile.defs - -# Add inputs and outputs from these tool invocations to the build variables - -# All Target -all: WIZ550S2E_Boot.axf - -# Tool invocations -WIZ550S2E_Boot.axf: $(OBJS) $(USER_OBJS) - @echo 'Building target: $@' - @echo 'Invoking: MCU Linker' - arm-none-eabi-gcc -nostdlib -L"D:\__Workspace\___Source\WIZnet\WIZ550S2E\wiznet_s2e_wiz550s2e_board\Release" -L"D:\__Workspace\___Source\WIZnet\WIZ550S2E\lpc_chip_11exx\Release" -Xlinker -Map="WIZ550S2E_Boot.map" -Xlinker --gc-sections -Xlinker --allow-multiple-definition -mcpu=cortex-m0 -mthumb -T "Bootloader.ld" -L ../linkscripts -o "WIZ550S2E_Boot.axf" $(OBJS) $(USER_OBJS) $(LIBS) - @echo 'Finished building target: $@' - @echo ' ' - $(MAKE) --no-print-directory post-build - -# Other Targets -clean: - -$(RM) $(OBJS)$(C_DEPS)$(EXECUTABLES) WIZ550S2E_Boot.axf - -@echo ' ' - -post-build: - -@echo 'Performing post-build steps' - -arm-none-eabi-size "WIZ550S2E_Boot.axf"; arm-none-eabi-objcopy -O ihex "WIZ550S2E_Boot.axf" "WIZ550S2E_Boot.hex"; # arm-none-eabi-objcopy -v -O binary "WIZ550S2E_Boot.axf" "WIZ550S2E_Boot.bin" ; # checksum -p LPC11E36_501 -d "WIZ550S2E_Boot.bin"; - -@echo ' ' - -.PHONY: all clean dependents -.SECONDARY: post-build - --include ../makefile.targets diff --git a/lpc_chip_11exx/Release/makefile b/lpc_chip_11exx/Release/makefile deleted file mode 100644 index ac4ffa2..0000000 --- a/lpc_chip_11exx/Release/makefile +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - --include ../makefile.init - -RM := rm -rf - -# All of the sources participating in the build are defined here --include sources.mk --include src/subdir.mk --include subdir.mk --include objects.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif -endif - --include ../makefile.defs - -# Add inputs and outputs from these tool invocations to the build variables - -# All Target -all: liblpc_chip_11exx.a - -# Tool invocations -liblpc_chip_11exx.a: $(OBJS) $(USER_OBJS) - @echo 'Building target: $@' - @echo 'Invoking: MCU Archiver' - arm-none-eabi-ar -r "liblpc_chip_11exx.a" $(OBJS) $(USER_OBJS) $(LIBS) - @echo 'Finished building target: $@' - @echo ' ' - $(MAKE) --no-print-directory post-build - -# Other Targets -clean: - -$(RM) $(OBJS)$(C_DEPS)$(ARCHIVES) liblpc_chip_11exx.a - -@echo ' ' - -post-build: - -@echo 'Performing post-build steps' - -arm-none-eabi-size "liblpc_chip_11exx.a" ; # arm-none-eabi-objdump -h -S "liblpc_chip_11exx.a" >"liblpc_chip_11exx.lss" - -@echo ' ' - -.PHONY: all clean dependents -.SECONDARY: post-build - --include ../makefile.targets diff --git a/wiznet_s2e_wiz550s2e_board/Release/makefile b/wiznet_s2e_wiz550s2e_board/Release/makefile deleted file mode 100644 index f45c52e..0000000 --- a/wiznet_s2e_wiz550s2e_board/Release/makefile +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - --include ../makefile.init - -RM := rm -rf - -# All of the sources participating in the build are defined here --include sources.mk --include src/subdir.mk --include subdir.mk --include objects.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif -endif - --include ../makefile.defs - -# Add inputs and outputs from these tool invocations to the build variables - -# All Target -all: libwiznet_s2e_wiz550s2e_board.a - -# Tool invocations -libwiznet_s2e_wiz550s2e_board.a: $(OBJS) $(USER_OBJS) - @echo 'Building target: $@' - @echo 'Invoking: MCU Archiver' - arm-none-eabi-ar -r "libwiznet_s2e_wiz550s2e_board.a" $(OBJS) $(USER_OBJS) $(LIBS) - @echo 'Finished building target: $@' - @echo ' ' - $(MAKE) --no-print-directory post-build - -# Other Targets -clean: - -$(RM) $(OBJS)$(C_DEPS)$(ARCHIVES) libwiznet_s2e_wiz550s2e_board.a - -@echo ' ' - -post-build: - -@echo 'Performing post-build steps' - -arm-none-eabi-size "libwiznet_s2e_wiz550s2e_board.a" ; # arm-none-eabi-objdump -h -S "libwiznet_s2e_wiz550s2e_board.a" >"libwiznet_s2e_wiz550s2e_board.lss" - -@echo ' ' - -.PHONY: all clean dependents -.SECONDARY: post-build - --include ../makefile.targets