aboutsummaryrefslogtreecommitdiffstats
path: root/sualibrary
diff options
context:
space:
mode:
Diffstat (limited to 'sualibrary')
-rw-r--r--sualibrary/Makefile.am3
-rw-r--r--sualibrary/sua/Makefile.am6
-rw-r--r--sualibrary/sua/sua.h1
-rw-r--r--sualibrary/sua/sua_adapt.cpp2
-rw-r--r--sualibrary/sua/sua_asp_mgnt.cpp22
-rw-r--r--sualibrary/sua/sua_cl.cpp2
-rw-r--r--sualibrary/sua/sua_co.cpp3
-rw-r--r--sualibrary/sua/sua_distribution.cpp2
-rw-r--r--sualibrary/sua/sua_distribution.h2
-rw-r--r--sualibrary/sua/sua_file.cpp3
-rw-r--r--sualibrary/sua/sua_logging.cpp2
-rw-r--r--sualibrary/sua/sua_snm_mgnt.cpp7
12 files changed, 30 insertions, 25 deletions
diff --git a/sualibrary/Makefile.am b/sualibrary/Makefile.am
index 4d788e8..8ae86c4 100644
--- a/sualibrary/Makefile.am
+++ b/sualibrary/Makefile.am
@@ -5,6 +5,3 @@ SUBDIRS = docs sua testup
####### kdevelop will overwrite this part!!! (end)############
-SUBDIRS = docs sua testup
-
-
diff --git a/sualibrary/sua/Makefile.am b/sualibrary/sua/Makefile.am
index 85b480e..cbda082 100644
--- a/sualibrary/sua/Makefile.am
+++ b/sualibrary/sua/Makefile.am
@@ -20,8 +20,12 @@ include_HEADERS = sua.h
INCLUDES = -I/usr/local/include
#build a libtool library for installation in libdir
+
lib_LTLIBRARIES = libsua.la
-libsua_la_SOURCES = sua_tcb.cpp sua_syntax.cpp sua_sual.cpp sua_logging.cpp sua_file.cpp sua_distribution.cpp sua_dataname.cpp sua_database.cpp sua_co.cpp sua_datassoc.cpp sua_cl.cpp sua_asp_mgnt.cpp sua_adapt.cpp sua_snm_mgnt.cpp
+
+AUTOMAKE_OPTIONS = no-dependencies
+
+libsua_la_SOURCES = sua_snm_mgnt.cpp sua_tcb.cpp sua_syntax.cpp sua_sual.cpp sua_logging.cpp sua_file.cpp sua_distribution.cpp sua_dataname.cpp sua_database.cpp sua_co.cpp sua_datassoc.cpp sua_cl.cpp sua_asp_mgnt.cpp sua_adapt.cpp
libsua_la_LDFLAGS = -no-undefined -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) $(LDFLAGS)
diff --git a/sualibrary/sua/sua.h b/sualibrary/sua/sua.h
index 9c70744..cda1b76 100644
--- a/sualibrary/sua/sua.h
+++ b/sualibrary/sua/sua.h
@@ -130,7 +130,6 @@ using namespace std;
#define SUA_PORT 14001
#define SUA_PPI 4
-#define IPPROTO_SCTP 132
#define SUA_MAX_MSG_LEN 2000
diff --git a/sualibrary/sua/sua_adapt.cpp b/sualibrary/sua/sua_adapt.cpp
index 1511949..8f9b1ea 100644
--- a/sualibrary/sua/sua_adapt.cpp
+++ b/sualibrary/sua/sua_adapt.cpp
@@ -199,7 +199,7 @@ unsigned int sua_getPath( unsigned int assoc_id,
else
result = SUA_PATH_NO_DEST_ADDR_PRESENT;
- pathinfo.local_addr.pc.ipvx.ch = sua.local_sua.instance[sua.AssocDB.instance[assoc_id].local_sua_id].Source.addrs[0].ch;
+ pathinfo.local_addr.pc.ipvx = sua.local_sua.instance[sua.AssocDB.instance[assoc_id].local_sua_id].Source.addrs[0];
/*memcpy( pathinfo.local_addr.pc.ipvx.ch, sua.AssocDB.instance[assoc_id].Source.addrs[0].ch,24);*/
diff --git a/sualibrary/sua/sua_asp_mgnt.cpp b/sualibrary/sua/sua_asp_mgnt.cpp
index e63bbde..af7b271 100644
--- a/sualibrary/sua/sua_asp_mgnt.cpp
+++ b/sualibrary/sua/sua_asp_mgnt.cpp
@@ -151,7 +151,7 @@ int sua_send_ASPUP( unsigned int Sua_assoc_id,
stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY,
SCTP_NO_CONTEXT,
SCTP_INFINITE_LIFETIME,
@@ -228,7 +228,7 @@ int sua_send_ASPUP_ACK( unsigned int Sua_assoc_id,
stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY,
SCTP_NO_CONTEXT,
SCTP_INFINITE_LIFETIME,
@@ -300,7 +300,7 @@ int sua_send_ASPDOWN( unsigned int Sua_assoc_id
stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY,
SCTP_NO_CONTEXT,
SCTP_INFINITE_LIFETIME,
@@ -371,7 +371,7 @@ int sua_send_ASPDOWN_ACK( unsigned int Sua_assoc_id
stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY,
SCTP_NO_CONTEXT,
SCTP_INFINITE_LIFETIME,
@@ -441,7 +441,7 @@ int sua_send_BEAT( unsigned int Sua_assoc_id
stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY,
SCTP_NO_CONTEXT,
SCTP_INFINITE_LIFETIME,
@@ -515,7 +515,7 @@ int sua_send_BEAT_ACK( unsigned int Sua_assoc_id,
stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY,
SCTP_NO_CONTEXT,
SCTP_INFINITE_LIFETIME,
@@ -601,7 +601,7 @@ int sua_send_ASPAC( unsigned int Sua_assoc_id,
stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY,
SCTP_NO_CONTEXT,
SCTP_INFINITE_LIFETIME,
@@ -685,7 +685,7 @@ int sua_send_ASPAC_ACK( unsigned int Sua_assoc_id,
stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY,
SCTP_NO_CONTEXT,
SCTP_INFINITE_LIFETIME,
@@ -762,7 +762,7 @@ int sua_send_ASPINAC( unsigned int Sua_assoc_id,
stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY,
SCTP_NO_CONTEXT,
SCTP_INFINITE_LIFETIME,
@@ -839,7 +839,7 @@ int sua_send_ASPINAC_ACK( unsigned int Sua_assoc_id,
stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY,
SCTP_NO_CONTEXT,
SCTP_INFINITE_LIFETIME,
@@ -923,7 +923,7 @@ int sua_send_NOTIFY( unsigned int Sua_assoc_id,
stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY,
SCTP_NO_CONTEXT,
SCTP_INFINITE_LIFETIME,
diff --git a/sualibrary/sua/sua_cl.cpp b/sualibrary/sua/sua_cl.cpp
index 3120ac5..dbe8c50 100644
--- a/sualibrary/sua/sua_cl.cpp
+++ b/sualibrary/sua/sua_cl.cpp
@@ -120,7 +120,7 @@ int sua_send_Message( signed int sctp_assoc_id,
sctp_stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY, /* replace in future with sctp_loadshare*/
SCTP_NO_CONTEXT, SCTP_INFINITE_LIFETIME,
sctp_delivery_type,
diff --git a/sualibrary/sua/sua_co.cpp b/sualibrary/sua/sua_co.cpp
index bbee72a..4d331fa 100644
--- a/sualibrary/sua/sua_co.cpp
+++ b/sualibrary/sua/sua_co.cpp
@@ -71,6 +71,7 @@
#include "sua_logging.h"
#include "sua_tcb.h"
#include "sua_cl.h"
+#include "sua_co.h"
#ifdef LINUX
#include <unistd.h>
@@ -1767,7 +1768,7 @@ short process_CORELRQ_msg ( unsigned int sua_assoc_id,
stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY,
SCTP_NO_CONTEXT,
SCTP_INFINITE_LIFETIME,
diff --git a/sualibrary/sua/sua_distribution.cpp b/sualibrary/sua/sua_distribution.cpp
index d8b342b..6def7b3 100644
--- a/sualibrary/sua/sua_distribution.cpp
+++ b/sualibrary/sua/sua_distribution.cpp
@@ -104,7 +104,7 @@ extern tcb_Sua_msgqueue_pool msg_store;
/* sctp_DataArriveNotif */
/***********************************************************************/
void sctp_DataArriveNotif( unsigned int sctp_assoc_id,
- unsigned int stream_id,
+ unsigned short stream_id,
unsigned int len,
unsigned short data_streamSN,
unsigned int data_tsn,
diff --git a/sualibrary/sua/sua_distribution.h b/sualibrary/sua/sua_distribution.h
index eac8e1c..b94175e 100644
--- a/sualibrary/sua/sua_distribution.h
+++ b/sualibrary/sua/sua_distribution.h
@@ -90,7 +90,7 @@ typedef struct {
/* sctp_DataArriveNotif */
/***********************************************************************/
void sctp_DataArriveNotif( unsigned int assoc_id,
- unsigned int stream_id,
+ unsigned short stream_id,
unsigned int len,
unsigned short streamSN,
unsigned int tsn,
diff --git a/sualibrary/sua/sua_file.cpp b/sualibrary/sua/sua_file.cpp
index f9ca43d..293639a 100644
--- a/sualibrary/sua/sua_file.cpp
+++ b/sualibrary/sua/sua_file.cpp
@@ -917,6 +917,9 @@ int read_sua_conf_file( string filename,
cout << cmdline << "\n";
}
+
+ return(0);
+
} /* end of read_sua_conf_file */
// end of module sua_file.c
diff --git a/sualibrary/sua/sua_logging.cpp b/sualibrary/sua/sua_logging.cpp
index a3a2a84..ffbd777 100644
--- a/sualibrary/sua/sua_logging.cpp
+++ b/sualibrary/sua/sua_logging.cpp
@@ -69,7 +69,7 @@
#include <string>
#include <iostream>
#include <iomanip>
-#include <fstream.h>
+#include <fstream>
#include <sys/time.h>
#include <time.h>
diff --git a/sualibrary/sua/sua_snm_mgnt.cpp b/sualibrary/sua/sua_snm_mgnt.cpp
index 0eb5950..996f27a 100644
--- a/sualibrary/sua/sua_snm_mgnt.cpp
+++ b/sualibrary/sua/sua_snm_mgnt.cpp
@@ -60,6 +60,7 @@
*/
#include "sua_debug.h"
+#include "sua_snm_mgnt.h"
#include "sua_asp_mgnt.h"
#include "sua_database.h"
#include "sua_syntax.h"
@@ -135,7 +136,7 @@ int sua_send_DAVA( unsigned int Sua_assoc_id,
stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY,
SCTP_NO_CONTEXT,
SCTP_INFINITE_LIFETIME,
@@ -210,7 +211,7 @@ int sua_send_DUNA( unsigned int Sua_assoc_id,
stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY,
SCTP_NO_CONTEXT,
SCTP_INFINITE_LIFETIME,
@@ -292,7 +293,7 @@ unsigned int sua_send_daud()
stream_id,
(unsigned char *) databuf,
datalen,
- SUA_PPI,
+ htonl(SUA_PPI),
SCTP_USE_PRIMARY,
SCTP_NO_CONTEXT,
SCTP_INFINITE_LIFETIME,