Skip to content

scam_getcw: locking fixes #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
braice merged 1 commit into from
Oct 26, 2014
Merged

scam_getcw: locking fixes #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/scam_getcw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ static void *getcwthread_func(void* arg)
set_interrupted(ERROR_NETWORK<<8);
break;
}
pthread_mutex_lock(&chan_p->lock);
for (i = 0; i < num_of_events; i++) {
pthread_mutex_lock(&chan_p->lock);
for (curr_channel = 0; curr_channel < chan_p->number_of_channels; curr_channel++) {
mumudvb_channel_t *channel = &chan_p->channels[curr_channel];
if (events[i].data.fd == channel->camd_socket) {
Expand All @@ -123,6 +123,7 @@ static void *getcwthread_func(void* arg)
log_message(log_module, MSG_ERROR,"channel %s: unsuccessful epoll_ctl EPOLL_CTL_DEL", channel->name);
set_interrupted(ERROR_NETWORK<<8);
free(getcw_params);
pthread_mutex_unlock(&chan_p->lock);
return 0;
}
close(channel->camd_socket);
Expand All @@ -141,6 +142,7 @@ static void *getcwthread_func(void* arg)
log_message(log_module, MSG_ERROR,"channel: %s recv", channel->name);
set_interrupted(ERROR_NETWORK<<8);
free(getcw_params);
pthread_mutex_unlock(&chan_p->lock);
return 0;
}
#ifdef ENABLE_SCAM_DESCRAMBLER_SUPPORT
Expand Down Expand Up @@ -168,7 +170,7 @@ static void *getcwthread_func(void* arg)
memcpy((&(scam_params->ca_pid)), buff + 1 + sizeof(int), sizeof(ca_pid_t));
log_message( log_module, MSG_DEBUG, "Got CA_SET_PID request channel: %s, index: %d pid: %d\n", channel->name, scam_params->ca_pid.index, scam_params->ca_pid.pid);
if(scam_params->ca_pid.index == -1) {
pthread_mutex_lock(&chan_p->lock);
pthread_mutex_lock(&channel->cw_lock);
--channel->ca_idx_refcnt;
if (!channel->ca_idx_refcnt) {
channel->ca_idx = 0;
Expand All @@ -192,8 +194,8 @@ static void *getcwthread_func(void* arg)
break;
}
}
pthread_mutex_unlock(&chan_p->lock);
}
pthread_mutex_unlock(&chan_p->lock);
}
free(getcw_params);
return 0;
Expand Down