Skip to content
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

Fix "get_adapter returns NULL" snafu axe_wakeup #1152

Merged
merged 3 commits into from
Jun 26, 2024
Merged

Fix "get_adapter returns NULL" snafu axe_wakeup #1152

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d58792
Fix "get_adapter returns NULL" snafu axe_wakeup
Jalle19 Jun 25, 2024
3414d97
Fix more global snafu in axe_set_pid and axe_del_filters
Jalle19 Jun 25, 2024
4ead79e
Add more logging around axe_wakeup
Jalle19 Jun 25, 2024
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
38 changes: 19 additions & 19 deletions src/axe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,14 @@ static void axe_pls_isi(adapter *ad, transponder *tp) {

int axe_wakeup(adapter *_ad, int fe_fd, int voltage) {
int i, mask;
adapter *a;
adapter *ad;
if (opts.axe_power < 2)
return 0;
for (i = 0; i < 4; i++) {
a = get_adapter(i);
if (a == NULL || is_adapter_disabled(i))
ad = get_adapter(i);
if (ad == NULL || is_adapter_disabled(i))
continue;
if (a->old_pol >= 0)
if (ad->old_pol >= 0)
return 0;
}
LOG("AXE wakeup");
Expand All @@ -230,11 +230,12 @@ int axe_wakeup(adapter *_ad, int fe_fd, int voltage) {
for (i = 0; i < 4 && mask; i++) {
if (((1 << i) & mask) == 0)
continue;
a = get_adapter(i);
if (a == NULL || is_adapter_disabled(i))
ad = get_adapter(i);
if (ad == NULL || is_adapter_disabled(i))
continue;
if (ioctl(a->fe, FE_SET_VOLTAGE, voltage) == -1)
LOG("axe_wakeup: FE_SET_VOLTAGE failed fd %d: %s", a->fe,
LOG("axe_wakeup: waking adapter %d, fd %d", i, ad->fe);
if (ioctl(ad->fe, FE_SET_VOLTAGE, voltage) == -1)
LOG("axe_wakeup: FE_SET_VOLTAGE failed fd %d: %s", ad->fe,
strerror(errno));
}
return 0;
Expand Down Expand Up @@ -661,31 +662,30 @@ int axe_tune(int aid, transponder *tp) {
return 0;
}

int axe_set_pid(adapter *a, int i_pid) {
if (i_pid > 8192 || a == NULL)
int axe_set_pid(adapter *ad, int i_pid) {
if (i_pid > 8192 || ad == NULL)
LOG_AND_RETURN(-1, "pid %d > 8192 for ADAPTER %d", i_pid,
a ? a->id : -1);
if (axe_dmxts_add_pid(a->dvr, i_pid) < 0) {
LOG("failed setting filter on PID %d for ADAPTER %d (%s)", i_pid, a->id,
ad ? ad->id : -1);
if (axe_dmxts_add_pid(ad->dvr, i_pid) < 0) {
LOG("failed setting filter on PID %d for ADAPTER %d (%s)", i_pid, ad->id,
strerror(errno));
return -1;
}
LOG("setting filter on PID %d for ADAPTER %d", i_pid, a->id);
return ((a->id + 1) << 16) | i_pid;
LOG("setting filter on PID %d for ADAPTER %d", i_pid, ad->id);
return ((ad->id + 1) << 16) | i_pid;
}

int axe_del_filters(adapter *ad, int fd, int pid) {
adapter *a = get_adapter((fd >> 16) - 1);
if (a == NULL)
return 0; /* closed */
if ((fd & 0xffff) != pid)
LOG_AND_RETURN(0, "AXE PID remove on an invalid handle %d, pid %d", fd,
pid);
if (axe_dmxts_remove_pid(a->dvr, pid) < 0)
LOG("AXE PID remove failed on PID %d ADAPTER %d: %s", pid, a->pa,
if (axe_dmxts_remove_pid(ad->dvr, pid) < 0)
LOG("AXE PID remove failed on PID %d ADAPTER %d: %s", pid, ad->pa,
strerror(errno))
else
LOG("clearing filters on PID %d ADAPTER %d", pid, a->pa);
LOG("clearing filters on PID %d ADAPTER %d", pid, ad->pa);
return 0;
}

Expand Down
Loading