Merge pull request #186 from giavac/master

andywolk · web-flow · commit b0c314f83993 · 2022-12-13T20:21:29.000+03:00
Fix check of poll result in sresolv
diff --git a/libsofia-sip-ua/sresolv/sres_blocking.c b/libsofia-sip-ua/sresolv/sres_blocking.c
@@ -171,9 +171,9 @@ int sres_blocking_complete(sres_blocking_context_t *c)
       sres_resolver_timer(c->resolver, -1);
     }
     else for (i = 0; i < c->block->n_sockets; i++) {
-      if (c->block->fds[i].revents | POLLERR)
+      if (c->block->fds[i].revents & POLLERR)
 	sres_resolver_error(c->resolver, c->block->fds[i].fd);
-      if (c->block->fds[i].revents | POLLIN)
+      if (c->block->fds[i].revents & POLLIN)
 	sres_resolver_receive(c->resolver, c->block->fds[i].fd);
     }
 #elif HAVE_SELECT

Original file line number	Diff line number	Diff line change
`@@ -171,9 +171,9 @@ int sres_blocking_complete(sres_blocking_context_t *c)`
`171`	`171`	`sres_resolver_timer(c->resolver, -1);`
`172`	`172`	`}`
`173`	`173`	`else for (i = 0; i < c->block->n_sockets; i++) {`
`174`		`- if (c->block->fds[i].revents \| POLLERR)`
	`174`	`+ if (c->block->fds[i].revents & POLLERR)`
`175`	`175`	`sres_resolver_error(c->resolver, c->block->fds[i].fd);`
`176`		`- if (c->block->fds[i].revents \| POLLIN)`
	`176`	`+ if (c->block->fds[i].revents & POLLIN)`
`177`	`177`	`sres_resolver_receive(c->resolver, c->block->fds[i].fd);`
`178`	`178`	`}`
`179`	`179`	`#elif HAVE_SELECT`