fix warning about being deployed on private IP #2386
Conversation
…ses where it should not
|
Thanks for your contribution, @npikimasu! Please make sure you sign our CLA, as it's a required step before we can merge this. |
janus.c
Outdated
| private_address = TRUE; | ||
| } | ||
| int num_ips = janus_get_public_ip_count(); | ||
| if(num_ips == 0) num_ips++; /* if nat_1_1_mapping is off, the first (and only) public IP is the local_ip */ |
There was a problem hiding this comment.
Code style: if action must be on a separate line, and comments must start with a capitalized letter.
janus.c
Outdated
| int num_ips = janus_get_public_ip_count(); | ||
| if(num_ips == 0) num_ips++; /* if nat_1_1_mapping is off, the first (and only) public IP is the local_ip */ | ||
| /* check each public IP */ | ||
| for (int i = 0; i < num_ips; i++) { |
There was a problem hiding this comment.
Code style: no whitespace between for and the bracket.
Besides, the i variable must be initialized before the for loop.
There was a problem hiding this comment.
See above on comments style too (there are other comments that need to be addressed the same way).
janus.c
Outdated
| /* check each public IP */ | ||
| for (int i = 0; i < num_ips; i++) { | ||
| gboolean private_address = FALSE; | ||
| const gchar* test_ip = janus_get_public_ip(i); |
There was a problem hiding this comment.
Code style: the asterisk pointer must be next to the variable, not the type.
There was a problem hiding this comment.
Roger! I've corrected the styling issues.
|
Apologies for this late reply, busy week... I've just tested quickly and it seems to work as expected, thanks for the quick fixes on code style too! Merging 👍 |
When no STUN or TURN server is configured and janus is on a NAT, a warning about being deployed on a private IP appears, even when nat_1_1_mapping is set in janus.jcfg.
Not sure when the warning starting popping up--sometime after v0.9.5.
There is a variable "const char* nat_1_1_mapping". Before support for multiple IPs was added, this variable was set to the value of the nat_1_1_mapping config value. However, while the const char* variable still exists, it is not used and not set. That causes the code that checks for private IPs to ignore the nat_1_1_mapping config setting, and issue the warning incorrectly.
This fix removes the 'const char* nat_1_1_mapping' variable, and replaces the single private-IP test with a test of each public IP address.
The warning can be safely ignored, so not a big deal in any case.