mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-01-30 12:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug from patch #5865 by moving the defines for socket options (lwip_set/-getsockopt) used with level IPPROTO_TCP from tcp.h to sockets.h.

Browse Source
This commit is contained in:
goldsimon 2007-05-13 14:34:02 +00:00
parent bd570561e8
commit efd3104fd0
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -153,6 +153,11 @@ HISTORY
++ Bug fixes: ++ Bug fixes:
2007-05-13 Simon Goldschmidt
* tcp.h, sockets.h, sockets.c: Fixed bug from patch #5865 by moving the defines
for socket options (lwip_set/-getsockopt) used with level IPPROTO_TCP from
tcp.h to sockets.h.
2007-05-07 Simon Goldschmidt 2007-05-07 Simon Goldschmidt
* mem.c: Another attempt to fix bug #17922. * mem.c: Another attempt to fix bug #17922.

5
src/api/sockets.c
View File

@ -32,6 +32,8 @@
* *
*/ */
#include "lwip/sockets.h"
#include <string.h> #include <string.h>
#include "lwip/opt.h" #include "lwip/opt.h"
@ -39,7 +41,8 @@
#include "lwip/arch.h" #include "lwip/arch.h"
#include "lwip/sys.h" #include "lwip/sys.h"
#include "lwip/igmp.h" #include "lwip/igmp.h"
#include "lwip/sockets.h" #include "lwip/inet.h"
#include "lwip/tcp.h"
#define NUM_SOCKETS MEMP_NUM_NETCONN #define NUM_SOCKETS MEMP_NUM_NETCONN

15
src/include/lwip/sockets.h
View File

@ -35,8 +35,7 @@
#define __LWIP_SOCKETS_H__ #define __LWIP_SOCKETS_H__
#include "lwip/ip_addr.h" #include "lwip/ip_addr.h"
#include "opt.h" #include "lwip/opt.h"
#include "tcp.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -131,8 +130,18 @@ struct linger {
#define IP_TOS 1 #define IP_TOS 1
#define IP_TTL 2 #define IP_TTL 2
#if LWIP_TCP
/*
* Options for level IPPROTO_TCP
*/
#define TCP_NODELAY 0x01 /* don't delay send to coalesce packets */
#define TCP_KEEPALIVE 0x02 /* send KEEPALIVE probes when idle for pcb->keep_idle milliseconds */
#define TCP_KEEPIDLE 0x03 /* set pcb->keep_idle - Same as TCP_KEEPALIVE, but use seconds for get/setsockopt*/
#define TCP_KEEPINTVL 0x04 /* set pcb->keep_intvl - Use seconds for get/setsockopt */
#define TCP_KEEPCNT 0x05 /* set pcb->keep_cnt - Use number of probes sent for get/setsockopt */
#endif /* LWIP_TCP */
#ifdef LWIP_IGMP #if LWIP_IGMP
/* /*
* Options and types for UDP multicast traffic handling * Options and types for UDP multicast traffic handling
*/ */

10
src/include/lwip/tcp.h
View File

@ -155,16 +155,6 @@ void tcp_rexmit_rto (struct tcp_pcb *pcb);
#define TCP_MSL 60000U /* The maximum segment lifetime in microseconds */ #define TCP_MSL 60000U /* The maximum segment lifetime in microseconds */
/*
* User-settable options (used with setsockopt).
*/
#define TCP_NODELAY 0x01 /* don't delay send to coalesce packets */
#define TCP_KEEPALIVE 0x02 /* send KEEPALIVE probes when idle for pcb->keep_idle milliseconds */
#define TCP_KEEPIDLE 0x03 /* set pcb->keep_idle - Same as TCP_KEEPALIVE, but use seconds for get/setsockopt*/
#define TCP_KEEPINTVL 0x04 /* set pcb->keep_intvl - Use seconds for get/setsockopt */
#define TCP_KEEPCNT 0x05 /* set pcb->keep_cnt - Use number of probes sent for get/setsockopt */
/* Keepalive values, compliant with RFC 1122. Don't change this unless you know what you're doing */ /* Keepalive values, compliant with RFC 1122. Don't change this unless you know what you're doing */
#ifndef TCP_KEEPIDLE_DEFAULT #ifndef TCP_KEEPIDLE_DEFAULT
#define TCP_KEEPIDLE_DEFAULT 7200000UL /* Default KEEPALIVE timer in milliseconds */ #define TCP_KEEPIDLE_DEFAULT 7200000UL /* Default KEEPALIVE timer in milliseconds */