minisatip8 fixes, add possibility to pass options to syslogd (remote log)
This commit is contained in:
parent
c7fcbbbecd
commit
f356862959
2
Makefile
2
Makefile
@ -385,7 +385,7 @@ minisatip7-clean:
|
||||
# minisatip8
|
||||
#
|
||||
|
||||
apps/minisatip8/axe.h: patches/minisatip8-axe.patch
|
||||
apps/minisatip8/src/axe.h: patches/minisatip8-axe.patch
|
||||
rm -rf apps/minisatip8
|
||||
$(call GIT_CLONE,https://github.com/catalinii/minisatip.git,minisatip8,$(MINISATIP8_COMMIT))
|
||||
cd apps/minisatip8; patch -p1 < ../../patches/minisatip8-axe.patch
|
||||
|
@ -2,7 +2,7 @@
|
||||
# SATIP AXE firmware configuration
|
||||
#
|
||||
|
||||
CFGVER="12"
|
||||
CFGVER="14"
|
||||
HOSTNAME="satip-axe"
|
||||
KMODULES="drivers/usb/serial/cp210x.ko drivers/usb/serial/pl2303.ko drivers/usb/serial/ftdi_sio.ko"
|
||||
|
||||
@ -41,6 +41,11 @@ IPV4="dhcp"
|
||||
#
|
||||
NTPD_OPTS="-p 0.pool.ntp.org"
|
||||
|
||||
#
|
||||
# syslogd
|
||||
#
|
||||
#SYSLOGD_OPTS="-R 192.168.1.1:514"
|
||||
|
||||
#
|
||||
# telnetd
|
||||
#
|
||||
|
@ -39,9 +39,6 @@ mount -t nfsd nfsd /proc/fs/nfsd
|
||||
# sysctl.conf
|
||||
sysctl -q -p
|
||||
|
||||
# start syslogd
|
||||
syslogd -C256
|
||||
|
||||
# config/data storage
|
||||
mkdir -p /mnt/data
|
||||
mount -t jffs2 /dev/mtdblock4 /mnt/data/
|
||||
@ -63,6 +60,9 @@ fi
|
||||
# load config
|
||||
test -r /etc/sysconfig/config && . /etc/sysconfig/config
|
||||
|
||||
# start syslogd
|
||||
syslogd -C256 $SYSLOGD_OPTS
|
||||
|
||||
# loopback
|
||||
ifconfig lo 127.0.0.1 netmask 255.255.255.0
|
||||
|
||||
|
@ -1,7 +1,16 @@
|
||||
diff --git a/src/adapter.c b/src/adapter.c
|
||||
index 0baf965..86e6da5 100644
|
||||
index 0baf965..99ff0a6 100644
|
||||
--- a/src/adapter.c
|
||||
+++ b/src/adapter.c
|
||||
@@ -515,7 +515,7 @@ int getAdaptersCount()
|
||||
tuner_t2 = tt2;
|
||||
if (!opts.force_cadapter)
|
||||
tuner_c = tc;
|
||||
- if (!opts.force_cadapter)
|
||||
+ if (!opts.force_tadapter)
|
||||
tuner_t = tt;
|
||||
tuner_at = tat;
|
||||
tuner_ac = tac;
|
||||
@@ -881,7 +881,6 @@ int tune(int aid, int sid)
|
||||
{
|
||||
adapter *ad = get_adapter(aid);
|
||||
@ -20,7 +29,7 @@ index 0baf965..86e6da5 100644
|
||||
if ((!p || p->flags == 3) && (!p_all || p_all->flags == 3)) // add pid 0 if not explicitly added
|
||||
{
|
||||
diff --git a/src/minisatip.c b/src/minisatip.c
|
||||
index 5f369ff..d1594cc 100644
|
||||
index 5f369ff..909072a 100644
|
||||
--- a/src/minisatip.c
|
||||
+++ b/src/minisatip.c
|
||||
@@ -112,6 +112,7 @@ int rtsp, http, si, si1, ssdp1;
|
||||
@ -65,7 +74,7 @@ index 5f369ff..d1594cc 100644
|
||||
{
|
||||
// printf("options %d %c %s\n",opt,opt,optarg);
|
||||
switch (opt)
|
||||
@@ -700,6 +704,15 @@ void set_options(int argc, char *argv[])
|
||||
@@ -700,6 +704,16 @@ void set_options(int argc, char *argv[])
|
||||
break;
|
||||
}
|
||||
|
||||
@ -76,6 +85,7 @@ index 5f369ff..d1594cc 100644
|
||||
+ opts.tcp_max_pack = 7;
|
||||
+ else if (opts.tcp_max_pack > 697)
|
||||
+ opts.tcp_max_pack = 697;
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
case DVBS2_ADAPTERS_OPT:
|
||||
|
Loading…
Reference in New Issue
Block a user