Browse Source

MT#55283 Rename aux -> helpers

Windows doesn't allow a file to be named aux, so checkout fails.

closes #1686

Change-Id: I4667561f430ec8d4767d2313890839754be77322
pull/1692/head
Orgad Shaneh 3 years ago
committed by Richard Fuchs
parent
commit
1a28b73a2d
47 changed files with 52 additions and 52 deletions
  1. +1
    -1
      daemon/Makefile
  2. +1
    -1
      daemon/bencode.c
  3. +1
    -1
      daemon/call.c
  4. +1
    -1
      daemon/call_interfaces.c
  5. +1
    -1
      daemon/cli.c
  6. +1
    -1
      daemon/control_tcp.c
  7. +1
    -1
      daemon/control_udp.c
  8. +1
    -1
      daemon/cookie_cache.c
  9. +1
    -1
      daemon/crypto.c
  10. +1
    -1
      daemon/dtls.c
  11. +1
    -1
      daemon/helpers.c
  12. +1
    -1
      daemon/homer.c
  13. +1
    -1
      daemon/ice.c
  14. +1
    -1
      daemon/iptables.c
  15. +1
    -1
      daemon/kernel.c
  16. +1
    -1
      daemon/load.c
  17. +1
    -1
      daemon/log_funcs.h
  18. +1
    -1
      daemon/main.c
  19. +1
    -1
      daemon/media_socket.c
  20. +1
    -1
      daemon/poller.c
  21. +1
    -1
      daemon/redis.c
  22. +1
    -1
      daemon/ssrc.c
  23. +1
    -1
      daemon/stun.c
  24. +1
    -1
      daemon/tcp_listener.c
  25. +1
    -1
      daemon/timerthread.c
  26. +1
    -1
      daemon/udp_listener.c
  27. +1
    -1
      include/cdr.h
  28. +1
    -1
      include/codec.h
  29. +1
    -1
      include/control_tcp.h
  30. +1
    -1
      include/control_udp.h
  31. +1
    -1
      include/cookie_cache.h
  32. +1
    -1
      include/crypto.h
  33. +2
    -2
      include/helpers.h
  34. +1
    -1
      include/ice.h
  35. +1
    -1
      include/main.h
  36. +1
    -1
      include/media_socket.h
  37. +1
    -1
      include/recording.h
  38. +1
    -1
      include/redis.h
  39. +1
    -1
      include/ssrc.h
  40. +1
    -1
      include/statistics.h
  41. +1
    -1
      include/t38.h
  42. +1
    -1
      include/tcp_listener.h
  43. +1
    -1
      lib/mix_buffer.h
  44. +1
    -1
      t/.gitignore
  45. +5
    -5
      t/Makefile
  46. +1
    -1
      t/log_funcs.h
  47. +1
    -1
      t/test-transcode.c

+ 1
- 1
daemon/Makefile View File

@ -78,7 +78,7 @@ endif
include ../lib/mqtt.Makefile include ../lib/mqtt.Makefile
SRCS= main.c kernel.c poller.c aux.c control_tcp.c call.c control_udp.c redis.c \
SRCS= main.c kernel.c poller.c helpers.c control_tcp.c call.c control_udp.c redis.c \
bencode.c cookie_cache.c udp_listener.c control_ng.strhash.c sdp.strhash.c stun.c rtcp.c \ bencode.c cookie_cache.c udp_listener.c control_ng.strhash.c sdp.strhash.c stun.c rtcp.c \
crypto.c rtp.c call_interfaces.strhash.c dtls.c log.c cli.c graphite.c ice.c \ crypto.c rtp.c call_interfaces.strhash.c dtls.c log.c cli.c graphite.c ice.c \
media_socket.c homer.c recording.c statistics.c cdr.c ssrc.c iptables.c tcp_listener.c \ media_socket.c homer.c recording.c statistics.c cdr.c ssrc.c iptables.c tcp_listener.c \


+ 1
- 1
daemon/bencode.c View File

