diff options
author | Diego Nehab <diego.nehab@gmail.com> | 2015-10-05 10:28:54 +0800 |
---|---|---|
committer | Diego Nehab <diego.nehab@gmail.com> | 2015-10-05 10:28:54 +0800 |
commit | d1ec29be7f982db75864155dd61a058902e1cae2 (patch) | |
tree | f80a07cb960e2689d4112aeef46b5a2e6bbc42c1 /src/tcp.c | |
parent | 4110e4125dace9df3a744067066e5dee62670561 (diff) | |
parent | f4b472007324a65109a86e32e03971339b9fe951 (diff) | |
download | luasocket-d1ec29be7f982db75864155dd61a058902e1cae2.tar.gz luasocket-d1ec29be7f982db75864155dd61a058902e1cae2.tar.bz2 luasocket-d1ec29be7f982db75864155dd61a058902e1cae2.zip |
Merge branch 'KateAdams-tcp_reuseport'
Diffstat (limited to 'src/tcp.c')
-rw-r--r-- | src/tcp.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -73,6 +73,7 @@ static luaL_Reg tcp_methods[] = { | |||
73 | static t_opt optget[] = { | 73 | static t_opt optget[] = { |
74 | {"keepalive", opt_get_keepalive}, | 74 | {"keepalive", opt_get_keepalive}, |
75 | {"reuseaddr", opt_get_reuseaddr}, | 75 | {"reuseaddr", opt_get_reuseaddr}, |
76 | {"reuseport", opt_get_reuseport}, | ||
76 | {"tcp-nodelay", opt_get_tcp_nodelay}, | 77 | {"tcp-nodelay", opt_get_tcp_nodelay}, |
77 | {"linger", opt_get_linger}, | 78 | {"linger", opt_get_linger}, |
78 | {"error", opt_get_error}, | 79 | {"error", opt_get_error}, |
@@ -82,6 +83,7 @@ static t_opt optget[] = { | |||
82 | static t_opt optset[] = { | 83 | static t_opt optset[] = { |
83 | {"keepalive", opt_set_keepalive}, | 84 | {"keepalive", opt_set_keepalive}, |
84 | {"reuseaddr", opt_set_reuseaddr}, | 85 | {"reuseaddr", opt_set_reuseaddr}, |
86 | {"reuseport", opt_set_reuseport}, | ||
85 | {"tcp-nodelay", opt_set_tcp_nodelay}, | 87 | {"tcp-nodelay", opt_set_tcp_nodelay}, |
86 | {"ipv6-v6only", opt_set_ip6_v6only}, | 88 | {"ipv6-v6only", opt_set_ip6_v6only}, |
87 | {"linger", opt_set_linger}, | 89 | {"linger", opt_set_linger}, |