Compare commits

...

18 Commits

Author SHA1 Message Date
Hamish Coleman a0c2af5f78 Remove define that no longer does anything 1 year ago
Hamish Coleman afbc5344e0 Move some generic appending out of the config.mak 1 year ago
Hamish Coleman 6d464f24a6 Ensure that WINDRES always has a value 1 year ago
Hamish Coleman 3c9a170b12 Some header simplification 1 year ago
Hamish Coleman d21a4fe0a2 Remove some unneeded includes 1 year ago
Hamish Coleman 548e1204f3 Address warning - another windows pedantic header order issue 1 year ago
Hamish Coleman d39f5c7892 Disable running full tests on BSD builds - they are flappy 1 year ago
Hamish Coleman ce3ed1fb90 Expand the freebsd hacky fix to encompas edge tests as well 1 year ago
Hamish Coleman ccd33dc8cc Hacky fix for tests running on freebsd 1 year ago
Hamish Coleman 0d005d189d Fix silent failure of sizeof for STRBUF_INIT() 1 year ago
Hamish Coleman 42a716ae7b Actually test freebsd 1 year ago
Hamish Coleman a2c78e140a Minor fixes for FreeBSD 1 year ago
Hamish Coleman 2413ce498f The autogen script is not using any bash features 1 year ago
Hamish Coleman 89125ec423 Use the defined access method for structure. 1 year ago
Hamish Coleman 169d3a8cc7 Fix use with older autoconf 1 year ago
Hamish Coleman cfc9c8c10d Simplify and make more consistant the pthread library 1 year ago
Hamish Coleman 4c0c173221 Check if we have been configured before running most of Make 1 year ago
Hamish Coleman a1bef636de Partially Revert "Add rules to run autogen/configure and use them in some of the simpler CI builds" 1 year ago
  1. 63
      .github/workflows/tests.yml
  2. 1
      .gitignore
  3. 20
      Makefile
  4. 2
      autogen.sh
  5. 8
      config.mak.in
  6. 14
      configure.ac
  7. 8
      include/edge_utils_win32.h
  8. 3
      include/n2n_typedefs.h
  9. 0
      scripts/config.guess
  10. 1890
      scripts/config.sub
  11. 5
      scripts/hack_fakeautoconf.sh
  12. 541
      scripts/install-sh
  13. 4
      scripts/test_integration_edge.sh
  14. 3
      scripts/test_integration_supernode.sh
  15. 9
      src/edge_management.c
  16. 4
      src/edge_utils.c
  17. 2
      src/edge_utils_win32.c
  18. 2
      src/management.c
  19. 12
      src/n2n.c
  20. 3
      src/sn_management.c
  21. 6
      src/strbuf.h
  22. 1
      src/tuntap_freebsd.c
  23. 5
      src/wire.c

63
.github/workflows/tests.yml

@ -21,6 +21,8 @@ jobs:
- name: Run minimal test set
run: |
./autogen.sh
./configure
make test
- if: ${{ failure() }}
@ -53,7 +55,7 @@ jobs:
- name: Run minimal test set
run: |
make configure
./autogen.sh
./configure \
--enable-pthread \
--enable-miniupnp \
@ -61,7 +63,7 @@ jobs:
--enable-cap \
--enable-pcap \
--with-zstd \
CFLAGS="-O3 -DN2N_OPTION_USE_PORTMAPPING"
CFLAGS="-O3"
make test
lint:
@ -76,6 +78,12 @@ jobs:
run: |
git fetch --force --tags
- name: Make the makefiles
run: |
./autogen.sh
./configure
- name: Install essential
run: |
sudo apt update
@ -110,7 +118,7 @@ jobs:
- name: Make the makefiles
run: |
make configure
./autogen.sh
export CFLAGS="${{ matrix.flags }}"
export LDFLAGS="${{ matrix.flags }}"
@ -156,8 +164,10 @@ jobs:
sudo apt-get update
sudo apt-get install build-essential
- name: Install required packages
- name: generate a makefile and use it to install more packages
run: |
./autogen.sh
./configure
make build-dep
shell: bash
@ -201,6 +211,45 @@ jobs:
- name: Upload data to codecov
uses: codecov/codecov-action@v3
test_bsd:
name: Test BSD
runs-on: ubuntu-latest
strategy:
matrix:
os:
- name: freebsd
architecture: x86-64
version: '13.2'
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Fix Checkout
run: |
git fetch --force --tags
- name: Test on ${{ matrix.os.name }}
uses: cross-platform-actions/action@v0.15.0
with:
operating_system: ${{ matrix.os.name }}
architecture: ${{ matrix.os.architecture }}
version: ${{ matrix.os.version }}
shell: bash
memory: 5G
cpu_count: 4
run: |
sudo pkg install -y \
autoconf \
automake \
gcc \
git \
gmake \
python3
./autogen.sh
./configure
gmake all
test_macos:
name: Test MacOS
runs-on: ${{ matrix.os }}
@ -220,12 +269,14 @@ jobs:
git fetch --force --tags
- name: Install essential
- name: Install packages
run: |
brew install automake
- name: Install required packages
- name: generate a makefile and use it to install more packages
run: |
./autogen.sh
./configure
make build-dep
shell: bash