@ -7,7 +7,7 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <json-glib/json-glib.h> #include <json-glib/json-glib.h>
#include "aux.h"
#include "helpers.h"
/* set to 0 for alloc debugging, e.g. through valgrind */ /* set to 0 for alloc debugging, e.g. through valgrind */
#define BENCODE_MIN_BUFFER_PIECE_LEN 512 #define BENCODE_MIN_BUFFER_PIECE_LEN 512


+ 1
- 1
daemon/call.c View File

@ -19,7 +19,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "poller.h" #include "poller.h"
#include "aux.h"
#include "helpers.h"
#include "log.h" #include "log.h"
#include "kernel.h" #include "kernel.h"
#include "control_tcp.h" #include "control_tcp.h"


+ 1
- 1
daemon/call_interfaces.c View File

@ -9,7 +9,7 @@
#include "call_interfaces.h" #include "call_interfaces.h"
#include "call.h" #include "call.h"
#include "aux.h"
#include "helpers.h"
#include "log.h" #include "log.h"
#include "redis.h" #include "redis.h"
#include "sdp.h" #include "sdp.h"


+ 1
- 1
daemon/cli.c View File

@ -11,7 +11,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "poller.h" #include "poller.h"
#include "aux.h"
#include "helpers.h"
#include "log.h" #include "log.h"
#include "log_funcs.h" #include "log_funcs.h"
#include "call.h" #include "call.h"


+ 1
- 1
daemon/control_tcp.c View File

@ -11,7 +11,7 @@
#include <errno.h> #include <errno.h>
#include "poller.h" #include "poller.h"
#include "aux.h"
#include "helpers.h"
#include "streambuf.h" #include "streambuf.h"
#include "log.h" #include "log.h"
#include "call.h" #include "call.h"


+ 1
- 1
daemon/control_udp.c View File

@ -12,7 +12,7 @@
#include <errno.h> #include <errno.h>
#include "poller.h" #include "poller.h"
#include "aux.h"
#include "helpers.h"
#include "log.h" #include "log.h"
#include "call.h" #include "call.h"
#include "udp_listener.h" #include "udp_listener.h"


+ 1
- 1
daemon/cookie_cache.c View File

@ -4,7 +4,7 @@
#include <glib.h> #include <glib.h>
#include "compat.h" #include "compat.h"
#include "aux.h"
#include "helpers.h"
#include "poller.h" #include "poller.h"
#include "str.h" #include "str.h"


+ 1
- 1
daemon/crypto.c View File

@ -8,7 +8,7 @@
#include "xt_RTPENGINE.h" #include "xt_RTPENGINE.h"
#include "str.h" #include "str.h"
#include "aux.h"
#include "helpers.h"
#include "rtp.h" #include "rtp.h"
#include "rtcp.h" #include "rtcp.h"
#include "log.h" #include "log.h"


+ 1
- 1
daemon/dtls.c View File

@ -13,7 +13,7 @@
#include <time.h> #include <time.h>
#include "str.h" #include "str.h"
#include "aux.h"
#include "helpers.h"
#include "crypto.h" #include "crypto.h"
#include "log.h" #include "log.h"
#include "call.h" #include "call.h"


daemon/aux.c → daemon/helpers.c View File


+ 1
- 1
daemon/homer.c View File

@ -10,7 +10,7 @@
#include <sys/time.h> #include <sys/time.h>
#include "log.h" #include "log.h"
#include "aux.h"
#include "helpers.h"
#include "str.h" #include "str.h"


+ 1
- 1
daemon/ice.c View File

@ -4,7 +4,7 @@
#include <unistd.h> #include <unistd.h>
#include "str.h" #include "str.h"
#include "call.h" #include "call.h"
#include "aux.h"
#include "helpers.h"
#include "log.h" #include "log.h"
#include "obj.h" #include "obj.h"
#include "stun.h" #include "stun.h"


+ 1
- 1
daemon/iptables.c View File

@ -20,7 +20,7 @@ int (*iptables_del_rule)(const socket_t *local_sock);
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include "aux.h"
#include "helpers.h"
#include "log.h" #include "log.h"
#include "socket.h" #include "socket.h"


+ 1
- 1
daemon/kernel.c View File

