kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ecore Evas VNC: Properly shutdown server during cleanup. 

Summary:
The function rfbScreenCleanup() does not close the open sockets,
a call to rfbShutdownServer() must be done to properly close them.

Reviewers: cedric, bdilly

Reviewed By: bdilly

Subscribers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D4459
This commit is contained in:
Guilherme Iscaro 2016-12-13 14:50:31 -02:00 committed by Bruno Dilly
parent df9128c3e3
commit c1518043e3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c
View File

@ -809,7 +809,7 @@ ecore_evas_vnc_server_new(Ecore_Evas *ee, int port, const char *addr,
_ecore_evas_vnc_server_socket_listen_activity,
server->vnc_screen,
NULL, NULL);
EINA_SAFETY_ON_NULL_GOTO(server->vnc_listen_handler, err_addr);
EINA_SAFETY_ON_NULL_GOTO(server->vnc_listen_handler, err_listen);
can_listen = EINA_TRUE;
}
@ -820,12 +820,12 @@ ecore_evas_vnc_server_new(Ecore_Evas *ee, int port, const char *addr,
_ecore_evas_vnc_server_socket_listen_activity,
server->vnc_screen,
NULL, NULL);
EINA_SAFETY_ON_NULL_GOTO(server->vnc_listen6_handler, err_listen);
EINA_SAFETY_ON_NULL_GOTO(server->vnc_listen6_handler, err_listen6);
can_listen = EINA_TRUE;
}
//rfbInitServer() failed and could not setup the sockets.
EINA_SAFETY_ON_FALSE_GOTO(can_listen, err_addr);
EINA_SAFETY_ON_FALSE_GOTO(can_listen, err_listen);
err = evas_engine_info_set(ee->evas, (Evas_Engine_Info *)engine);
EINA_SAFETY_ON_FALSE_GOTO(err, err_engine);
@ -840,8 +840,10 @@ ecore_evas_vnc_server_new(Ecore_Evas *ee, int port, const char *addr,
err_engine:
ecore_main_fd_handler_del(server->vnc_listen6_handler);
err_listen:
err_listen6:
ecore_main_fd_handler_del(server->vnc_listen_handler);
err_listen:
rfbShutdownServer(server->vnc_screen, TRUE);
err_addr:
rfbScreenCleanup(server->vnc_screen);
err_screen:
@ -885,6 +887,7 @@ ecore_evas_vnc_server_del(Ecore_Evas_Vnc_Server *server)
WRN("Could not unset the region push hook callback");
ecore_main_fd_handler_del(server->vnc_listen6_handler);
ecore_main_fd_handler_del(server->vnc_listen_handler);
rfbShutdownServer(server->vnc_screen, TRUE);
free(server->frame_buffer);
rfbScreenCleanup(server->vnc_screen);
free(server);