cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert another getprotobyname()

Browse Source
This commit is contained in:
sthen 2017-03-18 21:49:48 +00:00
parent 721578dc23
commit 40792daef2
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/asterisk/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.250 2017/03/18 21:42:04 sthen Exp $
# $OpenBSD: Makefile,v 1.251 2017/03/18 21:49:48 sthen Exp $
COMMENT-main= open source multi-protocol PBX and telephony toolkit
@ -6,7 +6,7 @@ VER= 13.14.0
PORTROACH= limitw:0,odd
DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
PKGNAME-main= asterisk-${VER}
REVISION-main= 0
REVISION-main= 1
CATEGORIES= telephony

32
telephony/asterisk/patches/patch-channels_chan_skinny_c Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-channels_chan_skinny_c,v 1.4 2017/03/18 21:49:48 sthen Exp $
Same as patch-main_http_c etc; getprotobyname isn't thread-safe.
--- channels/chan_skinny.c.orig Sat Mar 18 15:56:32 2017
+++ channels/chan_skinny.c Sat Mar 18 15:57:21 2017
@@ -7627,7 +7627,7 @@ static void *accept_thread(void *ignore)
socklen_t sinlen;
struct skinnysession *s;
struct protoent *p;
- int arg = 1;
+ int flags = 1;
for (;;) {
sinlen = sizeof(sin);
@@ -7643,12 +7643,10 @@ static void *accept_thread(void *ignore)
continue;
}
- p = getprotobyname("tcp");
- if(p) {
- if( setsockopt(as, p->p_proto, TCP_NODELAY, (char *)&arg, sizeof(arg) ) < 0 ) {
- ast_log(LOG_WARNING, "Failed to set Skinny tcp connection to TCP_NODELAY mode: %s\n", strerror(errno));
- }
- }
+ if (setsockopt(as, IPPROTO_TCP, TCP_NODELAY, (char *) &flags, sizeof(flags)) < 0) {
+ ast_log(LOG_WARNING, "Failed to set Skinny tcp connection to TCP_NODELAY mode: %s\n", strerror(errno));
+ }
+
if (!(s = ast_calloc(1, sizeof(struct skinnysession)))) {
close(as);
ast_atomic_fetchadd_int(&unauth_sessions, -1);