@ -11,7 +11,7 @@
#include "xt_RTPENGINE.h" #include "xt_RTPENGINE.h"
#include "aux.h"
#include "helpers.h"
#include "log.h" #include "log.h"


+ 1
- 1
daemon/load.c View File

@ -5,7 +5,7 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "aux.h"
#include "helpers.h"
#include "log.h" #include "log.h"
#include "main.h" #include "main.h"


+ 1
- 1
daemon/log_funcs.h View File

@ -1,7 +1,7 @@
#ifndef __LOG_FUNCS_H__ #ifndef __LOG_FUNCS_H__
#define __LOG_FUNCS_H__ #define __LOG_FUNCS_H__
#include "aux.h"
#include "helpers.h"
#include "obj.h" #include "obj.h"
#include "call.h" #include "call.h"
#include "media_socket.h" #include "media_socket.h"


+ 1
- 1
daemon/main.c View File

@ -25,7 +25,7 @@
#include "control_tcp.h" #include "control_tcp.h"
#include "control_udp.h" #include "control_udp.h"
#include "control_ng.h" #include "control_ng.h"
#include "aux.h"
#include "helpers.h"
#include "log.h" #include "log.h"
#include "call.h" #include "call.h"
#include "kernel.h" #include "kernel.h"


+ 1
- 1
daemon/media_socket.c View File

@ -15,7 +15,7 @@
#include "xt_RTPENGINE.h" #include "xt_RTPENGINE.h"
#include "rtcp.h" #include "rtcp.h"
#include "sdp.h" #include "sdp.h"
#include "aux.h"
#include "helpers.h"
#include "log_funcs.h" #include "log_funcs.h"
#include "poller.h" #include "poller.h"
#include "recording.h" #include "recording.h"


+ 1
- 1
daemon/poller.c View File

@ -17,7 +17,7 @@
#include <hiredis/adapters/libevent.h> #include <hiredis/adapters/libevent.h>
#include "aux.h"
#include "helpers.h"
#include "obj.h" #include "obj.h"
#include "log_funcs.h" #include "log_funcs.h"


+ 1
- 1
daemon/redis.c View File

@ -20,7 +20,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "compat.h" #include "compat.h"
#include "aux.h"
#include "helpers.h"
#include "call.h" #include "call.h"
#include "log.h" #include "log.h"
#include "log_funcs.h" #include "log_funcs.h"


+ 1
- 1
daemon/ssrc.c View File

@ -1,6 +1,6 @@
#include "ssrc.h" #include "ssrc.h"
#include <glib.h> #include <glib.h>
#include "aux.h"
#include "helpers.h"
#include "call.h" #include "call.h"
#include "rtplib.h" #include "rtplib.h"
#include "codeclib.h" #include "codeclib.h"


+ 1
- 1
daemon/stun.c View File

@ -10,7 +10,7 @@
#include "compat.h" #include "compat.h"
#include "str.h" #include "str.h"
#include "aux.h"
#include "helpers.h"
#include "log.h" #include "log.h"
#include "ice.h" #include "ice.h"
#include "ssllib.h" #include "ssllib.h"


+ 1
- 1
daemon/tcp_listener.c View File

@ -5,7 +5,7 @@
#include "poller.h" #include "poller.h"
#include "obj.h" #include "obj.h"
#include "socket.h" #include "socket.h"
#include "aux.h"
#include "helpers.h"
#include "log.h" #include "log.h"
#include "streambuf.h" #include "streambuf.h"
#include "media_socket.h" #include "media_socket.h"


+ 1
- 1
daemon/timerthread.c View File

@ -1,5 +1,5 @@
#include "timerthread.h" #include "timerthread.h"
#include "aux.h"
#include "helpers.h"
#include "log_funcs.h" #include "log_funcs.h"


+ 1
- 1
daemon/udp_listener.c View File

@ -8,7 +8,7 @@
#include <errno.h> #include <errno.h>
#include "poller.h" #include "poller.h"
#include "aux.h"
#include "helpers.h"
#include "str.h" #include "str.h"
#include "log.h" #include "log.h"
#include "obj.h" #include "obj.h"


