Commit 463b01d2 authored by Daisy Hsiung's avatar Daisy Hsiung
Browse files

Merge remote-tracking branch 'upstream/master'

parents af4842e0 8b9208b9

.travis.yml

+7 −4
Original line number Diff line number Diff line
@@ -6,9 +6,12 @@ compiler: 
  - clang

  - gcc

before_script:

  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y

  - sudo apt-get update -qq

  - sudo apt-get install -y gcc-4.8

  - if [ "$TRAVIS_OS_NAME" = "linux" ] ; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi

  - if [ "$TRAVIS_OS_NAME" = "linux" ] ; then sudo apt-get update -qq; fi

  - if [ "$TRAVIS_OS_NAME" = "linux" ] ; then sudo apt-get install -y gcc-4.8; fi

  - if [ "$TRAVIS_OS_NAME" = "osx"   ] ; then sudo brew update ; fi

  - if [ "$TRAVIS_OS_NAME" = "osx"   ] ; then sudo brew outdated openssl || brew upgrade openssl ; fi

  - if [ "$TRAVIS_OS_NAME" = "osx"   ] ; then export OPENSSL_PATH=/usr/local/opt/openssl ; fi

  - if [ $CC == 'gcc'                ] ; then export CC=gcc-4.8; fi;

  - bundle install

  - make clean

src/lib/kinetic_device_info.c

+5 −0
Original line number Diff line number Diff line
@@ -153,6 +153,11 @@ static KineticLogInfo_Configuration * KineticLogInfo_GetConfiguration( 
        cfg->protocolSourceHash = copy_str(gcfg->protocolsourcehash);

        if (cfg->protocolSourceHash == NULL) { goto cleanup; }



	if (gcfg->has_port)

		cfg->port = gcfg->port;

	if (gcfg->has_tlsport)

		cfg->tlsPort = gcfg->tlsport;



        cfg->numInterfaces = gcfg->n_interface;

        cfg->interfaces = calloc(cfg->numInterfaces, sizeof(*cfg->interfaces));

        if (cfg->interfaces == NULL) { goto cleanup; }

src/lib/kinetic_socket.c

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ void KineticSocket_BeginPacket(int fd) 
    int on = 1;

    setsockopt(fd, IPPROTO_TCP, TCP_CORK, &on, sizeof(on));

#else

    (void)socket;

    (void)fd;

#endif

}
@@ -175,6 +175,6 @@ void KineticSocket_FinishPacket(int fd) 
    int off = 0;

    setsockopt(fd, IPPROTO_TCP, TCP_CORK, &off, sizeof(off));

#else

    (void)socket;

    (void)fd;

#endif

}