From: Alexandr Anikin <may@telecom-service.ru>
Date: Wed, 16 Feb 2011 08:06:01 +0000 (+0000)
Subject: Merged revisions 308098 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1834
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd5df75bef0c19b0547980cd354d8355b5b79ffc;p=thirdparty%2Fasterisk.git

Merged revisions 308098 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r308098 | may | 2011-02-16 10:57:22 +0300 (Wed, 16 Feb 2011) | 2 lines

  ifdef __linux__ keepalive variables also
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@308099 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/addons/ooh323c/src/ooSocket.c b/addons/ooh323c/src/ooSocket.c
index 5ec8ed5b36..5527c5f145 100644
--- a/addons/ooh323c/src/ooSocket.c
+++ b/addons/ooh323c/src/ooSocket.c
@@ -191,7 +191,9 @@ typedef socklen_t OOSOCKLEN;
 int ooSocketCreate (OOSOCKET* psocket) 
 {
    int on;
+#ifdef __linux__
    int keepalive = 1, keepcnt = 24, keepidle = 120, keepintvl = 30;
+#endif
    struct linger linger;
    OOSOCKET sock = socket (AF_INET,
                              SOCK_STREAM,