1
.gitignore

@ -9,7 +9,6 @@ config.rpath
config.status
include/config.h
include/config.h.in
tools/config.mak
autom4te.cache
edge
example_edge_embed_quick_edge_init

20
Makefile

@ -1,3 +1,5 @@
# Our default make target
all:
export CC
export AR
@ -6,7 +8,16 @@ export LDFLAGS
export LDLIBS
export TOOLS_ADDITIONAL
include config.mak
-include config.mak
ifndef CONFIG_HOST
# TODO:
# dont error if we are installing build-deps or other non-compile action
$(error Please run ./configure)
endif
CFLAGS+=-I./include
LDFLAGS+=-L.
#Ultrasparc64 users experiencing SIGBUS should try the following gcc options
#(thanks to Robert Gibbon)
@ -37,7 +48,6 @@ export CONFIG_TARGET
ifndef CONFIG_TARGET
ifeq ($(shell uname -o),Msys)
CONFIG_TARGET=mingw
WINDRES=windres
else ifeq ($(shell uname -s),Darwin)
CONFIG_TARGET=darwin
else ifeq ($(shell uname), SunOS)
@ -193,6 +203,7 @@ COVERAGEDIR?=coverage
.PHONY: $(SUBDIRS)
.PHONY: all
all: version $(APPS) $(DOCS) $(SUBDIRS)
# This allows breaking the build if the version.sh script discovers
@ -321,11 +332,6 @@ install: edge supernode edge.8.gz supernode.1.gz n2n.7.gz
$(INSTALL_DOC) n2n.7.gz $(MAN7DIR)/
$(MAKE) -C tools install SBINDIR=$(abspath $(SBINDIR))
configure include/config.h.in: configure.ac
autoreconf -if
config.mak include/config.h: config.mak.in include/config.h.in configure
./configure
# Docker builder section
DOCKER_IMAGE_NAME=ntop/supernode
DOCKER_IMAGE_VERSION=$N2N_VERSION_SHORT

2
autogen.sh

@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh
rm -f include/config.h include/config.h.in include/config.h.in~ config.mak configure

8
config.mak.in

@ -1,8 +1,12 @@
# Global configuration, included in top Makefile and exported from there.
# @configure_input@
CONFIG_HOST=@host@
PACKAGE_VERSION=@PACKAGE_VERSION@
CC=@CC@
AR=@AR@
WINDRES=@WINDRES@
CFLAGS=@CFLAGS@ -I./include
LDFLAGS=@LDFLAGS@ -L.
CFLAGS=@CFLAGS@
LDFLAGS=@LDFLAGS@
LDLIBS_EXTRA=@LIBS@
TOOLS_ADDITIONAL=@TOOLS_ADDITIONAL@

14
configure.ac

