Skip to content
Snippets Groups Projects
Commit cced2853 authored by Martin Prudek's avatar Martin Prudek :cyclone:
Browse files

rmbt: Package added.

parent aa633d27
Branches
Tags
No related merge requests found
#
## Copyright (C) 2016-2017 CZ.NIC z.s.p.o. (http://www.nic.cz/)
#
## This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
# #
#
include $(TOPDIR)/rules.mk
PKG_NAME:=rmbt-client
PKG_VERSION:=1.0
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/lwimmer/rmbt-client.git
PKG_SOURCE:=$(PKG_NAME).tar.gz
PKG_SOURCE_VERSION:=cd544e53c24c35ea36211bf95dc7983a5c7f6a9f
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
PKG_FIXUP:=autoreconf
include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME)
TITLE:=RMBT speed measurement client in C
MAINTAINER:=CZ.NIC <packaging@turris.cz>
DEPENDS:=+libuuid +libopenssl +libjson-c +liblzma +librt
endef
define Package/$(PKG_NAME)/description
Desc
endef
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/rmbt $(1)/usr/bin/rmbt-client
endef
#define Package/$(PKG_NAME)/conffiles
#endef
#define Package/$(PKG_NAME)/postinst
##!/bin/sh
#[ -n "$$IPKG_INSTROOT" ] || {
#/etc/init.d/updater enable || true
## Run the uci-defaults now if we are installed at runtime and not flashed
#/etc/uci-defaults/updater && rm /etc/uci-defaults/updater
#}
#endef
$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/src/Makefile.am b/src/Makefile.am
index dd3320a..6615d89 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,6 +16,8 @@ AM_CFLAGS += $(if $(GIT_VERSION),-DGIT_VERSION=\"$(GIT_VERSION)\",)
AM_LDFLAGS = -pthread
+AM_LDFLAGS += -lrt
+
bin_PROGRAMS = rmbt
rmbt_SOURCES = rmbt.c \
rmbt_common.h \
diff --git a/src/rmbt_flow.h b/src/rmbt_flow.h
index 310eb29..cba5814 100644
--- a/src/rmbt_flow.h
+++ b/src/rmbt_flow.h
@@ -20,8 +20,6 @@
#include "rmbt_common.h"
#include "rmbt_result.h"
-#include <stdatomic.h>
-
typedef struct {
char *bind_ip, *server_host, *server_port, *cipherlist, *secret, *token, *test_id, *file_summary, *file_flows, *file_stats;
int_fast16_t dl_num_flows, ul_num_flows, dl_duration_s, ul_duration_s, rtt_tcp_payload_num, dl_pretest_duration_s, ul_pretest_duration_s, dl_wait_time_s,
@@ -32,7 +30,7 @@ typedef struct {
} TestConfig;
typedef struct {
- atomic_bool global_abort;
+ volatile bool global_abort;
pthread_mutex_t mutex;
pthread_cond_t cond;
int_fast16_t total;
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment