aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Somers <brian@FreeBSD.org>1998-08-02 13:01:16 +0000
committerBrian Somers <brian@FreeBSD.org>1998-08-02 13:01:16 +0000
commit0bdcbcbe9be534c9eb729da4f1d7f98de78cc1a8 (patch)
tree03f5835260b0003a58bf7683bf924870f6d08f74
parentb1770825243dca75f20236abfc8e26821b7f28fd (diff)
Notes
-rw-r--r--usr.sbin/ppp/log.c4
-rw-r--r--usr.sbin/ppp/log.h3
-rw-r--r--usr.sbin/ppp/server.c8
3 files changed, 11 insertions, 4 deletions
diff --git a/usr.sbin/ppp/log.c b/usr.sbin/ppp/log.c
index 0c9c276bdcb8..acc76f5767a7 100644
--- a/usr.sbin/ppp/log.c
+++ b/usr.sbin/ppp/log.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: log.c,v 1.30 1998/06/15 19:06:15 brian Exp $
+ * $Id: log.c,v 1.31 1998/06/15 19:06:48 brian Exp $
*/
#include <sys/types.h>
@@ -68,6 +68,7 @@ static u_long LogMask = MSK(LogPHASE);
static u_long LogMaskLocal = MSK(LogERROR) | MSK(LogALERT) | MSK(LogWARN);
static int LogTunno = -1;
static struct prompt *promptlist; /* Where to log local stuff */
+int log_PromptListChanged;
struct prompt *
log_PromptList()
@@ -123,6 +124,7 @@ log_UnRegisterPrompt(struct prompt *prompt)
break;
}
LogSetMaskLocal();
+ log_PromptListChanged++;
}
}
diff --git a/usr.sbin/ppp/log.h b/usr.sbin/ppp/log.h
index 3f8969ca3528..399cde98f131 100644
--- a/usr.sbin/ppp/log.h
+++ b/usr.sbin/ppp/log.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: log.h,v 1.19 1998/05/21 21:46:30 brian Exp $
+ * $Id: log.h,v 1.20 1998/05/23 22:24:41 brian Exp $
*/
#define LogMIN (1)
@@ -81,6 +81,7 @@ extern int log_ShowLevel(struct cmdargs const *);
extern int log_SetLevel(struct cmdargs const *);
extern int log_ShowWho(struct cmdargs const *);
+extern int log_PromptListChanged;
extern void log_RegisterPrompt(struct prompt *);
extern void log_UnRegisterPrompt(struct prompt *);
extern void log_DestroyPrompts(struct server *);
diff --git a/usr.sbin/ppp/server.c b/usr.sbin/ppp/server.c
index 3fb1de57c147..2a6ccfe77bf3 100644
--- a/usr.sbin/ppp/server.c
+++ b/usr.sbin/ppp/server.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: server.c,v 1.21 1998/06/24 19:33:36 brian Exp $
+ * $Id: server.c,v 1.22 1998/06/27 14:18:10 brian Exp $
*/
#include <sys/types.h>
@@ -152,9 +152,13 @@ server_Read(struct descriptor *d, struct bundle *bundle, const fd_set *fdset)
}
}
+ log_PromptListChanged = 0;
for (p = log_PromptList(); p; p = p->next)
- if (descriptor_IsSet(&p->desc, fdset))
+ if (descriptor_IsSet(&p->desc, fdset)) {
descriptor_Read(&p->desc, bundle, fdset);
+ if (log_PromptListChanged)
+ break;
+ }
}
static int