@ -4,9 +4,13 @@ dnl> Do not add anything above
AC_DEFINE([PACKAGE_BUILDDATE], "[m4_esyscmd([scripts/version.sh date | tr -d '\n'])]", [Last change date])
# Older versions of the autotools expect to find install-sh here.
AC_CONFIG_AUX_DIR(scripts)
AC_CANONICAL_HOST
AC_PROG_CC
AC_CHECK_TOOL([AR], [ar], [false])
AC_CHECK_TOOL([WINDRES], [windres], [false])
AC_CHECK_TOOL([WINDRES], [windres], [windres])
# TODO: ideally, should use AC_ARG_ENABLE
AC_ARG_WITH([edgex],
@ -96,17 +100,13 @@ AC_ARG_ENABLE([pthread],
[AS_HELP_STRING([--enable-pthread], [support for pthread])],
[], [enable_pthread=no])
AS_IF([test "x$enable_pthread" != xno],
[AC_CHECK_LIB([pthread], [pthread_mutex_trylock],
[
AC_DEFINE([HAVE_PTHREAD],[1],[pthread is present])
LDFLAGS="${LDFLAGS} -pthread"
],
[AC_CHECK_LIB([pthread], [pthread_mutex_trylock],,
[AC_MSG_ERROR([pthread library not found])]
)],
)
AC_SUBST(host)
AC_SUBST(WINDRES)
AC_SUBST(TOOLS_ADDITIONAL)
AC_CONFIG_HEADERS(include/config.h)

8
include/edge_utils_win32.h

@ -19,14 +19,7 @@
#ifndef _EDGE_UTILS_WIN32_H_
#define _EDGE_UTILS_WIN32_H_
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <process.h>
#include <n2n.h>
#include <winsock2.h>
#include <iphlpapi.h>
/* Multicast peers discovery disabled due to https://github.com/ntop/n2n/issues/65 */
@ -45,7 +38,6 @@ struct tunread_arg {
extern HANDLE startTunReadThread (struct tunread_arg *arg);
int get_best_interface_ip (n2n_edge_t * eee, dec_ip_str_t *ip_addr);
#endif /* WIN32 */
#endif /* _EDGE_UTILS_WIN32_H_ */

3
include/n2n_typedefs.h

@ -23,6 +23,7 @@
#include <stdint.h> // for uint8_t and friends
#ifndef WIN32
#include <arpa/inet.h> // for in_addr_t
#include <sys/socket.h> // for sockaddr
#endif
#include <uthash.h>
#include <n2n_define.h>
@ -637,7 +638,7 @@ typedef struct n2n_resolve_ip_sock {
typedef struct n2n_resolve_parameter {
n2n_resolve_ip_sock_t *list; /* pointer to list of to be resolved nodes */
uint8_t changed; /* indicates a change */
#ifdef HAVE_PTHREAD
#ifdef HAVE_LIBPTHREAD
pthread_t id; /* thread id */
pthread_mutex_t access; /* mutex for shared access */
#endif

0
config.guess → scripts/config.guess

1890
scripts/config.sub

File diff suppressed because it is too large

5
scripts/hack_fakeautoconf.sh

@ -17,11 +17,12 @@ EOF
chmod a+x configure
cat >config.mak <<EOF
CONFIG_HOST=x86_64-w64-mingw32
CC=gcc
AR=ar
WINDRES=windres
CFLAGS=$CFLAGS -g -O2 -I./include
LDFLAGS=$LDFLAGS -L.
CFLAGS=$CFLAGS -g -O2
LDFLAGS=$LDFLAGS
LDLIBS_EXTRA=$LDLIBS
EOF

541
scripts/install-sh

@ -0,0 +1,541 @@
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2020-11-14.01; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
# following copyright and license.
#
# Copyright (C) 1994 X Consortium
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to
# deal in the Software without restriction, including without limitation the
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
# sell copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
# Except as contained in this notice, the name of the X Consortium shall not
# be used in advertising or otherwise to promote the sale, use or other deal-
# ings in this Software without prior written authorization from the X Consor-
# tium.
#
#
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# 'make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch.
tab=' '
nl='
'
IFS=" $tab$nl"
# Set DOITPROG to "echo" to test this script.
doit=${DOITPROG-}
doit_exec=${doit:-exec}
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
chgrpprog=${CHGRPPROG-chgrp}
chmodprog=${CHMODPROG-chmod}
chownprog=${CHOWNPROG-chown}
cmpprog=${CMPPROG-cmp}
cpprog=${CPPROG-cp}
mkdirprog=${MKDIRPROG-mkdir}
mvprog=${MVPROG-mv}
rmprog=${RMPROG-rm}
stripprog=${STRIPPROG-strip}
posix_mkdir=
# Desired mode of installed file.
mode=0755
# Create dirs (including intermediate dirs) using mode 755.
# This is like GNU 'install' as of coreutils 8.32 (2020).
mkdir_umask=22
backupsuffix=
chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
mvcmd=$mvprog
rmcmd="$rmprog -f"
stripcmd=
src=
dst=
dir_arg=
dst_arg=
copy_on_change=false
is_target_a_directory=possibly
usage="\
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
In the 1st form, copy SRCFILE to DSTFILE.
In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
In the 4th, create DIRECTORIES.
Options:
--help display this help and exit.
--version display version info and exit.
-c (ignored)
-C install only if different (preserve data modification time)
-d create directories instead of installing files.
-g GROUP $chgrpprog installed files to GROUP.
-m MODE $chmodprog installed files to MODE.
-o USER $chownprog installed files to USER.
-p pass -p to $cpprog.
-s $stripprog installed files.
-S SUFFIX attempt to back up existing files, with suffix SUFFIX.
-t DIRECTORY install into DIRECTORY.
-T report an error if DSTFILE is a directory.
Environment variables override the default commands:
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
RMPROG STRIPPROG
By default, rm is invoked with -f; when overridden with RMPROG,
it's up to you to specify -f if you want it.
If -S is not specified, no backups are attempted.
Email bug reports to bug-automake@gnu.org.
Automake home page: https://www.gnu.org/software/automake/
"
while test $# -ne 0; do
case $1 in
-c) ;;
-C) copy_on_change=true;;
-d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
case $mode in
*' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
shift;;
-o) chowncmd="$chownprog $2"
shift;;
-p) cpprog="$cpprog -p";;
-s) stripcmd=$stripprog;;
-S) backupsuffix="$2"
shift;;
-t)
is_target_a_directory=always
dst_arg=$2
# Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
shift;;
-T) is_target_a_directory=never;;
--version) echo "$0 $scriptversion"; exit $?;;
--) shift
break;;
-*) echo "$0: invalid option: $1" >&2
exit 1;;
*) break;;
esac
shift
done
# We allow the use of options -d and -T together, by making -d
# take the precedence; this is for compatibility with GNU install.
if test -n "$dir_arg"; then
if test -n "$dst_arg"; then
echo "$0: target directory not allowed when installing a directory." >&2
exit 1
fi
fi
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
if test -n "$dst_arg"; then
# $@ is not empty: it contains at least $arg.
set fnord "$@" "$dst_arg"
shift # fnord
fi
shift # arg
dst_arg=$arg
# Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
done
fi
if test $# -eq 0; then
if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2
exit 1
fi
# It's OK to call 'install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
if test -z "$dir_arg"; then
if test $# -gt 1 || test "$is_target_a_directory" = always; then
if test ! -d "$dst_arg"; then
echo "$0: $dst_arg: Is not a directory." >&2
exit 1
fi
fi
fi
if test -z "$dir_arg"; then
do_exit='(exit $ret); exit $ret'
trap "ret=129; $do_exit" 1
trap "ret=130; $do_exit" 2
trap "ret=141; $do_exit" 13
trap "ret=143; $do_exit" 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
case $mode in
# Optimize common cases.
*644) cp_umask=133;;
*755) cp_umask=22;;
*[0-7])
if test -z "$stripcmd"; then
u_plus_rw=
else
u_plus_rw='% 200'
fi
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
*)
if test -z "$stripcmd"; then
u_plus_rw=
else
u_plus_rw=,u+rw
fi
cp_umask=$mode$u_plus_rw;;
esac
fi
for src
do
# Protect names problematic for 'test' and other utilities.
case $src in
-* | [=\(\)!]) src=./$src;;
esac
if test -n "$dir_arg"; then
dst=$src
dstdir=$dst
test -d "$dstdir"
dstdir_status=$?
# Don't chown directories that already exist.
if test $dstdir_status = 0; then
chowncmd=""
fi
else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if test ! -f "$src" && test ! -d "$src"; then
echo "$0: $src does not exist." >&2
exit 1
fi
if test -z "$dst_arg"; then
echo "$0: no destination specified." >&2
exit 1
fi
dst=$dst_arg
# If destination is a directory, append the input filename.
if test -d "$dst"; then
if test "$is_target_a_directory" = never; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
dstbase=`basename "$src"`
case $dst in
*/) dst=$dst$dstbase;;
*) dst=$dst/$dstbase;;
esac
dstdir_status=0
else
dstdir=`dirname "$dst"`
test -d "$dstdir"
dstdir_status=$?
fi
fi
case $dstdir in
*/) dstdirslash=$dstdir;;
*) dstdirslash=$dstdir/;;
esac
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
case $posix_mkdir in
'')
# With -d, create the new directory with the user-specified mode.
# Otherwise, rely on $mkdir_umask.
if test -n "$dir_arg"; then
mkdir_mode=-m$mode
else
mkdir_mode=
fi
posix_mkdir=false
# The $RANDOM variable is not portable (e.g., dash). Use it
# here however when possible just to lower collision chance.
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
trap '
ret=$?
rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
exit $ret
' 0
# Because "mkdir -p" follows existing symlinks and we likely work
# directly in world-writeable /tmp, make sure that the '$tmpdir'
# directory is successfully created first before we actually test
# 'mkdir -p'.
if (umask $mkdir_umask &&
$mkdirprog $mkdir_mode "$tmpdir" &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
test_tmpdir="$tmpdir/a"
ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
$mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
fi
trap '' 0;;
esac
if
$posix_mkdir && (
umask $mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
)
then :
else
# mkdir does not conform to POSIX,
# or it failed possibly due to a race condition. Create the
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
/*) prefix='/';;
[-=\(\)!]*) prefix='./';;
*) prefix='';;
esac
oIFS=$IFS
IFS=/
set -f
set fnord $dstdir
shift
set +f
IFS=$oIFS
prefixes=
for d
do
test X"$d" = X && continue
prefix=$prefix$d
if test -d "$prefix"; then
prefixes=
else
if $posix_mkdir; then
(umask $mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
# Don't fail if two instances are running concurrently.
test -d "$prefix" || exit 1
else
case $prefix in
*\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
*) qprefix=$prefix;;
esac
prefixes="$prefixes '$qprefix'"
fi
fi
prefix=$prefix/
done
if test -n "$prefixes"; then
# Don't fail if two instances are running concurrently.
(umask $mkdir_umask &&
eval "\$doit_exec \$mkdirprog $prefixes") ||
test -d "$dstdir" || exit 1
obsolete_mkdir_used=true
fi
fi
fi
if test -n "$dir_arg"; then
{ test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
{ test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
else
# Make a couple of temp file names in the proper directory.
dsttmp=${dstdirslash}_inst.$$_
rmtmp=${dstdirslash}_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
# Copy the file name to the temp name.
(umask $cp_umask &&
{ test -z "$stripcmd" || {
# Create $dsttmp read-write so that cp doesn't create it read-only,
# which would cause strip to fail.
if test -z "$doit"; then
: >"$dsttmp" # No need to fork-exec 'touch'.
else
$doit touch "$dsttmp"
fi
}
} &&
$doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
# If any of these fail, we abort the whole thing. If we want to
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
{ test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
{ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
# If -C, don't bother to copy if it wouldn't change the file.
if $copy_on_change &&
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
set -f &&
set X $old && old=:$2:$4:$5:$6 &&
set X $new && new=:$2:$4:$5:$6 &&
set +f &&
test "$old" = "$new" &&
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
then
rm -f "$dsttmp"
else
# If $backupsuffix is set, and the file being installed
# already exists, attempt a backup. Don't worry if it fails,
# e.g., if mv doesn't support -f.
if test -n "$backupsuffix" && test -f "$dst"; then
$doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
fi
# Rename the file to the real destination.
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
# The rename failed, perhaps because mv can't rename something else
# to itself, or perhaps because mv is so ancient that it does not
# support -f.
{
# Now remove or move aside any old file at destination location.
# We try this two ways since rm can't unlink itself on some
# systems and the destination file might be busy for other
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
test ! -f "$dst" ||
$doit $rmcmd "$dst" 2>/dev/null ||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
{ $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
} ||
{ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
}
} &&
# Now rename the file to the real destination.
$doit $mvcmd "$dsttmp" "$dst"
}
fi || exit 1
trap '' 0
fi
done
# Local variables:
# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:

4
scripts/test_integration_edge.sh

@ -23,6 +23,10 @@ docmd sudo "${BINDIR}"/edge -l localhost:7654 -c test >/dev/null
# TODO:
# - send edge messages to stderr?
# TODO: probe the api endpoint, waiting for both the supernode and edge to be
# available?
sleep 0.1
docmd "${TOPDIR}"/scripts/n2n-ctl communities
docmd "${TOPDIR}"/scripts/n2n-ctl packetstats
docmd "${TOPDIR}"/scripts/n2n-ctl edges --raw

3
scripts/test_integration_supernode.sh

@ -18,6 +18,9 @@ docmd() {
# start it running in the background
docmd "${BINDIR}"/supernode -v
# TODO: probe the api endpoint, waiting for the supernode to be available?
sleep 0.1
docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 communities
docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 packetstats
docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 edges --raw

9
src/edge_management.c

@ -38,7 +38,6 @@
#ifdef WIN32
#include <winsock2.h>
#include <ws2tcpip.h>
#include "edge_utils_win32.h"
#else
#include <arpa/inet.h> // for inet_ntoa
#include <netinet/in.h> // for in_addr, htonl, in_addr_t
@ -381,7 +380,7 @@ static void handleMgmtJson (mgmt_req_t *req, char *udp_buf, const int recvlen) {
traceEvent(TRACE_DEBUG, "mgmt json %s", cmdlinebuf);
/* we reuse the buffer already on the stack for all our strings */
STRBUF_INIT(buf, udp_buf);
STRBUF_INIT(buf, udp_buf, N2N_SN_PKTBUF_SIZE);
mgmt_req_init2(req, buf, (char *)&cmdlinebuf);
@ -476,7 +475,7 @@ void readFromMgmtSocket (n2n_edge_t *eee) {
if((0 == memcmp(udp_buf, "help", 4)) || (0 == memcmp(udp_buf, "?", 1))) {
strbuf_t *buf;
STRBUF_INIT(buf, &udp_buf);
STRBUF_INIT(buf, &udp_buf, sizeof(udp_buf));
msg_len = snprintf(buf->str, buf->size,
"Help for edge management console:\n"
"\tstop | Gracefully exit edge\n"
@ -505,7 +504,7 @@ void readFromMgmtSocket (n2n_edge_t *eee) {
traceEvent(TRACE_NORMAL, "+verb traceLevel=%u", (unsigned int) getTraceLevel());
strbuf_t *buf;
STRBUF_INIT(buf, &udp_buf);
STRBUF_INIT(buf, &udp_buf, sizeof(udp_buf));
msg_len = snprintf(buf->str, buf->size,
"> +OK traceLevel=%u\n", (unsigned int) getTraceLevel());
@ -516,7 +515,7 @@ void readFromMgmtSocket (n2n_edge_t *eee) {
if(0 == memcmp(udp_buf, "-verb", 5)) {
strbuf_t *buf;
STRBUF_INIT(buf, &udp_buf);
STRBUF_INIT(buf, &udp_buf, sizeof(udp_buf));
if(getTraceLevel() > 0) {
setTraceLevel(getTraceLevel() - 1);

4
src/edge_utils.c

@ -1642,14 +1642,14 @@ void update_supernode_reg (n2n_edge_t * eee, time_t now) {
--(eee->sup_attempts);
}
#ifndef HAVE_PTHREAD
#ifndef HAVE_LIBPTHREAD
if(supernode2sock(&(eee->curr_sn->sock), eee->curr_sn->ip_addr) == 0) {
#endif
traceEvent(TRACE_INFO, "registering with supernode [%s][number of supernodes %d][attempts left %u]",
supernode_ip(eee), HASH_COUNT(eee->conf.supernodes), (unsigned int)eee->sup_attempts);
send_register_super(eee);
#ifndef HAVE_PTHREAD
#ifndef HAVE_LIBPTHREAD
}
#endif

2
src/edge_utils_win32.c

@ -18,6 +18,8 @@
#ifdef WIN32
#include <winsock2.h>
#include "edge_utils_win32.h"
/* ************************************** */

2
src/management.c

@ -102,7 +102,7 @@ void mgmt_event_post2 (enum n2n_event_topic topic, int data0, void *data1, mgmt_
char buf_space[100];
strbuf_t *buf;
STRBUF_INIT(buf, buf_space);
STRBUF_INIT(buf, buf_space, sizeof(buf_space));
char *tag;
if(sub->type == N2N_MGMT_SUB) {

12
src/n2n.c

@ -30,6 +30,10 @@
#include "sn_selection.h" // for sn_selection_criterion_default
#include "uthash.h" // for UT_hash_handle, HASH_DEL, HASH_ITER, HAS...
#ifdef HAVE_LIBPTHREAD
#include <pthread.h>
#endif
#ifdef WIN32
#include <winsock2.h>
#include <ws2def.h>
@ -332,7 +336,7 @@ int supernode2sock (n2n_sock_t *sn, const n2n_sn_name_t addrIn) {
}
#ifdef HAVE_PTHREAD
#ifdef HAVE_LIBPTHREAD
N2N_THREAD_RETURN_DATATYPE resolve_thread(N2N_THREAD_PARAMETER_DATATYPE p) {
n2n_resolve_parameter_t *param = (n2n_resolve_parameter_t*)p;
@ -385,7 +389,7 @@ N2N_THREAD_RETURN_DATATYPE resolve_thread(N2N_THREAD_PARAMETER_DATATYPE p) {
int resolve_create_thread (n2n_resolve_parameter_t **param, struct peer_info *sn_list) {
#ifdef HAVE_PTHREAD
#ifdef HAVE_LIBPTHREAD
struct peer_info *sn, *tmp_sn;
n2n_resolve_ip_sock_t *entry;
int ret;
@ -430,7 +434,7 @@ int resolve_create_thread (n2n_resolve_parameter_t **param, struct peer_info *sn
void resolve_cancel_thread (n2n_resolve_parameter_t *param) {
#ifdef HAVE_PTHREAD
#ifdef HAVE_LIBPTHREAD
pthread_cancel(param->id);
free(param);
#endif
@ -441,7 +445,7 @@ uint8_t resolve_check (n2n_resolve_parameter_t *param, uint8_t requires_resoluti
uint8_t ret = requires_resolution; /* if trylock fails, it still requires resolution */
#ifdef HAVE_PTHREAD
#ifdef HAVE_LIBPTHREAD
n2n_resolve_ip_sock_t *entry, *tmp_entry;
n2n_sock_str_t sock_buf;

3
src/sn_management.c

@ -37,7 +37,6 @@
#ifdef WIN32
#include <winsock2.h>
#include "edge_utils_win32.h"
#else
#include <sys/socket.h> // for sendto, socklen_t
#endif
@ -240,7 +239,7 @@ static void handleMgmtJson (mgmt_req_t *req, char *udp_buf, const int recvlen) {
/* we reuse the buffer already on the stack for all our strings */
// xx
STRBUF_INIT(buf, udp_buf);
STRBUF_INIT(buf, udp_buf, N2N_SN_PKTBUF_SIZE);
mgmt_req_init2(req, buf, (char *)&cmdlinebuf);

6
src/strbuf.h

@ -14,10 +14,10 @@ typedef struct strbuf {
} strbuf_t;
// Initialise the strbuf pointer buf to point at the storage area p
// p must be a known sized object
#define STRBUF_INIT(buf,p) do { \
// of size buflen
#define STRBUF_INIT(buf,p,buflen) do { \
buf = (void *)p; \
buf->size = sizeof(*p) - sizeof(size_t); \
buf->size = buflen - sizeof(size_t); \
} while(0)

1
src/tuntap_freebsd.c

@ -17,6 +17,7 @@
*/
#include <fcntl.h> // for open. O_RDWR
#include "n2n.h"

5
src/wire.c

@ -687,11 +687,8 @@ int fill_sockaddr (struct sockaddr * addr,
// fills struct sockaddr's data into n2n_sock
int fill_n2nsock (n2n_sock_t* sock, const struct sockaddr* sa) {
#ifdef __APPLE__
sock->family = sa->sa_family;
#else
sock->family = *(sa_family_t*)sa;
#endif
switch(sock->family) {
case AF_INET: {
sock->port = ntohs(((struct sockaddr_in*)sa)->sin_port);

Loading…
Cancel
Save