ptp2: Disconnect PTP/IP connection in camera_exit
This commit is contained in:
committed by
Marcus Meissner
parent
f9a9024159
commit
d42e11a98e
@@ -3156,6 +3156,10 @@ exitfailed:
|
||||
if (params->cd_locale_to_ucs2 != (iconv_t)-1) iconv_close(params->cd_locale_to_ucs2);
|
||||
#endif
|
||||
|
||||
if (camera->port->type == GP_PORT_PTPIP) {
|
||||
ptp_ptpip_disconnect (params);
|
||||
}
|
||||
|
||||
free (params->data);
|
||||
free (camera->pl); /* also frees params */
|
||||
params = NULL;
|
||||
|
||||
@@ -3853,6 +3853,7 @@ uint16_t ptp_usb_control_device_status_request (PTPParams *params);
|
||||
|
||||
|
||||
int ptp_ptpip_connect (PTPParams* params, const char *port);
|
||||
int ptp_ptpip_disconnect (PTPParams* params);
|
||||
uint16_t ptp_ptpip_sendreq (PTPParams* params, PTPContainer* req, int dataphase);
|
||||
uint16_t ptp_ptpip_senddata (PTPParams* params, PTPContainer* ptp,
|
||||
uint64_t size, PTPDataHandler *handler);
|
||||
|
||||
@@ -851,6 +851,24 @@ ptp_ptpip_connect (PTPParams* params, const char *address) {
|
||||
return GP_OK;
|
||||
}
|
||||
|
||||
int
|
||||
ptp_ptpip_disconnect (PTPParams* params) {
|
||||
if (params->cmdfd != PTPSOCK_INVALID) {
|
||||
PTPSOCK_CLOSE (params->cmdfd);
|
||||
params->cmdfd = PTPSOCK_INVALID;
|
||||
}
|
||||
if (params->evtfd != PTPSOCK_INVALID) {
|
||||
PTPSOCK_CLOSE (params->evtfd);
|
||||
params->evtfd = PTPSOCK_INVALID;
|
||||
}
|
||||
if (params->jpgfd != PTPSOCK_INVALID) {
|
||||
PTPSOCK_CLOSE (params->jpgfd);
|
||||
params->jpgfd = PTPSOCK_INVALID;
|
||||
}
|
||||
GP_LOG_D ("ptpip disconnected!");
|
||||
return GP_OK;
|
||||
}
|
||||
|
||||
int
|
||||
ptpip_connect_with_timeout (int fd, const struct sockaddr *address, socklen_t address_len, int seconds, int milliseconds) {
|
||||
int res = 0;
|
||||
|
||||
Reference in New Issue
Block a user