+ 1
- 1
include/cdr.h View File

@ -8,7 +8,7 @@
#ifndef CDR_H_ #ifndef CDR_H_
#define CDR_H_ #define CDR_H_
#include "aux.h"
#include "helpers.h"
struct call; struct call;
enum tag_type; enum tag_type;


+ 1
- 1
include/codec.h View File

@ -7,7 +7,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "str.h" #include "str.h"
#include "codeclib.h" #include "codeclib.h"
#include "aux.h"
#include "helpers.h"
#include "rtplib.h" #include "rtplib.h"
#include "timerthread.h" #include "timerthread.h"
#include "xt_RTPENGINE.h" #include "xt_RTPENGINE.h"


+ 1
- 1
include/control_tcp.h View File

@ -10,7 +10,7 @@
#include <glib.h> #include <glib.h>
#include "obj.h" #include "obj.h"
#include "aux.h"
#include "helpers.h"
#include "socket.h" #include "socket.h"


+ 1
- 1
include/control_udp.h View File

@ -10,7 +10,7 @@
#include <time.h> #include <time.h>
#include <netinet/in.h> #include <netinet/in.h>
#include "obj.h" #include "obj.h"
#include "aux.h"
#include "helpers.h"
#include "cookie_cache.h" #include "cookie_cache.h"
#include "udp_listener.h" #include "udp_listener.h"
#include "socket.h" #include "socket.h"


+ 1
- 1
include/cookie_cache.h View File

