| Tuner<
- if(ad_ber[i] > 0)
- signal += " BER "+ad_ber[i];
- }
-- myTable+=" | " + signal + " | ";
-+ myTable+="" + signal + " | ";
-
-- myTable +="";
-+ myTable +=" | ";
- for(var j=0;j";
- }
-
-- myTable +=" | ";
-+ myTable +=" | ";
-
- for(var j=0;jIP servers in the network)\n \
- * eg: -D 4 \n\
-@@ -179,13 +213,23 @@ Help\n\
- * -m xx: simulate xx as local mac address, generates UUID based on mac\n\
- * eg: -m 001122334455 \n\
- \n\
-+"
-+#ifndef DISABLE_NETCVCLIENT
-+"\
- * -n --netceiver if:count: use network interface (default vlan4) and look for netceivers\n\
- * eg: -n vlan4:2 \n\
- \n\
-+"
-+#endif
-+#ifndef DISABLE_DVBCSA
-+"\
- * -o --dvbapi host:port - specify the hostname and port for the dvbapi server (oscam) \n\
- * eg: -o 192.168.9.9:9000 \n\
- 192.168.9.9 is the host where oscam is running and 9000 is the port configured in dvbapi section in oscam.conf\n\
- \n\
-+"
-+#endif
-+"\
- * -p url: specify playlist url using X_SATIPM3U header \n\
- * eg: -p http://192.168.2.3:8080/playlist\n\
- - this will add X_SATIPM3U tag into the satip description xml\n\
-@@ -195,6 +239,9 @@ Help\n\
- \n\
- * -R --document-root directory: document root for the minisatip web page and images\n\
- \n\
-+"
-+#ifndef DISABLE_SATIPCLIENT
-+"\
- * -s --satip-servers DELSYS:host:port - specify the remote satip host and port with delivery system DELSYS, it is possible to use multiple -s \n\
- * DELSYS - can be one of: dvbs, dvbs2, dvbt, dvbt2, dvbc, dvbc2, isdbt, atsc, dvbcb ( - DVBC_ANNEX_B ) [default: dvbs2]\n\
- host - the server of the satip server\n\
-@@ -204,6 +251,9 @@ Help\n\
- - specifies 1 dvbt satip server with address 192.168.1.3:554\n\
- - specifies 1 dvbc satip server with address 192.168.1.4:554\n\
- \n\
-+"
-+#endif
-+"\
- * -S --slave ADAPTER1,ADAPTER2-ADAPTER4[,..] - specify slave adapters \n\
- * Allows specifying bonded adapters (multiple adapters connected with a splitter to the same LNB)\n\
- Only one adapter needs to be master all others needs to have this parameter specified\n\
-@@ -237,7 +287,30 @@ Help\n\
+@@ -269,7 +287,30 @@ Help\n\
* eg: -y 5544 \n\
- changing this to a port > 1024 removes the requirement for minisatip to run as root\n\
\n\
@@ -1805,7 +908,7 @@ index d6b26d3..119a3ed 100644
app_name,
ADAPTER_BUFFER,
DVR_BUFFER, opts.no_threads ? "DISABLED" : "ENABLED");
-@@ -277,17 +350,24 @@ void set_options(int argc, char *argv[])
+@@ -309,7 +350,7 @@ void set_options(int argc, char *argv[])
opts.satip_setup_pids = 0;
opts.output_buffer = 512 * 1024;
opts.satip_servers[0] = 0;
@@ -1814,12 +917,7 @@ index d6b26d3..119a3ed 100644
opts.xml_path = DESC_XML;
opts.no_threads = 0;
opts.th_priority = -1;
-+ opts.diseqc_before_cmd = 15;
-+ opts.diseqc_after_cmd = 54;
-+ opts.diseqc_after_repeated_cmd = 15;
-+ opts.diseqc_after_switch = 15;
-+ opts.diseqc_after_burst = 15;
-+ opts.diseqc_after_tone = 0;
+@@ -323,10 +364,11 @@ void set_options(int argc, char *argv[])
#ifdef __mips__
opts.no_threads = 1;
#endif
@@ -1827,12 +925,12 @@ index d6b26d3..119a3ed 100644
memset(opts.playlist, 0, sizeof(opts.playlist));
while ((opt = getopt_long(argc, argv,
-- "flr:a:td:w:p:s:n:hc:b:m:p:e:x:u:j:o:gy:i:D:VR:S:TX:Y:",
+- "flr:a:td:w:p:s:n:hc:b:m:p:e:x:u:j:o:gy:i:q:D:VR:S:TX:Y:",
+ "flr:a:td:w:p:s:n:hc:b:m:p:e:x:u:j:o:gy:i:q:D:VR:S:TX:Y:L:QZ:U:M:P:",
long_options, NULL)) != -1)
{
// printf("options %d %c %s\n",opt,opt,optarg);
-@@ -359,9 +439,12 @@ void set_options(int argc, char *argv[])
+@@ -398,9 +440,12 @@ void set_options(int argc, char *argv[])
opts.adapter_buffer = (opts.adapter_buffer / 188) * 188;
if (opts.adapter_buffer < ADAPTER_BUFFER)
opts.adapter_buffer = ADAPTER_BUFFER;
@@ -1846,20 +944,7 @@ index d6b26d3..119a3ed 100644
break;
}
-@@ -410,6 +493,12 @@ void set_options(int argc, char *argv[])
- break;
- }
-
-+ case DISEQC_TIMING_OPT:
-+ {
-+ set_diseqc_timing(optarg);
-+ break;
-+ }
-+
- case SLAVE_OPT:
- {
- set_slave_adapters(optarg);
-@@ -508,6 +597,35 @@ void set_options(int argc, char *argv[])
+@@ -553,6 +598,35 @@ void set_options(int argc, char *argv[])
LOGL(0, "Not a valid path for the xml file")
;
break;
@@ -1895,15 +980,7 @@ index d6b26d3..119a3ed 100644
}
}
-@@ -676,7 +794,6 @@ int read_rtsp(sockets * s)
- if (transport)
- {
- int s_timeout;
--
- if (sid->timeout == 1)
- sid->timeout = opts.timeout_sec;
-
-@@ -1003,6 +1120,9 @@ int ssdp_reply(sockets * s)
+@@ -1048,6 +1122,9 @@ int ssdp_reply(sockets * s)
return 0;
}
@@ -1913,7 +990,7 @@ index d6b26d3..119a3ed 100644
// not my uuid
LOG("Received SSDP packet from %s:%d -> handle %d",
get_socket_rhost(s->id, ra, sizeof(ra)), get_socket_rport(s->id),
-@@ -1138,7 +1258,11 @@ int main(int argc, char *argv[])
+@@ -1183,7 +1260,11 @@ int main(int argc, char *argv[])
if (!opts.no_threads)
set_socket_thread(sock_signal, start_new_thread("signal"));
@@ -1928,27 +1005,19 @@ index d6b26d3..119a3ed 100644
diff --git a/minisatip.h b/minisatip.h
old mode 100644
new mode 100755
-index 403af34..f250422
+index 9c8e2fc..4e2a4fd
--- a/minisatip.h
+++ b/minisatip.h
-@@ -10,13 +10,15 @@
+@@ -10,7 +10,7 @@
- #define VERSION_BUILD "26"
+ #define VERSION_BUILD "27"
#define CC(a,b,c) #a b #c
-#define VERSION CC(0.5.,VERSION_BUILD,)
+#define VERSION CC(0.5.,VERSION_BUILD,-axe101)
void set_options (int argc, char *argv[]);
- extern char pid_file[];
- extern char app_name[], version[];
-
-+#define offsetof(st, m) __builtin_offsetof(st, m)
-+
- #define copy32(a,i,v) { a[i] = ((v)>>24) & 0xFF;\
- a[i+1] = ((v)>>16) & 0xFF;\
- a[i+2] = ((v)>>8) & 0xFF;\
-@@ -48,6 +50,11 @@ struct struct_opts
+@@ -50,6 +50,11 @@ struct struct_opts
int force_scan;
int clean_psi;
int file_line;
@@ -1960,73 +1029,11 @@ index 403af34..f250422
char *last_log;
int dvbapi_port;
char *dvbapi_host;
-@@ -62,6 +69,15 @@ struct struct_opts
- char *xml_path;
- char no_threads;
- int th_priority;
-+ int diseqc_fast;
-+ int diseqc_committed_no;
-+ int diseqc_uncommitted_no;
-+ int diseqc_before_cmd;
-+ int diseqc_after_cmd;
-+ int diseqc_after_repeated_cmd;
-+ int diseqc_after_switch;
-+ int diseqc_after_burst;
-+ int diseqc_after_tone;
- };
-
-
-diff --git a/netceiver.c b/netceiver.c
-index e42023e..51ef642 100644
---- a/netceiver.c
-+++ b/netceiver.c
-@@ -457,7 +457,7 @@ void find_netcv_adapter(adapter **a)
- if (na >= MAX_ADAPTERS)
- break;
- if (!a[na])
-- a[na] = malloc1(sizeof(adapter));
-+ a[na] = adapter_alloc();
- if (!sn[na])
- sn[na] = malloc1(sizeof(SNetceiver));
-
-diff --git a/satipc.c b/satipc.c
-index 4fd5972..af3e8aa 100644
---- a/satipc.c
-+++ b/satipc.c
-@@ -831,13 +831,16 @@ void find_satip_adapter(adapter **a)
- return;
- la = split(arg, opts.satip_servers, 50, ',');
- j = 0;
-+ for (i = 0; i < MAX_ADAPTERS; i++) {
-+
-+ }
- for (i = a_count; i < MAX_ADAPTERS; i++)
- if (j < la)
- {
- if (is_adapter_disabled(i))
- continue;
- if (!a[i])
-- a[i] = malloc1(sizeof(adapter));
-+ a[i] = adapter_alloc();
- if(!satip[i])
- satip[i] = malloc1(sizeof(satipc));
- sip = satip[i];
-@@ -913,8 +916,7 @@ void find_satip_adapter(adapter **a)
- }
-
-
--satipc *sip_tmp;
- _symbols satipc_sym[] ={
--{ "ad_satip", VAR_AARRAY_PSTRING, a, 1, MAX_ADAPTERS, (long int) &sip_tmp[0].sip
-- - (long int) &sip_tmp[0] }
-+{ "ad_satip", VAR_AARRAY_PSTRING, satip, 1, MAX_ADAPTERS, offsetof(satipc, sip) },
-+{ NULL, 0, NULL, 0, 0 }
- };
diff --git a/socketworks.c b/socketworks.c
-index 4c91a40..192182f 100644
+index 14974ec..77f4087 100644
--- a/socketworks.c
+++ b/socketworks.c
-@@ -431,6 +431,7 @@ int sockets_add(int sock, struct sockaddr_in *sa, int sid, int type,
+@@ -432,6 +432,7 @@ int sockets_add(int sock, struct sockaddr_in *sa, int sid, int type,
max_sock = i + 1;
ss->buf = NULL;
ss->lbuf = 0;
@@ -2034,7 +1041,7 @@ index 4c91a40..192182f 100644
ss->close_sec = 0;
ss->id = i;
ss->read = (read_action) sockets_read;
-@@ -624,6 +625,29 @@ void *select_and_execute(void *arg)
+@@ -625,6 +626,29 @@ void *select_and_execute(void *arg)
ss->rlen += rlen;
else
ss->rlen = 0;
@@ -2064,7 +1071,7 @@ index 4c91a40..192182f 100644
//force 0 at the end of the string
if (ss->lbuf >= ss->rlen)
ss->buf[ss->rlen] = 0;
-@@ -935,6 +959,14 @@ void set_socket_pos(int sock, int pos)
+@@ -936,6 +960,14 @@ void set_socket_pos(int sock, int pos)
ss->rlen = pos;
}
@@ -2101,41 +1108,6 @@ index c852e2a..aa4157c
char *get_socket_rhost(int s_id, char *dest, int ld);
int get_socket_rport(int s_id);
void set_sock_lock(int i, SMutex *m);
-diff --git a/stream.c b/stream.c
-index 03fee8a..8a45437 100644
---- a/stream.c
-+++ b/stream.c
-@@ -277,7 +277,7 @@ int start_play(streams * sid, sockets * s)
- "Tune requested with no real parameters, ignoring ...");
- }
- a_id = get_free_adapter(sid->tp.freq, sid->tp.pol, sid->tp.sys,
-- sid->tp.fe);
-+ sid->tp.fe, sid->tp.diseqc);
- LOG("Got adapter %d on socket %d", a_id, s->id);
- if (a_id < 0)
- return -404;
-@@ -1293,17 +1293,12 @@ char* get_stream_pids(int s_id, char *dest, int max_size)
- return dest;
- }
-
--streams *s_tmp;
- _symbols stream_sym[] =
- {
--{ "st_enabled", VAR_AARRAY_INT8, st, 1, MAX_STREAMS,
-- (long int) &s_tmp[0].enabled - (long int) &s_tmp[0] },
--{ "st_play", VAR_AARRAY_INT, st, 1, MAX_STREAMS, (long int) &s_tmp[0].do_play
-- - (long int) &s_tmp[0] },
--{ "st_adapter", VAR_AARRAY_INT, st, 1, MAX_STREAMS, (long int) &s_tmp[0].adapter
-- - (long int) &s_tmp[0] },
--{ "st_useragent", VAR_AARRAY_STRING, st, 1, MAX_STREAMS,
-- (long int) &s_tmp[0].useragent - (long int) &s_tmp[0] },
-+{ "st_enabled", VAR_AARRAY_INT8, st, 1, MAX_STREAMS, offsetof(streams, enabled) },
-+{ "st_play", VAR_AARRAY_INT, st, 1, MAX_STREAMS, offsetof(streams, do_play) },
-+{ "st_adapter", VAR_AARRAY_INT, st, 1, MAX_STREAMS, offsetof(streams, adapter) },
-+{ "st_useragent", VAR_AARRAY_STRING, st, 1, MAX_STREAMS, offsetof(streams, useragent) },
- { "st_rhost", VAR_FUNCTION_STRING, (void *) &get_stream_rhost, 0, 0, 0 },
- { "st_rport", VAR_FUNCTION_INT, (void *) &get_stream_rport, 0, 0, 0 },
- { "st_pids", VAR_FUNCTION_STRING, (void *) &get_stream_pids, 0, 0, 0 },
diff --git a/utils.c b/utils.c
index eaa0317..8cb7c49 100644
--- a/utils.c
|