summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/efl/efl_debugd.c1
-rw-r--r--src/examples/ecore/efl_net_server_example.c3
-rw-r--r--src/examples/ecore/efl_net_server_simple_example.c4
-rw-r--r--src/examples/ecore/efl_net_socket_ssl_server_example.c1
-rw-r--r--src/lib/ecore_con/ecore_con_legacy.c3
-rw-r--r--src/lib/ecore_con/efl_net_server_fd.c1
-rw-r--r--src/lib/ecore_con/efl_net_server_fd.eo2
-rw-r--r--src/lib/ecore_con/efl_net_server_ssl.eo2
-rw-r--r--src/lib/ecore_ipc/ecore_ipc.c2
9 files changed, 3 insertions, 16 deletions
diff --git a/src/bin/efl/efl_debugd.c b/src/bin/efl/efl_debugd.c
index cfd83e13ae..562bd822be 100644
--- a/src/bin/efl/efl_debugd.c
+++ b/src/bin/efl/efl_debugd.c
@@ -634,7 +634,6 @@ _remote_server_create(void)
634 634
635 { 635 {
636 Eo *inner_server = efl_net_server_simple_inner_server_get(_remote_server); 636 Eo *inner_server = efl_net_server_simple_inner_server_get(_remote_server);
637 efl_net_server_fd_close_on_exec_set(inner_server, EINA_TRUE);
638 efl_net_server_fd_reuse_address_set(inner_server, EINA_TRUE); 637 efl_net_server_fd_reuse_address_set(inner_server, EINA_TRUE);
639 } 638 }
640 efl_event_callback_add(_remote_server, EFL_NET_SERVER_EVENT_CLIENT_ADD, _client_add, NULL); 639 efl_event_callback_add(_remote_server, EFL_NET_SERVER_EVENT_CLIENT_ADD, _client_add, NULL);
diff --git a/src/examples/ecore/efl_net_server_example.c b/src/examples/ecore/efl_net_server_example.c
index c3b19ec3fc..277d4c9e1e 100644
--- a/src/examples/ecore/efl_net_server_example.c
+++ b/src/examples/ecore/efl_net_server_example.c
@@ -652,7 +652,6 @@ main(int argc, char **argv)
652 if (cls == EFL_NET_SERVER_TCP_CLASS) 652 if (cls == EFL_NET_SERVER_TCP_CLASS)
653 { 653 {
654 efl_net_server_tcp_ipv6_only_set(server, ipv6_only); 654 efl_net_server_tcp_ipv6_only_set(server, ipv6_only);
655 efl_net_server_fd_close_on_exec_set(server, EINA_TRUE); /* recommended */
656 efl_net_server_fd_reuse_address_set(server, EINA_TRUE); /* optional, but nice for testing */ 655 efl_net_server_fd_reuse_address_set(server, EINA_TRUE); /* optional, but nice for testing */
657 efl_net_server_fd_reuse_port_set(server, EINA_TRUE); /* optional, but nice for testing... not secure unless you know what you're doing */ 656 efl_net_server_fd_reuse_port_set(server, EINA_TRUE); /* optional, but nice for testing... not secure unless you know what you're doing */
658 657
@@ -672,7 +671,6 @@ main(int argc, char **argv)
672 efl_net_server_udp_multicast_join(server, str); 671 efl_net_server_udp_multicast_join(server, str);
673 672
674 673
675 efl_net_server_fd_close_on_exec_set(server, EINA_TRUE); /* recommended */
676 efl_net_server_fd_reuse_address_set(server, EINA_TRUE); /* optional, but nice for testing */ 674 efl_net_server_fd_reuse_address_set(server, EINA_TRUE); /* optional, but nice for testing */
677 efl_net_server_fd_reuse_port_set(server, EINA_TRUE); /* optional, but nice for testing... not secure unless you know what you're doing */ 675 efl_net_server_fd_reuse_port_set(server, EINA_TRUE); /* optional, but nice for testing... not secure unless you know what you're doing */
678 if (socket_activated) efl_net_server_fd_socket_activate(server, address); 676 if (socket_activated) efl_net_server_fd_socket_activate(server, address);
@@ -704,7 +702,6 @@ main(int argc, char **argv)
704 702
705 efl_net_server_ssl_context_set(server, ssl_ctx); 703 efl_net_server_ssl_context_set(server, ssl_ctx);
706 704
707 efl_net_server_ssl_close_on_exec_set(server, EINA_TRUE); /* recommended */
708 efl_net_server_ssl_reuse_address_set(server, EINA_TRUE); /* optional, but nice for testing */ 705 efl_net_server_ssl_reuse_address_set(server, EINA_TRUE); /* optional, but nice for testing */
709 efl_net_server_ssl_reuse_port_set(server, EINA_TRUE); /* optional, but nice for testing... not secure unless you know what you're doing */ 706 efl_net_server_ssl_reuse_port_set(server, EINA_TRUE); /* optional, but nice for testing... not secure unless you know what you're doing */
710 if (socket_activated) efl_net_server_ssl_socket_activate(server, address); 707 if (socket_activated) efl_net_server_ssl_socket_activate(server, address);
diff --git a/src/examples/ecore/efl_net_server_simple_example.c b/src/examples/ecore/efl_net_server_simple_example.c
index ddce4c86cd..6cafe9ddcb 100644
--- a/src/examples/ecore/efl_net_server_simple_example.c
+++ b/src/examples/ecore/efl_net_server_simple_example.c
@@ -460,7 +460,6 @@ main(int argc, char **argv)
460 if (cls == EFL_NET_SERVER_TCP_CLASS) 460 if (cls == EFL_NET_SERVER_TCP_CLASS)
461 { 461 {
462 efl_net_server_tcp_ipv6_only_set(server, ipv6_only); 462 efl_net_server_tcp_ipv6_only_set(server, ipv6_only);
463 efl_net_server_fd_close_on_exec_set(server, EINA_TRUE); /* recommended */
464 efl_net_server_fd_reuse_address_set(server, EINA_TRUE); /* optional, but nice for testing */ 463 efl_net_server_fd_reuse_address_set(server, EINA_TRUE); /* optional, but nice for testing */
465 efl_net_server_fd_reuse_port_set(server, EINA_TRUE); /* optional, but nice for testing... not secure unless you know what you're doing */ 464 efl_net_server_fd_reuse_port_set(server, EINA_TRUE); /* optional, but nice for testing... not secure unless you know what you're doing */
466 465
@@ -479,8 +478,6 @@ main(int argc, char **argv)
479 EINA_LIST_FOREACH(udp_mcast_groups, lst, str) 478 EINA_LIST_FOREACH(udp_mcast_groups, lst, str)
480 efl_net_server_udp_multicast_join(server, str); 479 efl_net_server_udp_multicast_join(server, str);
481 480
482
483 efl_net_server_fd_close_on_exec_set(server, EINA_TRUE); /* recommended */
484 efl_net_server_fd_reuse_address_set(server, EINA_TRUE); /* optional, but nice for testing */ 481 efl_net_server_fd_reuse_address_set(server, EINA_TRUE); /* optional, but nice for testing */
485 efl_net_server_fd_reuse_port_set(server, EINA_TRUE); /* optional, but nice for testing... not secure unless you know what you're doing */ 482 efl_net_server_fd_reuse_port_set(server, EINA_TRUE); /* optional, but nice for testing... not secure unless you know what you're doing */
486 if (socket_activated) efl_net_server_fd_socket_activate(server, address); 483 if (socket_activated) efl_net_server_fd_socket_activate(server, address);
@@ -512,7 +509,6 @@ main(int argc, char **argv)
512 509
513 efl_net_server_ssl_context_set(server, ssl_ctx); 510 efl_net_server_ssl_context_set(server, ssl_ctx);
514 511
515 efl_net_server_ssl_close_on_exec_set(server, EINA_TRUE); /* recommended */
516 efl_net_server_ssl_reuse_address_set(server, EINA_TRUE); /* optional, but nice for testing */ 512 efl_net_server_ssl_reuse_address_set(server, EINA_TRUE); /* optional, but nice for testing */
517 efl_net_server_ssl_reuse_port_set(server, EINA_TRUE); /* optional, but nice for testing... not secure unless you know what you're doing */ 513 efl_net_server_ssl_reuse_port_set(server, EINA_TRUE); /* optional, but nice for testing... not secure unless you know what you're doing */
518 if (socket_activated) efl_net_server_ssl_socket_activate(server, address); 514 if (socket_activated) efl_net_server_ssl_socket_activate(server, address);
diff --git a/src/examples/ecore/efl_net_socket_ssl_server_example.c b/src/examples/ecore/efl_net_socket_ssl_server_example.c
index caf5f87f6b..129bee44df 100644
--- a/src/examples/ecore/efl_net_socket_ssl_server_example.c
+++ b/src/examples/ecore/efl_net_socket_ssl_server_example.c
@@ -312,7 +312,6 @@ main(int argc, char **argv)
312 312
313 server = efl_add(EFL_NET_SERVER_TCP_CLASS, ecore_main_loop_get(), /* it's mandatory to use a main loop provider as the server parent */ 313 server = efl_add(EFL_NET_SERVER_TCP_CLASS, ecore_main_loop_get(), /* it's mandatory to use a main loop provider as the server parent */
314 efl_net_server_tcp_ipv6_only_set(efl_added, EINA_FALSE), /* optional, but helps testing IPv4 on IPv6 servers */ 314 efl_net_server_tcp_ipv6_only_set(efl_added, EINA_FALSE), /* optional, but helps testing IPv4 on IPv6 servers */
315 efl_net_server_fd_close_on_exec_set(efl_added, EINA_TRUE), /* recommended */
316 efl_net_server_fd_reuse_address_set(efl_added, EINA_TRUE), /* optional, but nice for testing */ 315 efl_net_server_fd_reuse_address_set(efl_added, EINA_TRUE), /* optional, but nice for testing */
317 efl_net_server_fd_reuse_port_set(efl_added, EINA_TRUE), /* optional, but nice for testing... not secure unless you know what you're doing */ 316 efl_net_server_fd_reuse_port_set(efl_added, EINA_TRUE), /* optional, but nice for testing... not secure unless you know what you're doing */
318 efl_event_callback_array_add(efl_added, server_cbs(), NULL)); /* mandatory to have "client,add" in order to be useful */ 317 efl_event_callback_array_add(efl_added, server_cbs(), NULL)); /* mandatory to have "client,add" in order to be useful */
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index 35cdef87cd..1cb007f8b1 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -1496,11 +1496,9 @@ _ecore_con_server_server_set(Ecore_Con_Server *svr, Eo *server)
1496 1496
1497 if (efl_isa(inner_server, EFL_NET_SERVER_FD_CLASS)) 1497 if (efl_isa(inner_server, EFL_NET_SERVER_FD_CLASS))
1498 { 1498 {
1499 efl_net_server_fd_close_on_exec_set(inner_server, EINA_TRUE);
1500 efl_net_server_fd_reuse_address_set(inner_server, EINA_TRUE); 1499 efl_net_server_fd_reuse_address_set(inner_server, EINA_TRUE);
1501 efl_net_server_fd_reuse_port_set(inner_server, EINA_TRUE); 1500 efl_net_server_fd_reuse_port_set(inner_server, EINA_TRUE);
1502 } 1501 }
1503
1504 if (efl_isa(inner_server, EFL_NET_SERVER_TCP_CLASS)) 1502 if (efl_isa(inner_server, EFL_NET_SERVER_TCP_CLASS))
1505 { 1503 {
1506 /* old ecore_con did not map ipv4 to ipv6... */ 1504 /* old ecore_con did not map ipv4 to ipv6... */
@@ -1516,7 +1514,6 @@ _ecore_con_server_server_set(Ecore_Con_Server *svr, Eo *server)
1516 { 1514 {
1517 /* old ecore_con did not map ipv4 to ipv6... */ 1515 /* old ecore_con did not map ipv4 to ipv6... */
1518 efl_net_server_ssl_ipv6_only_set(inner_server, EINA_TRUE); 1516 efl_net_server_ssl_ipv6_only_set(inner_server, EINA_TRUE);
1519 efl_net_server_ssl_close_on_exec_set(inner_server, EINA_TRUE);
1520 efl_net_server_ssl_reuse_address_set(inner_server, EINA_TRUE); 1517 efl_net_server_ssl_reuse_address_set(inner_server, EINA_TRUE);
1521 efl_net_server_ssl_reuse_port_set(inner_server, EINA_TRUE); 1518 efl_net_server_ssl_reuse_port_set(inner_server, EINA_TRUE);
1522 } 1519 }
diff --git a/src/lib/ecore_con/efl_net_server_fd.c b/src/lib/ecore_con/efl_net_server_fd.c
index 03448ec856..f1ff38bd77 100644
--- a/src/lib/ecore_con/efl_net_server_fd.c
+++ b/src/lib/ecore_con/efl_net_server_fd.c
@@ -100,6 +100,7 @@ EOLIAN static Efl_Object *
100_efl_net_server_fd_efl_object_constructor(Eo *o, Efl_Net_Server_Fd_Data *pd) 100_efl_net_server_fd_efl_object_constructor(Eo *o, Efl_Net_Server_Fd_Data *pd)
101{ 101{
102 pd->family = AF_UNSPEC; 102 pd->family = AF_UNSPEC;
103 pd->close_on_exec = EINA_TRUE;
103 return efl_constructor(efl_super(o, MY_CLASS)); 104 return efl_constructor(efl_super(o, MY_CLASS));
104} 105}
105 106
diff --git a/src/lib/ecore_con/efl_net_server_fd.eo b/src/lib/ecore_con/efl_net_server_fd.eo
index 0b3f55df98..6f3ab66332 100644
--- a/src/lib/ecore_con/efl_net_server_fd.eo
+++ b/src/lib/ecore_con/efl_net_server_fd.eo
@@ -71,7 +71,7 @@ class Efl.Net.Server.Fd (Efl.Loop.Fd, Efl.Net.Server) {
71 @property close_on_exec { 71 @property close_on_exec {
72 [[Controls Close-on-Exec() using FD_CLOEXEC. 72 [[Controls Close-on-Exec() using FD_CLOEXEC.
73 73
74 Children socket will inherit the server's setting by 74 Children socket will not inherit the server's setting by
75 default. One can change the behavior using each instance 75 default. One can change the behavior using each instance
76 @Efl.Io.Closer.close_on_exec.set. 76 @Efl.Io.Closer.close_on_exec.set.
77 ]] 77 ]]
diff --git a/src/lib/ecore_con/efl_net_server_ssl.eo b/src/lib/ecore_con/efl_net_server_ssl.eo
index d34e2df909..594104d1b7 100644
--- a/src/lib/ecore_con/efl_net_server_ssl.eo
+++ b/src/lib/ecore_con/efl_net_server_ssl.eo
@@ -71,7 +71,7 @@ class Efl.Net.Server.Ssl (Efl.Loop_User, Efl.Net.Server) {
71 @property close_on_exec { 71 @property close_on_exec {
72 [[Controls Close-on-Exec() using FD_CLOEXEC. 72 [[Controls Close-on-Exec() using FD_CLOEXEC.
73 73
74 Children socket will inherit the server's setting by 74 Children socket will not inherit the server's setting by
75 default. One can change the behavior using each instance 75 default. One can change the behavior using each instance
76 @Efl.Io.Closer.close_on_exec.set. 76 @Efl.Io.Closer.close_on_exec.set.
77 ]] 77 ]]
diff --git a/src/lib/ecore_ipc/ecore_ipc.c b/src/lib/ecore_ipc/ecore_ipc.c
index 8cb7f3f7e8..0b27496d2f 100644
--- a/src/lib/ecore_ipc/ecore_ipc.c
+++ b/src/lib/ecore_ipc/ecore_ipc.c
@@ -481,7 +481,6 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void
481 481
482 if (efl_isa(svr->server, EFL_NET_SERVER_FD_CLASS)) 482 if (efl_isa(svr->server, EFL_NET_SERVER_FD_CLASS))
483 { 483 {
484 efl_net_server_fd_close_on_exec_set(svr->server, EINA_TRUE);
485 efl_net_server_fd_reuse_address_set(svr->server, EINA_TRUE); 484 efl_net_server_fd_reuse_address_set(svr->server, EINA_TRUE);
486 efl_net_server_fd_reuse_port_set(svr->server, EINA_TRUE); 485 efl_net_server_fd_reuse_port_set(svr->server, EINA_TRUE);
487 } 486 }
@@ -495,7 +494,6 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void
495 { 494 {
496 /* old ecore_con did not map ipv4 to ipv6... */ 495 /* old ecore_con did not map ipv4 to ipv6... */
497 efl_net_server_ssl_ipv6_only_set(svr->server, EINA_TRUE); 496 efl_net_server_ssl_ipv6_only_set(svr->server, EINA_TRUE);
498 efl_net_server_ssl_close_on_exec_set(svr->server, EINA_TRUE);
499 efl_net_server_ssl_reuse_address_set(svr->server, EINA_TRUE); 497 efl_net_server_ssl_reuse_address_set(svr->server, EINA_TRUE);
500 efl_net_server_ssl_reuse_port_set(svr->server, EINA_TRUE); 498 efl_net_server_ssl_reuse_port_set(svr->server, EINA_TRUE);
501 } 499 }