[Asterisk-cvs] asterisk Makefile,1.101,1.102 frame.c,1.35,1.36

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory localhost.localdomain:/tmp/cvs-serv11535

Modified Files:
	Makefile frame.c 
Log Message:
Merge mic's minor patchlet (bug #2092)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- Makefile	18 Jul 2004 17:58:05 -0000	1.101
+++ Makefile	19 Jul 2004 15:52:57 -0000	1.102
@@ -372,6 +372,7 @@
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
 	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
 	install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
 	install -m 644 asterisk.8.gz $(DESTDIR)$(ASTMANDIR)/man8

Index: frame.c
===================================================================
RCS file: /usr/cvsroot/asterisk/frame.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- frame.c	22 Jun 2004 20:11:15 -0000	1.35
+++ frame.c	19 Jul 2004 15:52:57 -0000	1.36
@@ -136,6 +136,9 @@
 	int len;
 	/* IF we have an optimization frame, send it */
 	if (s->opt) {
+		if (s->opt->offset < AST_FRIENDLY_OFFSET)
+			ast_log(LOG_WARNING, "Returning a frame of inappropriate offset (%d).",
+							s->opt->offset);
 		opt = s->opt;
 		s->opt = NULL;
 		return opt;