Skip to content

Rewrite extsctp on native sctp lib #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
platinumthinker wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Rewrite extsctp on native sctp lib #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81db791
Rewrite extsctp on native sctp lib
platinumthinker Nov 5, 2018
a62d4ce
Support SCTP multihoming for client and server side
platinumthinker Dec 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/ubuntu-16.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:16.04 as builder

RUN apt update \
&& apt install -y build-essential curl git libglib2.0-dev ksh bison flex vim
&& apt install -y build-essential curl git libglib2.0-dev ksh bison flex vim libsctp-dev

RUN mkdir -p ~/opt/src \
&& cd ~/opt/src \
Expand All @@ -24,7 +24,7 @@ RUN tar czf /root/bin.tgz ~/opt/src/seagull/seagull/trunk/src/bin/* \

FROM ubuntu:16.04 as distro
RUN apt update \
&& apt install -y ksh locales \
&& apt install -y ksh locales libsctp1 \
&& apt upgrade -y \
&& locale-gen en_US.UTF-8 \
&& dpkg-reconfigure --frontend noninteractive locales \
Expand Down
4 changes: 2 additions & 2 deletions docker/ubuntu-18.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:18.04 as builder

RUN apt update \
&& apt install -y build-essential curl git libglib2.0-dev ksh bison flex vim
&& apt install -y build-essential curl git libglib2.0-dev ksh bison flex vim libsctp-dev

RUN mkdir -p ~/opt/src \
&& cd ~/opt/src \
Expand All @@ -24,7 +24,7 @@ RUN tar czf /root/bin.tgz ~/opt/src/seagull/seagull/trunk/src/bin/* \

FROM ubuntu:18.04 as distro
RUN apt update \
&& apt install -y ksh locales \
&& apt install -y ksh locales libsctp1 \
&& apt upgrade -y \
&& locale-gen en_US.UTF-8 \
&& dpkg-reconfigure --frontend noninteractive locales \
Expand Down
4 changes: 2 additions & 2 deletions seagull/branches/AtosOrigin/src/library-trans-extsctp/C_SocketSCTP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@



#define SOCKET_ERROR(l,m) iostream_error << m << iostream_endl << iostream_flush
#define SOCKET_ERROR(l,m) iostream_error << m << iostream_flush << iostream_endl
#ifdef DEBUG_MODE
#define SOCKET_DEBUG(l,m) iostream_error << m << iostream_endl << iostream_flush
#define SOCKET_DEBUG(l,m) iostream_error << m << iostream_flush << iostream_endl
#else
#define SOCKET_DEBUG(l,m)
#endif
Expand Down
3 changes: 1 addition & 2 deletions seagull/branches/AtosOrigin/src/library-trans-extsctp/socketSCTP_t.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
#ifndef _SOCKETSCTP_T_HPP
#define _SOCKETSCTP_T_HPP

#include <sctp.h>
#include <ext_socket.h>
#include <netinet/sctp.h>

#ifndef AF_INET6
#define USE_IPV4_ONLY
Expand Down
22 changes: 11 additions & 11 deletions seagull/trunk/src/build-ext-lib.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,19 @@ function gen_lib_with_path {

# sctp library

EXTBUILD_1_TYPE=lib
EXTBUILD_1_FILE=sctplib-1.0.15.tar.gz
EXTBUILD_1_DIR=sctplib-1.0.15
EXTBUILD_1_GENSCRIPT=gen_lib
EXTBUILD_1_ENDSCRIPT=extract_files
# EXTBUILD_1_TYPE=lib
# EXTBUILD_1_FILE=sctplib-1.0.15.tar.gz
# EXTBUILD_1_DIR=sctplib-1.0.15
# EXTBUILD_1_GENSCRIPT=gen_lib
# EXTBUILD_1_ENDSCRIPT=extract_files

# sctp socket library
# # sctp socket library

EXTBUILD_2_TYPE=lib
EXTBUILD_2_FILE=socketapi-2.2.8.tar.gz
EXTBUILD_2_DIR=socketapi-2.2.8
EXTBUILD_2_GENSCRIPT=gen_lib_with_path
EXTBUILD_2_ENDSCRIPT=extract_files
# EXTBUILD_2_TYPE=lib
# EXTBUILD_2_FILE=socketapi-2.2.8.tar.gz
# EXTBUILD_2_DIR=socketapi-2.2.8
# EXTBUILD_2_GENSCRIPT=gen_lib_with_path
# EXTBUILD_2_ENDSCRIPT=extract_files

# openssl library

Expand Down
4 changes: 2 additions & 2 deletions seagull/trunk/src/build.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ BUILD_LIBEXTSCTP_CC_LINUX=g++
BUILD_LIBEXTSCTP_CC_FLAGS_LINUX="-I`check_sctp_external_lib`/include -D_GNU_SOURCE -D_REENTRANT -DSCTP_SOCKET_API -shared -Wall -fPIC -Werror"
BUILD_LIBEXTSCTP_LD_LINUX=g++
BUILD_LIBEXTSCTP_LD_FLAGS_LINUX="-fPIC -shared"
BUILD_LIBEXTSCTP_LD_LIBS_LINUX="-L`check_sctp_external_lib`/lib -lsctplib -lsctpsocket"
BUILD_LIBEXTSCTP_LD_LIBS_LINUX="-L`check_sctp_external_lib`/lib -lsctp"

# Linux library generation definition for using TCAP lib
#BUILD_TCAP_LIB_CC_LINUX=g++
Expand All @@ -160,7 +160,7 @@ BUILD_TEST_CC_LINUX=g++
BUILD_TEST_CC_FLAGS_LINUX="-D_GNU_SOURCE -D_REENTRANT -I/usr/local/include -Wall -fPIC"
BUILD_TEST_LD_LINUX=g++
BUILD_TEST_LD_FLAGS_LINUX=""
BUILD_TEST_LD_LIBS_LINUX="-lpthread -L/usr/local/lib -lsctplib -lsctpsocket"
BUILD_TEST_LD_LIBS_LINUX="-lpthread -L/usr/local/lib -lsctp"
BUILD_TEST_LEX_LINUX=flex
BUILD_TEST_LEX_FLAGS_LINUX="-l"
BUILD_TEST_YACC_LINUX=bison
Expand Down
Loading