Merge pull request #6 from alfredh/master

Merge Upstream

docs/COPYING

@@ -1,6 +1,6 @@
-Copyright (c) 2010 - 2014, Alfred E. Heggestad
-Copyright (c) 2010 - 2014, Richard Aas
-Copyright (c) 2010 - 2014, Creytiv.com
+Copyright (c) 2010 - 2015, Alfred E. Heggestad
+Copyright (c) 2010 - 2015, Richard Aas
+Copyright (c) 2010 - 2015, Creytiv.com
 All rights reserved.
 
 

docs/README

@@ -2,7 +2,7 @@ README
 ------
 
 Baresip is a portable and modular SIP User-Agent with audio and video support
-Copyright (c) 2010 - 2014 Creytiv.com
+Copyright (c) 2010 - 2015 Creytiv.com
 
 Distributed under BSD license
 

include/baresip.h

@@ -214,9 +214,13 @@ enum presence_status {
 
 struct contact;
 
+int  contact_init(void);
+void contact_close(void);
 int  contact_add(struct contact **contactp, const struct pl *addr);
 int  contacts_print(struct re_printf *pf, void *unused);
 void contact_set_presence(struct contact *c, enum presence_status status);
+bool contact_block_access(const char *uri);
+struct contact  *contact_find(const char *uri);
 struct sip_addr *contact_addr(const struct contact *c);
 struct list     *contact_list(void);
 const char      *contact_str(const struct contact *c);

modules/avcapture/avcapture.m

@@ -9,7 +9,7 @@
 #include <AVFoundation/AVFoundation.h>
 
 
-static struct vidsrc *vidsrcv[4];
+static struct vidsrc *vidsrc;
 
 
 @interface avcap : NSObject < AVCaptureVideoDataOutputSampleBufferDelegate >
@@ -354,7 +354,6 @@ static int module_init(void)
 	AVCaptureDevice *dev = nil;
 	NSAutoreleasePool *pool;
 	Class cls = NSClassFromString(@"AVCaptureDevice");
-	size_t i = 0;
 	int err = 0;
 	if (!cls)
 		return ENOSYS;
@@ -366,14 +365,11 @@ static int module_init(void)
 
 		const char *name = [[dev localizedName] UTF8String];
 
-		if (i >= ARRAY_SIZE(vidsrcv))
-			break;
-
-		err = vidsrc_register(&vidsrcv[i++], name, alloc, update);
-		if (err)
-			break;
+		debug("avcapture: found video device '%s'\n", name);
 	}
 
+	err = vidsrc_register(&vidsrc, "avcapture", alloc, update);
+
 	[pool drain];
 
 	return err;
@@ -382,10 +378,7 @@ static int module_init(void)
 
 static int module_close(void)
 {
-	size_t i;
-
-	for (i=0; i<ARRAY_SIZE(vidsrcv); i++)
-		vidsrcv[i] = mem_deref(vidsrcv[i]);
+	vidsrc = mem_deref(vidsrc);
 
 	return 0;
 }

modules/contact/contact.c

@@ -149,10 +149,18 @@ static int write_template(const char *file)
 			 "#\n"
 			 "#  addr-params:\n"
 			 "#    ;presence={none,p2p}\n"
+			 "#    ;access={allow,block}\n"
 			 "#\n"
 			 "\n"
+			 "\n"
 			 "\"Echo Server\" <sip:[email protected]>\n"
-			 "\"%s\" <sip:%s@%s>;presence=p2p\n",
+			 "\"%s\" <sip:%s@%s>;presence=p2p\n"
+			 "\n"
+			 "# Access rules\n"
+			 "\"Catch All\" <sip:*@*>;access=block\n"
+			 "\"Good Friend\" <sip:[email protected]>;access=allow\n"
+			 "\n"
+			 ,
 			 user, user, domain);
 
 	if (f)

modules/v4l2/v4l2.c

@@ -18,7 +18,7 @@
 #include <re.h>
 #include <rem.h>
 #include <baresip.h>
-#if defined (OPENBSD)
+#if defined (OPENBSD) || defined (NETBSD)
 #include <sys/videoio.h>
 #else
 #include <linux/videodev2.h>

modules/vidloop/vidloop.c

@@ -42,6 +42,7 @@ struct video_loop {
 	struct tmr tmr_bw;
 	uint16_t seq;
 	bool need_conv;
+	int err;
 };
 
 
@@ -65,8 +66,17 @@ static int display(struct video_loop *vl, struct vidframe *frame)
 			err |= st->vf->dech(st, frame);
 	}
 
+	if (err) {
+		warning("vidloop: error in video-filters (%m)\n", err);
+	}
+
 	/* display frame */
-	(void)vidisp_display(vl->vidisp, "Video Loop", frame);
+	err = vidisp_display(vl->vidisp, "Video Loop", frame);
+	if (err == ENODEV) {
+		info("vidloop: video-display was closed\n");
+		vl->vidisp = mem_deref(vl->vidisp);
+		vl->err = err;
+	}
 
 	return err;
 }