@ -3,7 +3,7 @@
#include <time.h> #include <time.h>
#include <glib.h> #include <glib.h>
#include "aux.h"
#include "helpers.h"
#include "str.h" #include "str.h"
struct cookie_cache_state { struct cookie_cache_state {


+ 1
- 1
include/crypto.h View File

@ -7,7 +7,7 @@
#include <glib.h> #include <glib.h>
#include "compat.h" #include "compat.h"
#include "str.h" #include "str.h"
#include "aux.h"
#include "helpers.h"
#define SRTP_MAX_MASTER_KEY_LEN 32 #define SRTP_MAX_MASTER_KEY_LEN 32
#define SRTP_MAX_MASTER_SALT_LEN 14 #define SRTP_MAX_MASTER_SALT_LEN 14


include/aux.h → include/helpers.h View File


+ 1
- 1
include/ice.h View File

@ -10,7 +10,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "str.h" #include "str.h"
#include "obj.h" #include "obj.h"
#include "aux.h"
#include "helpers.h"
#include "media_socket.h" #include "media_socket.h"
#include "socket.h" #include "socket.h"
#include "timerthread.h" #include "timerthread.h"


+ 1
- 1
include/main.h View File

@ -2,7 +2,7 @@
#define _MAIN_H_ #define _MAIN_H_
#include "aux.h"
#include "helpers.h"
#include <glib.h> #include <glib.h>
#include "socket.h" #include "socket.h"
#include "auxlib.h" #include "auxlib.h"


+ 1
- 1
include/media_socket.h View File

@ -7,7 +7,7 @@
#include <stdio.h> #include <stdio.h>
#include "str.h" #include "str.h"
#include "obj.h" #include "obj.h"
#include "aux.h"
#include "helpers.h"
#include "dtls.h" #include "dtls.h"
#include "crypto.h" #include "crypto.h"
#include "socket.h" #include "socket.h"


+ 1
- 1
include/recording.h View File

@ -13,7 +13,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <pcap.h> #include <pcap.h>
#include "str.h" #include "str.h"
#include "aux.h"
#include "helpers.h"
#include "bencode.h" #include "bencode.h"


+ 1
- 1
include/redis.h View File

@ -7,7 +7,7 @@
#include <sys/types.h> #include <sys/types.h>
#include "compat.h" #include "compat.h"
#include "socket.h" #include "socket.h"
#include "aux.h"
#include "helpers.h"
#include <glib.h> #include <glib.h>
#include <sys/types.h> #include <sys/types.h>


+ 1
- 1
include/ssrc.h View File

@ -5,7 +5,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <glib.h> #include <glib.h>
#include "compat.h" #include "compat.h"
#include "aux.h"
#include "helpers.h"
#include "obj.h" #include "obj.h"
#include "codeclib.h" #include "codeclib.h"


+ 1
- 1
include/statistics.h View File

@ -1,7 +1,7 @@
#ifndef STATISTICS_H_ #ifndef STATISTICS_H_
#define STATISTICS_H_ #define STATISTICS_H_
#include "aux.h"
#include "helpers.h"
#include "bencode.h" #include "bencode.h"
#include "rtpengine_config.h" #include "rtpengine_config.h"


+ 1
- 1
include/t38.h View File

@ -40,7 +40,7 @@ struct t38_options {
#include <spandsp/t38_gateway.h> #include <spandsp/t38_gateway.h>
#include "rtplib.h" #include "rtplib.h"
#include "aux.h"
#include "helpers.h"
#include "obj.h" #include "obj.h"
#include "codeclib.h" #include "codeclib.h"


+ 1
- 1
include/tcp_listener.h View File

@ -3,7 +3,7 @@
#include "socket.h" #include "socket.h"
#include "obj.h" #include "obj.h"
#include "aux.h"
#include "helpers.h"
struct poller; struct poller;


+ 1
- 1
lib/mix_buffer.h View File

@ -3,7 +3,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "aux.h"
#include "helpers.h"
enum AVSampleFormat; enum AVSampleFormat;


+ 1
- 1
t/.gitignore View File

@ -13,7 +13,6 @@ rtplib.c
str.c str.c
crypto.c crypto.c
aes-crypt aes-crypt
aux.c
bencode.c bencode.c
call.c call.c
call_interfaces.c call_interfaces.c
@ -23,6 +22,7 @@ control_ng.c
cookie_cache.c cookie_cache.c
dtls.c dtls.c
graphite.c graphite.c
helpers.c
homer.c homer.c
ice.c ice.c
iptables.c iptables.c


+ 5
- 5
t/Makefile View File

@ -65,7 +65,7 @@ endif
SRCS= test-bitstr.c aes-crypt.c aead-aes-crypt.c test-const_str_hash.strhash.c SRCS= test-bitstr.c aes-crypt.c aead-aes-crypt.c test-const_str_hash.strhash.c
LIBSRCS= loglib.c auxlib.c str.c rtplib.c ssllib.c mix_buffer.c LIBSRCS= loglib.c auxlib.c str.c rtplib.c ssllib.c mix_buffer.c
DAEMONSRCS= crypto.c ssrc.c aux.c rtp.c
DAEMONSRCS= crypto.c ssrc.c helpers.c rtp.c
HASHSRCS= HASHSRCS=
ifeq ($(with_transcoding),yes) ifeq ($(with_transcoding),yes)
@ -258,7 +258,7 @@ daemon-tests-audio-player-play-media: daemon-test-deps
test-bitstr: test-bitstr.o test-bitstr: test-bitstr.o
test-mix-buffer: test-mix-buffer.o $(COMMONOBJS) mix_buffer.o ssrc.o rtp.o crypto.o aux.o
test-mix-buffer: test-mix-buffer.o $(COMMONOBJS) mix_buffer.o ssrc.o rtp.o crypto.o helpers.o
spandsp_send_fax_pcm: spandsp_send_fax_pcm.o spandsp_send_fax_pcm: spandsp_send_fax_pcm.o
@ -280,7 +280,7 @@ aes-crypt: aes-crypt.o $(COMMONOBJS) crypto.o
aead-aes-crypt: aead-aes-crypt.o $(COMMONOBJS) crypto.o aead-aes-crypt: aead-aes-crypt.o $(COMMONOBJS) crypto.o
test-stats: test-stats.o $(COMMONOBJS) codeclib.strhash.o resample.o codec.o ssrc.o call.o ice.o aux.o \
test-stats: test-stats.o $(COMMONOBJS) codeclib.strhash.o resample.o codec.o ssrc.o call.o ice.o helpers.o \
kernel.o media_socket.o stun.o bencode.o socket.o poller.o dtls.o recording.o statistics.o \ kernel.o media_socket.o stun.o bencode.o socket.o poller.o dtls.o recording.o statistics.o \
rtcp.o redis.o iptables.o graphite.o call_interfaces.strhash.o sdp.strhash.o rtp.o crypto.o \ rtcp.o redis.o iptables.o graphite.o call_interfaces.strhash.o sdp.strhash.o rtp.o crypto.o \
control_ng.strhash.o graphite.o \ control_ng.strhash.o graphite.o \
@ -288,7 +288,7 @@ test-stats: test-stats.o $(COMMONOBJS) codeclib.strhash.o resample.o codec.o ssr
media_player.o jitter_buffer.o dtmflib.o t38.o tcp_listener.o mqtt.o janus.strhash.o \ media_player.o jitter_buffer.o dtmflib.o t38.o tcp_listener.o mqtt.o janus.strhash.o \
websocket.o cli.o mvr2s_x64_avx2.o mvr2s_x64_avx512.o audio_player.o mix_buffer.o websocket.o cli.o mvr2s_x64_avx2.o mvr2s_x64_avx512.o audio_player.o mix_buffer.o
test-transcode: test-transcode.o $(COMMONOBJS) codeclib.strhash.o resample.o codec.o ssrc.o call.o ice.o aux.o \
test-transcode: test-transcode.o $(COMMONOBJS) codeclib.strhash.o resample.o codec.o ssrc.o call.o ice.o helpers.o \
kernel.o media_socket.o stun.o bencode.o socket.o poller.o dtls.o recording.o statistics.o \ kernel.o media_socket.o stun.o bencode.o socket.o poller.o dtls.o recording.o statistics.o \
rtcp.o redis.o iptables.o graphite.o call_interfaces.strhash.o sdp.strhash.o rtp.o crypto.o \ rtcp.o redis.o iptables.o graphite.o call_interfaces.strhash.o sdp.strhash.o rtp.o crypto.o \
control_ng.strhash.o \ control_ng.strhash.o \
@ -299,7 +299,7 @@ test-transcode: test-transcode.o $(COMMONOBJS) codeclib.strhash.o resample.o cod
test-resample: test-resample.o $(COMMONOBJS) codeclib.strhash.o resample.o dtmflib.o mvr2s_x64_avx2.o \ test-resample: test-resample.o $(COMMONOBJS) codeclib.strhash.o resample.o dtmflib.o mvr2s_x64_avx2.o \
mvr2s_x64_avx512.o mvr2s_x64_avx512.o
test-payload-tracker: test-payload-tracker.o $(COMMONOBJS) ssrc.o aux.o auxlib.o rtp.o crypto.o codeclib.strhash.o \
test-payload-tracker: test-payload-tracker.o $(COMMONOBJS) ssrc.o helpers.o auxlib.o rtp.o crypto.o codeclib.strhash.o \
resample.o dtmflib.o mvr2s_x64_avx2.o mvr2s_x64_avx512.o resample.o dtmflib.o mvr2s_x64_avx2.o mvr2s_x64_avx512.o
test-kernel-module: test-kernel-module.o $(COMMONOBJS) kernel.o test-kernel-module: test-kernel-module.o $(COMMONOBJS) kernel.o


+ 1
- 1
t/log_funcs.h View File

@ -1,7 +1,7 @@
#ifndef _LOG_FUNCS_H_ #ifndef _LOG_FUNCS_H_
#define _LOG_FUNCS_H_ #define _LOG_FUNCS_H_
#include "aux.h"
#include "helpers.h"
#include "str.h" #include "str.h"
struct call; struct call;


+ 1
- 1
t/test-transcode.c View File

@ -4,7 +4,7 @@
#include "log.h" #include "log.h"
#include "main.h" #include "main.h"
#include "ssrc.h" #include "ssrc.h"
#include "aux.h"
#include "helpers.h"
int _log_facility_rtcp; int _log_facility_rtcp;
int _log_facility_cdr; int _log_facility_cdr;


Loading…
Cancel
Save