Compare commits
2 Commits
build15-rc
...
build15-rc
Author | SHA1 | Date | |
---|---|---|---|
|
c2b652cdff | ||
|
100ef6e46f |
@@ -4,5 +4,10 @@ while test ! -f /tmp/nontpd; do
|
|||||||
NTPD_OPTS=""
|
NTPD_OPTS=""
|
||||||
test -r /etc/sysconfig/config && . /etc/sysconfig/config
|
test -r /etc/sysconfig/config && . /etc/sysconfig/config
|
||||||
test -z "$NTPD_OPTS" && NTPD_OPTS="-p 0.pool.ntp.org"
|
test -z "$NTPD_OPTS" && NTPD_OPTS="-p 0.pool.ntp.org"
|
||||||
|
i=0
|
||||||
|
while test ! -f /etc/resolv.conf -a $i -le 100; do
|
||||||
|
sleep 0.2
|
||||||
|
i=$(expr $i + 1)
|
||||||
|
done
|
||||||
/usr/sbin/ntpd -n -I eth0 $NTPD_OPTS
|
/usr/sbin/ntpd -n -I eth0 $NTPD_OPTS
|
||||||
done
|
done
|
||||||
|
@@ -1,3 +1,33 @@
|
|||||||
|
diff --git a/src/adapter.c b/src/adapter.c
|
||||||
|
index e034e3e..e1d11a5 100644
|
||||||
|
--- a/src/adapter.c
|
||||||
|
+++ b/src/adapter.c
|
||||||
|
@@ -878,7 +878,7 @@ int update_pids(int aid)
|
||||||
|
if (dp)
|
||||||
|
dump_pids(aid);
|
||||||
|
dp = 0;
|
||||||
|
- if (ad->pids[i].fd <= 0)
|
||||||
|
+ if (ad->pids[i].fd <= 0) {
|
||||||
|
if ((ad->pids[i].fd = ad->set_pid(ad, ad->pids[i].pid)) < 0)
|
||||||
|
{
|
||||||
|
|
||||||
|
@@ -888,6 +888,8 @@ int update_pids(int aid)
|
||||||
|
LOG0("Maximum pid filter reached, lowering the value to %d", opts.max_pids);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
+ ad->active_pids++;
|
||||||
|
+ }
|
||||||
|
ad->pids[i].flags = 1;
|
||||||
|
if (ad->pids[i].pid == 0)
|
||||||
|
ad->pat_processed = 0;
|
||||||
|
@@ -895,7 +897,6 @@ int update_pids(int aid)
|
||||||
|
ad->pids[i].cc = 255;
|
||||||
|
ad->pids[i].cc_err = 0;
|
||||||
|
ad->pids[i].dec_err = 0;
|
||||||
|
- ad->active_pids++;
|
||||||
|
}
|
||||||
|
if (ad->commit)
|
||||||
|
ad->commit(ad);
|
||||||
diff --git a/src/axe.c b/src/axe.c
|
diff --git a/src/axe.c b/src/axe.c
|
||||||
index 52e8dad..1578a51 100644
|
index 52e8dad..1578a51 100644
|
||||||
--- a/src/axe.c
|
--- a/src/axe.c
|
||||||
@@ -50,7 +80,7 @@ index 0cd9b0b..c9be9c4 100644
|
|||||||
#else
|
#else
|
||||||
#define AXE_OPTS ""
|
#define AXE_OPTS ""
|
||||||
diff --git a/src/minisatip.h b/src/minisatip.h
|
diff --git a/src/minisatip.h b/src/minisatip.h
|
||||||
index 6512250..7d41be7 100644
|
index 6512250..9cb8715 100644
|
||||||
--- a/src/minisatip.h
|
--- a/src/minisatip.h
|
||||||
+++ b/src/minisatip.h
|
+++ b/src/minisatip.h
|
||||||
@@ -9,7 +9,7 @@
|
@@ -9,7 +9,7 @@
|
||||||
@@ -58,7 +88,7 @@ index 6512250..7d41be7 100644
|
|||||||
#define VERSION_BUILD "16"
|
#define VERSION_BUILD "16"
|
||||||
#define CC(a, b, c) #a b #c
|
#define CC(a, b, c) #a b #c
|
||||||
-#define VERSION CC(0.7., VERSION_BUILD, )
|
-#define VERSION CC(0.7., VERSION_BUILD, )
|
||||||
+#define VERSION CC(0.7., VERSION_BUILD, -axe208)
|
+#define VERSION CC(0.7., VERSION_BUILD, -axe209)
|
||||||
|
|
||||||
void set_options(int argc, char *argv[]);
|
void set_options(int argc, char *argv[]);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user