rtsp: correct the timeout range (20-3600), warn user

- fix also small typo in linuxdvb rotor
This commit is contained in:
Jaroslav Kysela 2014-12-13 18:51:12 +01:00
parent 39d985be1c
commit b0b48bdf85
2 changed files with 4 additions and 2 deletions

View file

@ -274,7 +274,7 @@ linuxdvb_rotor_usals_tune
tvhtrace("diseqc", "rotor USALS site lat %0.4f%c site lon %0.4f%c sat lon %0.1f%c zero %0.1f%c",
fabs(lr->lr_site_lat), (lr->lr_site_lat > 0.0) ? 'N' : 'S',
fabs(lr->lr_site_lon), (lr->lr_site_lon > 0.0) ? 'E' : 'W',
fabs(lr->lr_sat_lon), (lr->lr_sat_lon > 0.0) ? 'E' : 'w',
fabs(lr->lr_sat_lon), (lr->lr_sat_lon > 0.0) ? 'E' : 'W',
fabs(lr->lr_zero_lon), (lr->lr_zero_lon > 0.0) ? 'E' : 'W');
if (linuxdvb_rotor_check_orbital_pos(lm, ls))

View file

@ -110,8 +110,10 @@ rtsp_setup_decode( http_client_t *hc, int satip )
for (i = 1; i < n; i++) {
if (strncasecmp(argv[i], "timeout=", 8) == 0) {
hc->hc_rtp_timeout = atoi(argv[i] + 8);
if (hc->hc_rtp_timeout <= 20 || hc->hc_rtp_timeout > 3600)
if (hc->hc_rtp_timeout < 20 || hc->hc_rtp_timeout > 3600) {
tvhwarn("rtsp", "timeout value out of range 20-3600 (%i)", hc->hc_rtp_timeout);
return -EIO;
}
}
}
if (satip) {