Browse Source

TT#71950 Fix typos

Change-Id: I79991a30bd8459485ea76dad541bda27daf9bfea
changes/63/36163/2
Guillem Jover 6 years ago
parent
commit
137c5df644
10 changed files with 31 additions and 30 deletions
  1. +2
    -2
      README.md
  2. +4
    -3
      daemon/media_socket.c
  3. +3
    -3
      daemon/rtpengine.pod
  4. +16
    -16
      debian/changelog
  5. +1
    -1
      include/bencode.h
  6. +1
    -1
      kernel-module/rtpengine_config.h
  7. +1
    -1
      lib/codeclib.c
  8. +1
    -1
      lib/socket.c
  9. +1
    -1
      perl/NGCP/Rtpclient/ICE.pm
  10. +1
    -1
      tests/stun-client

+ 2
- 2
README.md View File

@ -244,7 +244,7 @@ The sequence of events for a newly established media stream is then:
and will forward them on its own. It will stop those packets from traversing the network stacks any and will forward them on its own. It will stop those packets from traversing the network stacks any
further, so the daemon will not see them any more on its receive queues. further, so the daemon will not see them any more on its receive queues.
11. In-kernel forwarding is allowed to cease to work at any given time, either accidentally (e.g. by 11. In-kernel forwarding is allowed to cease to work at any given time, either accidentally (e.g. by
removal of the *iptables* rule) or deliberatly (the daemon will do so in case of a re-invite), in which
removal of the *iptables* rule) or deliberately (the daemon will do so in case of a re-invite), in which
case forwarding falls back to userspace-only operation. case forwarding falls back to userspace-only operation.
### The Kernel Module ### ### The Kernel Module ###
@ -1483,7 +1483,7 @@ of the participant selection keys described under the `block DTMF` message (such
Starts playback of a provided media file to the selected call participant. The format of the media file Starts playback of a provided media file to the selected call participant. The format of the media file
can be anything that is supported by *ffmpeg*, for example a `.wav` or `.mp3` file. It will automatically can be anything that is supported by *ffmpeg*, for example a `.wav` or `.mp3` file. It will automatically
be resampled and transcoded to the appropriate sampling rate and codec. The selected participant's first be resampled and transcoded to the appropriate sampling rate and codec. The selected participant's first
listed (preferred) codec that is supported will be chosed for this purpose.
listed (preferred) codec that is supported will be chosen for this purpose.
Media files can be provided through one of these keys: Media files can be provided through one of these keys:


+ 4
- 3
daemon/media_socket.c View File

@ -1313,7 +1313,8 @@ static void __stream_ssrc(struct packet_stream *in_srtp, struct packet_stream *o
} }
// returns: 0 = packet processed by other protocol hander; -1 = packet not handled, proceed;
// returns: 0 = packet processed by other protocol handler;
// -1 = packet not handled, proceed;
// 1 = same as 0, but stream can be kernelized // 1 = same as 0, but stream can be kernelized
static int media_demux_protocols(struct packet_handler_ctx *phc) { static int media_demux_protocols(struct packet_handler_ctx *phc) {
if (MEDIA_ISSET(phc->mp.media, DTLS) && is_dtls(&phc->s)) { if (MEDIA_ISSET(phc->mp.media, DTLS) && is_dtls(&phc->s)) {
@ -1463,13 +1464,13 @@ static int media_packet_decrypt(struct packet_handler_ctx *phc)
phc->rtcp_filter = phc->in_srtp->handler->in->rtcp_filter; phc->rtcp_filter = phc->in_srtp->handler->in->rtcp_filter;
} }
/* return values are: 0 = forward packet, -1 = error/dont forward,
/* return values are: 0 = forward packet, -1 = error/don't forward,
* 1 = forward and push update to redis */ * 1 = forward and push update to redis */
int ret = 0; int ret = 0;
if (phc->decrypt_func) { if (phc->decrypt_func) {
str ori_s = phc->s; str ori_s = phc->s;
ret = phc->decrypt_func(&phc->s, phc->in_srtp, phc->mp.sfd, &phc->mp.fsin, &phc->mp.tv, phc->mp.ssrc_in); ret = phc->decrypt_func(&phc->s, phc->in_srtp, phc->mp.sfd, &phc->mp.fsin, &phc->mp.tv, phc->mp.ssrc_in);
// XXX for stripped auth tag and duplicate invokations of rtp_payload
// XXX for stripped auth tag and duplicate invocations of rtp_payload
// XXX transcoder uses phc->mp.payload // XXX transcoder uses phc->mp.payload
phc->mp.payload.len -= ori_s.len - phc->s.len; phc->mp.payload.len -= ori_s.len - phc->s.len;
} }


+ 3
- 3
daemon/rtpengine.pod View File

@ -375,7 +375,7 @@ are not reloaded upon rtpengine startup, even though rtpengine still starts.
If this parameter is present and has a value >= 0, it will configure how If this parameter is present and has a value >= 0, it will configure how
many consecutive errors are allowed when communicating with a redis server many consecutive errors are allowed when communicating with a redis server
before the redis communication will be temporarily disabled for that server. before the redis communication will be temporarily disabled for that server.
While the communcation is disabled there will be no attempts to reconnect
While the communication is disabled there will be no attempts to reconnect
to redis or send commands to that server. to redis or send commands to that server.
Default value is -1, meaning that this feature is disabled. Default value is -1, meaning that this feature is disabled.
This parameter can also be set or listed via B<rtpengine-ctl>. This parameter can also be set or listed via B<rtpengine-ctl>.
@ -717,7 +717,7 @@ This can be useful in certain cases, such as your SIP proxy being behind NAT.
For example, I<--interface=10.65.76.2!192.0.2.4> means that I<10.65.76.2> For example, I<--interface=10.65.76.2!192.0.2.4> means that I<10.65.76.2>
is the actual local address on the server, but outgoing SDP bodies should is the actual local address on the server, but outgoing SDP bodies should
advertise I<192.0.2.4> as the address that endpoints should talk to. advertise I<192.0.2.4> as the address that endpoints should talk to.
Note that you may have to escape the exlamation point from your shell
Note that you may have to escape the exclamation point from your shell
when using command-line options, e.g. using I<\!>. when using command-line options, e.g. using I<\!>.
Giving an interface a name (separated from the address by a slash) is Giving an interface a name (separated from the address by a slash) is
@ -817,7 +817,7 @@ Successful termination.
=item B<1> =item B<1>
An error ocurred.
An error occurred.
=back =back


+ 16
- 16
debian/changelog View File

@ -472,7 +472,7 @@ ngcp-rtpengine (6.4.0.0+0~mr6.4.0.0) unstable; urgency=medium
[ netaskd ] [ netaskd ]
* [5ce19a8] add homer options to el configuration * [5ce19a8] add homer options to el configuration
* [62ec9cc] add posibility to use different kernel version
* [62ec9cc] add possibility to use different kernel version
[ Michael Prokop ] [ Michael Prokop ]
* [4d4abfa] TT#34358 Depend on lsb-release in ngcp-rtpengine-kernel-dkms package. * [4d4abfa] TT#34358 Depend on lsb-release in ngcp-rtpengine-kernel-dkms package.
@ -699,7 +699,7 @@ ngcp-rtpengine (6.1.0.0+0~mr6.1.0.0) unstable; urgency=medium
* [ca622b4] set TOS for redis streams * [ca622b4] set TOS for redis streams
* [d5fea12] check call.recording structure before using it * [d5fea12] check call.recording structure before using it
* [3dcddf3] recording-daemon: add option to forward calls * [3dcddf3] recording-daemon: add option to forward calls
* [2250ab1] make METADATA section appear in the metafile at intialization when recording using the proc method
* [2250ab1] make METADATA section appear in the metafile at initialization when recording using the proc method
* [ab0cb0c] don't use g_hash_table_foreach for call_timer_iterator * [ab0cb0c] don't use g_hash_table_foreach for call_timer_iterator
[ Pawel Kuzak ] [ Pawel Kuzak ]
@ -756,7 +756,7 @@ ngcp-rtpengine (6.0.0.0+0~mr6.0.0.0) unstable; urgency=medium
* [67de59a] check that redisContext is not NULL before using it * [67de59a] check that redisContext is not NULL before using it
* [b3ce08a] Count multipexed packets in statistics. Don't count errounously when no stream is found fixes #387 * [b3ce08a] Count multipexed packets in statistics. Don't count errounously when no stream is found fixes #387
* [b317acd] don't log corrupted cdr for foreign calls * [b317acd] don't log corrupted cdr for foreign calls
* [cf15275] add stop recording comand to ng interface
* [cf15275] add stop recording command to ng interface
* [bb85236] update readme to add stop recording command * [bb85236] update readme to add stop recording command
[ Michael Prokop ] [ Michael Prokop ]
@ -800,7 +800,7 @@ ngcp-rtpengine (5.4.0.0+0~mr5.4.0.0) unstable; urgency=medium
* [b1e259c] Document libsrtp AES-256 SRTCP bug for interop * [b1e259c] Document libsrtp AES-256 SRTCP bug for interop
[ Frederic-Philippe Metz ] [ Frederic-Philippe Metz ]
* [8f01e78] First attempt to seperate more stats and cdr away from the core running code
* [8f01e78] First attempt to separate more stats and cdr away from the core running code
* [95d9420] Adds missing log output * [95d9420] Adds missing log output
* [27679b1] Moved the json reader locally and removed it from call struct * [27679b1] Moved the json reader locally and removed it from call struct
* [d885875] Cleanup according to pull req #335 * [d885875] Cleanup according to pull req #335
@ -890,7 +890,7 @@ ngcp-rtpengine (5.3.0.0+0~mr5.3.0.0) unstable; urgency=medium
[ Frederic-Philippe Metz ] [ Frederic-Philippe Metz ]
* [749a7da] Implements redis onekey concept * [749a7da] Implements redis onekey concept
* [9ebd06f] Some fixes for pull request #316 * [9ebd06f] Some fixes for pull request #316
* [6a3bcf5] Fixes STR_FMT comment my @rfuchs or pullrequest 316
* [6a3bcf5] Fixes STR_FMT comment my @rfuchs or pull request #316
* [88b89ea] Fixes STR_FMT comment my @rfuchs or pull request #316 * [88b89ea] Fixes STR_FMT comment my @rfuchs or pull request #316
* [ed760fb] Fix more issues from richards comments * [ed760fb] Fix more issues from richards comments
* [ea9512c] Adds URI encoding for json strings in redis. * [ea9512c] Adds URI encoding for json strings in redis.
@ -1175,7 +1175,7 @@ ngcp-rtpengine (4.5.0.0+0~mr4.5.0.0) unstable; urgency=medium
* [05f0317] fix the 'media address' parameter * [05f0317] fix the 'media address' parameter
* [0206f09] fix obj-debug stuff * [0206f09] fix obj-debug stuff
* [a813ddf] fix compiler warnings due to conflicting int types * [a813ddf] fix compiler warnings due to conflicting int types
* [ee960b7] dont do DTLS when in passthrough mode
* [ee960b7] don't do DTLS when in passthrough mode
* [942966b] force bencode strings as strings in perl ng-client * [942966b] force bencode strings as strings in perl ng-client
* [1f8d8d7] DTLS tests - WIP * [1f8d8d7] DTLS tests - WIP
* [bf8c6d9] split ICE stuff into packages * [bf8c6d9] split ICE stuff into packages
@ -1420,7 +1420,7 @@ ngcp-rtpengine (4.1.0.0+0~mr4.1.0.0) unstable; urgency=low
* [29cf9f8] remove redundant code * [29cf9f8] remove redundant code
* [18977d4] remove calls to setlogmask (not atomic) * [18977d4] remove calls to setlogmask (not atomic)
* [ed2c101] preliminary fixup of new kernel stats - needs more work * [ed2c101] preliminary fixup of new kernel stats - needs more work
* [a3bcdc5] dont abort on unknown RTCP payload type
* [a3bcdc5] don't abort on unknown RTCP payload type
* [0381b15] further move RTCP logging until after SRTCP decryption * [0381b15] further move RTCP logging until after SRTCP decryption
* [92cc560] don't shut down ICE agent on consecutive re-invites * [92cc560] don't shut down ICE agent on consecutive re-invites
* [9c3ad50] use appropriate crypto context for encryption and decryption * [9c3ad50] use appropriate crypto context for encryption and decryption
@ -1480,7 +1480,7 @@ ngcp-rtpengine (4.0.0.0+0~mr4.0.0.0) unstable; urgency=medium
* [93294f8] don't relearn addresses if the endpoint hasn't changed * [93294f8] don't relearn addresses if the endpoint hasn't changed
* [0b202d8] Fall back to a different address family if the requested one is unavailable * [0b202d8] Fall back to a different address family if the requested one is unavailable
* [fd99ecf] don't close call on UDP send error * [fd99ecf] don't close call on UDP send error
* [c0fab9b] various fixes related to ICE negotation and rtcp-mux
* [c0fab9b] various fixes related to ICE negotiation and rtcp-mux
* [2cfc12b] fix incorrect free order of ICE components * [2cfc12b] fix incorrect free order of ICE components
[ Peter Lemenkov ] [ Peter Lemenkov ]
@ -1600,18 +1600,18 @@ ngcp-rtpengine (3.3.0.0+0~mr3.8.0.0) unstable; urgency=low
* [2460836] remove -e argument from awk * [2460836] remove -e argument from awk
* [19e0281] disable "list" NG command if glib version is too low * [19e0281] disable "list" NG command if glib version is too low
* [b49f57b] avoid DTLS role change on reinvite * [b49f57b] avoid DTLS role change on reinvite
* [d0beccb] dont break log lines when logging to stderr
* [d0beccb] don't break log lines when logging to stderr
* [8c8ff56] fix pointer const declaration and make it static * [8c8ff56] fix pointer const declaration and make it static
* [955de10] support proper DTLS shutdown and restart DTLS on FP change * [955de10] support proper DTLS shutdown and restart DTLS on FP change
* [6757c27] add DTLS=passive option * [6757c27] add DTLS=passive option
* [97b472b] dont break legacy control protocols
* [97b472b] don't break legacy control protocols
* [f826d01] make "trust address" the default behaviour * [f826d01] make "trust address" the default behaviour
* [4c408e5] add --dtls-passive switch * [4c408e5] add --dtls-passive switch
* [d272e9e] add more flags to stats output * [d272e9e] add more flags to stats output
* [e09fbd2] dtls shutdown clears crypto context as well * [e09fbd2] dtls shutdown clears crypto context as well
* [91221ef] move DTLS setup logic into separate function for readability * [91221ef] move DTLS setup logic into separate function for readability
* [50d1839] reset DTLS and crypto params when endpoints change * [50d1839] reset DTLS and crypto params when endpoints change
* [3478629] dont output error message on stun SOFTWARE attribute
* [3478629] don't output error message on stun SOFTWARE attribute
* [a1786d6] segfault fix: ps->sfd can be null * [a1786d6] segfault fix: ps->sfd can be null
* [4077225] avoid unnecessary DTLS restarts * [4077225] avoid unnecessary DTLS restarts
* [7e72bfc] MT#10059 allow freeform interface definitions in init.d script * [7e72bfc] MT#10059 allow freeform interface definitions in init.d script
@ -1708,7 +1708,7 @@ ngcp-rtpengine (3.3.0.0+0~mr3.6.0.0) unstable; urgency=low
* [d1165df] update EL specs/init file * [d1165df] update EL specs/init file
* [e830bf5] update for redis module * [e830bf5] update for redis module
* [af9625d] make multi-homing thread safe * [af9625d] make multi-homing thread safe
* [34ca29b] dont escape exclamation points in sh scripts
* [34ca29b] don't escape exclamation points in sh scripts
* [3de07be] s/MEDIAPROXY/RTPENGINE/ * [3de07be] s/MEDIAPROXY/RTPENGINE/
* [c1d7a52] MT#9065 daemon: don't restart if kernel is needed but not yet installed * [c1d7a52] MT#9065 daemon: don't restart if kernel is needed but not yet installed
* [6379883] fix str_hash() for archs enforcing aligned pointers * [6379883] fix str_hash() for archs enforcing aligned pointers
@ -1717,7 +1717,7 @@ ngcp-rtpengine (3.3.0.0+0~mr3.6.0.0) unstable; urgency=low
[ Camille Oudot ] [ Camille Oudot ]
* [47b0252] fix null/empty string check in ng_call_stats * [47b0252] fix null/empty string check in ng_call_stats
* [a51db71] new command: 'list' to retreive the list of active call-ids
* [a51db71] new command: 'list' to retrieve the list of active call-ids
* [6005d14] XMLRPC notifications: more formats * [6005d14] XMLRPC notifications: more formats
* [81d8616] list command: several fixes + documentation * [81d8616] list command: several fixes + documentation
* [faf3e22] logging: choose the log facility from the command line, or log to stderr * [faf3e22] logging: choose the log facility from the command line, or log to stderr
@ -1821,7 +1821,7 @@ ngcp-rtpengine (3.3.0.0+0~mr3.3.0.0) unstable; urgency=medium
* [5198233] make ICE=force_relay leave SDP endpoint details alone * [5198233] make ICE=force_relay leave SDP endpoint details alone
[ Pablo Ruiz García ] [ Pablo Ruiz García ]
* [cf76901] Do not try to install & initialize module if in kernel suppor has been specifically disabled (ie. TABLE < 0)
* [cf76901] Do not try to install & initialize module if in kernel support has been specifically disabled (ie. TABLE < 0)
-- Victor Seva <vseva@sipwise.com> Mon, 26 May 2014 12:23:29 +0200 -- Victor Seva <vseva@sipwise.com> Mon, 26 May 2014 12:23:29 +0200
@ -1886,8 +1886,8 @@ ngcp-mediaproxy-ng (2.3.2) unstable; urgency=low
[ Richard Fuchs ] [ Richard Fuchs ]
* [7d82cd2] updating README * [7d82cd2] updating README
* [2f0ad34] update init script to "provide itself" * [2f0ad34] update init script to "provide itself"
* [97d3414] fix bug when trust-address isnt given
* [5fa1c1e] dont fail on failed rm
* [97d3414] fix bug when trust-address isn't given
* [5fa1c1e] don't fail on failed rm
* [13ad042] rename some keys in the ng protocol (replace dash with space) but retain compatibility * [13ad042] rename some keys in the ng protocol (replace dash with space) but retain compatibility
* [bbc5339] implement and document ng "media address" * [bbc5339] implement and document ng "media address"
* [7e88b38] change port range defaults to match docs * [7e88b38] change port range defaults to match docs


+ 1
- 1
include/bencode.h View File

@ -278,7 +278,7 @@ char *bencode_collapse_dup(bencode_item_t *root, int *len);
* created through a decoding process (i.e. not ones created from bencode_dictionary()) have this * created through a decoding process (i.e. not ones created from bencode_dictionary()) have this
* property. The hash is efficient only up to a certain number of elements (BENCODE_HASH_BUCKETS * property. The hash is efficient only up to a certain number of elements (BENCODE_HASH_BUCKETS
* in bencode.c) contained in the dictionary. If the number of children object exceeds this number, * in bencode.c) contained in the dictionary. If the number of children object exceeds this number,
* key lookup will be slower than simply linearily traversing the list.
* key lookup will be slower than simply linearly traversing the list.
* *
* The decoding function for dictionary object does not check whether keys are unique within the * The decoding function for dictionary object does not check whether keys are unique within the
* dictionary. It also does not care about lexicographical order of the keys. * dictionary. It also does not care about lexicographical order of the keys.


+ 1
- 1
kernel-module/rtpengine_config.h View File

@ -1,7 +1,7 @@
/* /*
* rtpengine_config.h * rtpengine_config.h
* *
* Description: Config file with preprocessor config makros
* Description: Config file with preprocessor config macros
* *
* Created on: Mar 18, 2015 * Created on: Mar 18, 2015
* Author: fmetz * Author: fmetz


+ 1
- 1
lib/codeclib.c View File

@ -985,7 +985,7 @@ int packet_sequencer_insert(packet_sequencer_t *ps, seq_packet_t *p) {
ilog(LOG_DEBUG, "Seq reset detected: expected seq %i, received seq %i", ps->seq, p->seq); ilog(LOG_DEBUG, "Seq reset detected: expected seq %i, received seq %i", ps->seq, p->seq);
ps->seq = p->seq; ps->seq = p->seq;
ret = 1; ret = 1;
// seq ok - fall thru
// seq ok - fall through
g_tree_clear(ps->packets); g_tree_clear(ps->packets);
seq_ok: seq_ok:
if (g_tree_lookup(ps->packets, GINT_TO_POINTER(p->seq))) if (g_tree_lookup(ps->packets, GINT_TO_POINTER(p->seq)))


+ 1
- 1
lib/socket.c View File

@ -262,7 +262,7 @@ static int __ip_connect(socket_t *s, const endpoint_t *ep) {
__C_DBG("connect fail, fd=%d, port=%d", s->fd, s->local.port); __C_DBG("connect fail, fd=%d, port=%d", s->fd, s->local.port);
return -1; return -1;
} else { } else {
__C_DBG("connect succes, fd=%d, port=%d", s->fd, s->local.port);
__C_DBG("connect success, fd=%d, port=%d", s->fd, s->local.port);
} }
return 0; return 0;
} }


+ 1
- 1
perl/NGCP/Rtpclient/ICE.pm View File

@ -49,7 +49,7 @@ sub new {
$self->{completed} = 0; $self->{completed} = 0;
$self->{keepalives} = 0; $self->{keepalives} = 0;
$self->debug("created, controll" . ($controlling ? "ing" : "ed")
$self->debug("created, control" . ($controlling ? "ing" : "ed")
. ", tie breaker " . $self->{tie_breaker}->bstr() . "\n"); . ", tie breaker " . $self->{tie_breaker}->bstr() . "\n");
return $self; return $self;


+ 1
- 1
tests/stun-client View File

@ -33,7 +33,7 @@ my $tbreak = int(rand(0xffffffff)) * int(rand(0xffffffff));
print("transaction: $tract\n"); print("transaction: $tract\n");
print("my username fragment: $ufrag\n"); print("my username fragment: $ufrag\n");
print("controll".($control?"ing":'ed')."\n");
print(($control?'controlling':'controlled')."\n");
print("tie breaker: $tbreak\n"); print("tie breaker: $tbreak\n");


Loading…
Cancel
Save