Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • cellframe/cellframe-sdk
  • MIKA83/cellframe-sdk
2 results
Show changes
Hide whitespace changes
Inline Side-by-side
modules/service/vpn/dap_chain_net_srv_vpn.c
View file @ e85f8701
......@@ -1139,7 +1139,7 @@ void s_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
HASH_DELETE(hh2, sf_socks, sf_sock);
HASH_DELETE(hh_sock, sf_socks_client, sf_sock);
struct epoll_event ev;
struct epoll_event ev = {0, {0}};
ev.data.fd = sf_sock->sock;
ev.events = EPOLLIN;
if(epoll_ctl(sf_socks_epoll_fd, EPOLL_CTL_DEL, sf_sock->sock, &ev) < 0) {
......@@ -1170,7 +1170,7 @@ void s_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
pthread_mutex_lock(&s_sf_socks_mutex);
HASH_DELETE(hh2, sf_socks, sf_sock);
HASH_DELETE(hh_sock, sf_socks_client, sf_sock);
struct epoll_event ev;
struct epoll_event ev = {0, {0}};;
ev.data.fd = sf_sock->sock;
ev.events = EPOLLIN;
if(epoll_ctl(sf_socks_epoll_fd, EPOLL_CTL_DEL, sf_sock->sock, &ev) < 0) {
......@@ -1244,7 +1244,7 @@ void s_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
pthread_mutex_unlock(&s_sf_socks_mutex);
pthread_mutex_unlock(&( CH_VPN(a_ch)->mutex));
struct epoll_event ev;
struct epoll_event ev = {0, {0}};
ev.data.fd = s;
ev.events = EPOLLIN | EPOLLERR;
......@@ -1380,7 +1380,7 @@ static void s_ch_packet_out(dap_stream_ch_t* a_ch, void* a_arg)
*/
void srv_stream_sf_disconnect(ch_vpn_socket_proxy_t * sf_sock)
{
struct epoll_event ev;
struct epoll_event ev = {0, {0}};
ev.data.fd = sf_sock->sock;
ev.events = EPOLLIN | EPOLLERR;
if(epoll_ctl(sf_socks_epoll_fd, EPOLL_CTL_DEL, sf_sock->sock, &ev) == -1) {
......@@ -1409,7 +1409,7 @@ void srv_stream_sf_disconnect(ch_vpn_socket_proxy_t * sf_sock)
void * srv_ch_sf_thread(void * a_arg)
{
UNUSED(a_arg);
struct epoll_event ev, events[SF_MAX_EVENTS] = { 0 };
struct epoll_event ev = {0, {0}}, events[SF_MAX_EVENTS] = { {0, {0}} };
//pthread_mutex_lock(&sf_socks_mutex);
sf_socks_epoll_fd = epoll_create(SF_MAX_EVENTS);
sigset_t sf_sigmask;
......
modules/service/vpn/dap_chain_net_vpn_client.c
View file @ e85f8701
......@@ -492,7 +492,7 @@ void dap_chain_net_vpn_client_pkt_in(dap_stream_ch_t* a_ch, dap_stream_ch_pkt_t*
HASH_DELETE(hh2, sf_socks, sf_sock);
HASH_DELETE(hh_sock, sf_socks_client, sf_sock);
struct epoll_event ev;
struct epoll_event ev = {0, {0}};
ev.data.fd = sf_sock->sock;
ev.events = EPOLLIN;
if(epoll_ctl(sf_socks_epoll_fd, EPOLL_CTL_DEL, sf_sock->sock, &ev) < 0) {
......@@ -525,7 +525,7 @@ void dap_chain_net_vpn_client_pkt_in(dap_stream_ch_t* a_ch, dap_stream_ch_pkt_t*
HASH_DELETE(hh2, sf_socks, sf_sock);
HASH_DELETE(hh_sock, sf_socks_client, sf_sock);
struct epoll_event ev;
struct epoll_event ev = {0, {0}};
ev.data.fd = sf_sock->sock;
ev.events = EPOLLIN;
if(epoll_ctl(sf_socks_epoll_fd, EPOLL_CTL_DEL, sf_sock->sock, &ev) < 0) {
......@@ -612,7 +612,7 @@ void dap_chain_net_vpn_client_pkt_in(dap_stream_ch_t* a_ch, dap_stream_ch_pkt_t*
pthread_mutex_unlock(&( CH_VPN(a_ch)->mutex));
pthread_mutex_unlock(&sf_socks_mutex);
struct epoll_event ev;
struct epoll_event ev = { 0, {0} };
ev.data.fd = s;
ev.events = EPOLLIN | EPOLLERR;
......