@@ -265,7 +275,13 @@ static void timeout_bw(void *arg)
 {
 	struct video_loop *vl = arg;
 
-	tmr_start(&vl->tmr_bw, 5000, timeout_bw, vl);
+	if (vl->err) {
+		info("error in video-loop -- closing (%m)\n", vl->err);
+		gvl = mem_deref(gvl);
+		return;
+	}
+
+	tmr_start(&vl->tmr_bw, 2000, timeout_bw, vl);
 
 	calc_bitrate(vl);
 	print_status(vl);

modules/x11/x11.c

@@ -29,6 +29,7 @@ struct vidisp_st {
 	bool xshmat;
 	bool internal;
 	enum vidfmt pixfmt;
+	Atom XwinDeleted;
 };
 
 
@@ -52,34 +53,48 @@ static int error_handler(Display *d, XErrorEvent *e)
 }
 
 
-static void destructor(void *arg)
+static void close_window(struct vidisp_st *st)
 {
-	struct vidisp_st *st = arg;
-
-	if (st->image) {
-		st->image->data = NULL;
-		XDestroyImage(st->image);
-	}
-
-	if (st->gc)
+	if (st->gc && st->disp) {
 		XFreeGC(st->disp, st->gc);
+		st->gc = NULL;
+	}
 
-	if (st->xshmat)
+	if (st->xshmat && st->disp) {
 		XShmDetach(st->disp, &st->shm);
+	}
 
-	if (st->shm.shmaddr != (char *)-1)
+	if (st->shm.shmaddr != (char *)-1) {
 		shmdt(st->shm.shmaddr);
+		st->shm.shmaddr = (char *)-1;
+	}
 
 	if (st->shm.shmid >= 0)
 		shmctl(st->shm.shmid, IPC_RMID, NULL);
 
 	if (st->disp) {
-		if (st->internal && st->win)
+		if (st->internal && st->win) {
 			XDestroyWindow(st->disp, st->win);
+			st->win = 0;
+		}
 
 		XCloseDisplay(st->disp);
+		st->disp = NULL;
+	}
+}
+
+
+static void destructor(void *arg)
+{
+	struct vidisp_st *st = arg;
+
+	if (st->image) {
+		st->image->data = NULL;
+		XDestroyImage(st->image);
 	}
 
+	close_window(st);
+
 	mem_deref(st->vd);
 }
 
@@ -96,6 +111,12 @@ static int create_window(struct vidisp_st *st, const struct vidsz *sz)
 	XClearWindow(st->disp, st->win);
 	XMapRaised(st->disp, st->win);
 
+	/*
+	 * setup to catch window deletion
+	 */
+	st->XwinDeleted = XInternAtom(st->disp, "WM_DELETE_WINDOW", True);
+	XSetWMProtocols(st->disp, st->win, &st->XwinDeleted, 1);
+
 	return 0;
 }
 
@@ -261,6 +282,33 @@ static int display(struct vidisp_st *st, const char *title,
 	struct vidframe frame_rgb;
 	int err = 0;
 
+	if (!st->disp)
+		return ENODEV;
+
+	/*
+	 * check for window delete - without blocking
+	 */
+	while (XPending(st->disp)) {
+
+		XEvent e;
+
+		XNextEvent(st->disp, &e);
+
+		if (e.type == ClientMessage) {
+			if ((Atom) e.xclient.data.l[0] == st->XwinDeleted) {
+
+				info("x11: window deleted\n");
+
+				/*
+				 * we have to bail as all of the display
+				 * pointers are bad.
+				 */
+				close_window(st);
+				return ENODEV;
+			}
+		}
+	}
+
 	if (!vidsz_cmp(&st->size, &frame->size)) {
 		char capt[256];
 

modules/zrtp/zrtp.c

@@ -276,7 +276,7 @@ static int verify_sas(struct re_printf *pf, void *arg)
 		char *s2h;
 		char rzid[ZRTP_STRING16] = "";
 		zrtp_status_t s;
-		zrtp_string16_t remote_zid;
+		zrtp_string16_t remote_zid = ZSTR_INIT_EMPTY(remote_zid);
 
 		if (str_len(carg->prm) != 24) {
 			warning("zrtp: invalid remote ZID (%s)\n", carg->prm);
@@ -289,7 +289,8 @@ static int verify_sas(struct re_printf *pf, void *arg)
 			warning("zrtp: str2hex failed (%s)\n", s2h);
 			return EINVAL;
 		}
-		zrtp_zstrcpyc(ZSTR_GV(remote_zid), rzid);
+		zrtp_zstrncpyc(ZSTR_GV(remote_zid), (const char*)rzid,
+			       sizeof(zrtp_zid_t));
 
 		s = zrtp_cache_set_verified(zrtp_global->cache,
 					    ZSTR_GV(remote_zid),

src/call.c

@@ -391,6 +391,18 @@ static void audio_error_handler(int err, const char *str, void *arg)
 }
 
 
+static void video_error_handler(int err, const char *str, void *arg)
+{
+	struct call *call = arg;
+	MAGIC_CHECK(call);
+
+	warning("call: video device error: %m (%s)\n", err, str);
+
+	call_stream_stop(call);
+	call_event_handler(call, CALL_EVENT_CLOSED, str);
+}
+
+
 static void menc_error_handler(int err, void *arg)
 {
 	struct call *call = arg;
@@ -523,7 +535,8 @@ int call_alloc(struct call **callp, const struct config *cfg, struct list *lst,
 				  acc->mnat, call->mnats,
 				  acc->menc, call->mencs,
 				  "main",
-				  account_vidcodecl(call->acc));
+				  account_vidcodecl(call->acc),
+				  video_error_handler, call);
 		if (err)
 			goto out;
  	}