Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Spacing changes only

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@180259 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.2
Tilghman Lesher 16 years ago
parent a66032a14a
commit eb5bb03b82
5 changed files with 419 additions and 327 deletions

22
main/abstract_jb.c
Unescape View File

@ -186,8 +186,9 @@ static void jb_choose_impl(struct ast_channel *chan)
jb->impl = &avail_impl[default_impl]; jb->impl = &avail_impl[default_impl];
if (ast_strlen_zero(jbconf->impl)) if (ast_strlen_zero(jbconf->impl)) {
return; return;
}
for (i = 0; i < avail_impl_count; i++) { for (i = 0; i < avail_impl_count; i++) {
test_impl = &avail_impl[i]; test_impl = &avail_impl[i];
@ -487,18 +488,18 @@ static int create_jb(struct ast_channel *chan, struct ast_frame *frr)
char safe_logfile[30] = "/tmp/logfile-XXXXXX"; char safe_logfile[30] = "/tmp/logfile-XXXXXX";
int safe_fd; int safe_fd;
snprintf(name2, sizeof(name2), "%s", chan->name); snprintf(name2, sizeof(name2), "%s", chan->name);
tmp = strchr(name2, '/'); if ((tmp = strchr(name2, '/'))) {
if (tmp)
*tmp = '#'; *tmp = '#';
}
bridged = ast_bridged_channel(chan); bridged = ast_bridged_channel(chan);
/* We should always have bridged chan if a jitterbuffer is in use */ /* We should always have bridged chan if a jitterbuffer is in use */
ast_assert(bridged != NULL); ast_assert(bridged != NULL);
snprintf(name1, sizeof(name1), "%s", bridged->name); snprintf(name1, sizeof(name1), "%s", bridged->name);
tmp = strchr(name1, '/'); if ((tmp = strchr(name1, '/'))) {
if (tmp)
*tmp = '#'; *tmp = '#';
}
snprintf(logfile_pathname, sizeof(logfile_pathname), snprintf(logfile_pathname, sizeof(logfile_pathname),
"/tmp/ast_%s_jb_%s--%s.log", jbimpl->name, name1, name2); "/tmp/ast_%s_jb_%s--%s.log", jbimpl->name, name1, name2);
@ -510,19 +511,21 @@ static int create_jb(struct ast_channel *chan, struct ast_frame *frr)
ast_log(LOG_ERROR, "Failed to create frame log file with pathname '%s': %s\n", logfile_pathname, strerror(errno)); ast_log(LOG_ERROR, "Failed to create frame log file with pathname '%s': %s\n", logfile_pathname, strerror(errno));
} }
if (res == JB_IMPL_OK) if (res == JB_IMPL_OK) {
jb_framelog("JB_PUT_FIRST {now=%ld}: Queued frame with ts=%ld and len=%ld\n", jb_framelog("JB_PUT_FIRST {now=%ld}: Queued frame with ts=%ld and len=%ld\n",
now, frr->ts, frr->len); now, frr->ts, frr->len);
else } else {
jb_framelog("JB_PUT_FIRST {now=%ld}: Dropped frame with ts=%ld and len=%ld\n", jb_framelog("JB_PUT_FIRST {now=%ld}: Dropped frame with ts=%ld and len=%ld\n",
now, frr->ts, frr->len); now, frr->ts, frr->len);
} }
}
ast_verb(3, "%s jitterbuffer created on channel %s\n", jbimpl->name, chan->name); ast_verb(3, "%s jitterbuffer created on channel %s\n", jbimpl->name, chan->name);
/* Free the frame if it has not been queued in the jb */ /* Free the frame if it has not been queued in the jb */
if (res != JB_IMPL_OK) if (res != JB_IMPL_OK) {
ast_frfree(frr); ast_frfree(frr);
}
return 0; return 0;
} }
@ -575,8 +578,9 @@ int ast_jb_read_conf(struct ast_jb_conf *conf, const char *varname, const char *
const char *name; const char *name;
int tmp; int tmp;
if (strncasecmp(AST_JB_CONF_PREFIX, varname, prefixlen)) if (strncasecmp(AST_JB_CONF_PREFIX, varname, prefixlen)) {
return -1; return -1;
}
name = varname + prefixlen; name = varname + prefixlen;

83
main/acl.c
Unescape View File

@ -61,36 +61,37 @@ static void score_address(const struct sockaddr_in *sin, struct in_addr *best_ad
address = ast_inet_ntoa(sin->sin_addr); address = ast_inet_ntoa(sin->sin_addr);
/* RFC 1700 alias for the local network */ /* RFC 1700 alias for the local network */
if (address[0] == '0') if (address[0] == '0') {
score = -25; score = -25;
/* RFC 1700 localnet */ /* RFC 1700 localnet */
else if (strncmp(address, "127", 3) == 0) } else if (strncmp(address, "127", 3) == 0) {
score = -20; score = -20;
/* RFC 1918 non-public address space */ /* RFC 1918 non-public address space */
else if (strncmp(address, "10.", 3) == 0) } else if (strncmp(address, "10.", 3) == 0) {
score = -5; score = -5;
/* RFC 1918 non-public address space */ /* RFC 1918 non-public address space */
else if (strncmp(address, "172", 3) == 0) { } else if (strncmp(address, "172", 3) == 0) {
/* 172.16.0.0 - 172.19.255.255, but not 172.160.0.0 - 172.169.255.255 */ /* 172.16.0.0 - 172.19.255.255, but not 172.160.0.0 - 172.169.255.255 */
if (address[4] == '1' && address[5] >= '6' && address[6] == '.') if (address[4] == '1' && address[5] >= '6' && address[6] == '.') {
score = -5; score = -5;
/* 172.20.0.0 - 172.29.255.255, but not 172.200.0.0 - 172.255.255.255 nor 172.2.0.0 - 172.2.255.255 */ /* 172.20.0.0 - 172.29.255.255, but not 172.200.0.0 - 172.255.255.255 nor 172.2.0.0 - 172.2.255.255 */
else if (address[4] == '2' && address[6] == '.') } else if (address[4] == '2' && address[6] == '.') {
score = -5; score = -5;
/* 172.30.0.0 - 172.31.255.255 */ /* 172.30.0.0 - 172.31.255.255 */
else if (address[4] == '3' && address[5] <= '1') } else if (address[4] == '3' && address[5] <= '1') {
score = -5; score = -5;
/* All other 172 addresses are public */ /* All other 172 addresses are public */
else } else {
score = 0; score = 0;
/* RFC 2544 Benchmark test range */ }
} else if (strncmp(address, "198.1", 5) == 0 && address[5] >= '8' && address[6] == '.') /* RFC 2544 Benchmark test range (198.18.0.0 - 198.19.255.255, but not 198.180.0.0 - 198.199.255.255) */
} else if (strncmp(address, "198.1", 5) == 0 && address[5] >= '8' && address[6] == '.') {
score = -10; score = -10;
/* RFC 1918 non-public address space */ /* RFC 1918 non-public address space */
else if (strncmp(address, "192.168", 7) == 0) } else if (strncmp(address, "192.168", 7) == 0) {
score = -5; score = -5;
/* RFC 3330 Zeroconf network */ /* RFC 3330 Zeroconf network */
else if (strncmp(address, "169.254", 7) == 0) } else if (strncmp(address, "169.254", 7) == 0) {
/*!\note Better score than a test network, but not quite as good as RFC 1918 /*!\note Better score than a test network, but not quite as good as RFC 1918
* address space. The reason is that some Linux distributions automatically * address space. The reason is that some Linux distributions automatically
* configure a Zeroconf address before trying DHCP, so we want to prefer a * configure a Zeroconf address before trying DHCP, so we want to prefer a
@ -98,11 +99,12 @@ static void score_address(const struct sockaddr_in *sin, struct in_addr *best_ad
*/ */
score = -10; score = -10;
/* RFC 3330 Test network */ /* RFC 3330 Test network */
else if (strncmp(address, "192.0.2.", 8) == 0) } else if (strncmp(address, "192.0.2.", 8) == 0) {
score = -15; score = -15;
/* Every other address should be publically routable */ /* Every other address should be publically routable */
else } else {
score = 0; score = 0;
}
if (score > *best_score) { if (score > *best_score) {
*best_score = score; *best_score = score;
@ -149,10 +151,11 @@ static int get_local_address(struct in_addr *ourip)
score_address(sin, &best_addr, &best_score); score_address(sin, &best_addr, &best_score);
res = 0; res = 0;
if (best_score == 0) if (best_score == 0) {
break; break;
} }
} }
}
#endif /* BSD_OR_LINUX */ #endif /* BSD_OR_LINUX */
/* There is no reason whatsoever that this shouldn't work on Linux or BSD also. */ /* There is no reason whatsoever that this shouldn't work on Linux or BSD also. */
@ -189,9 +192,10 @@ static int get_local_address(struct in_addr *ourip)
score_address(sa, &best_addr, &best_score); score_address(sa, &best_addr, &best_score);
res = 0; res = 0;
if (best_score == 0) if (best_score == 0) {
break; break;
} }
}
free(buf); free(buf);
#endif /* SOLARIS */ #endif /* SOLARIS */
@ -202,8 +206,9 @@ static int get_local_address(struct in_addr *ourip)
freeifaddrs(ifaphead); freeifaddrs(ifaphead);
#endif /* BSD_OR_LINUX */ #endif /* BSD_OR_LINUX */
if (res == 0 && ourip) if (res == 0 && ourip) {
memcpy(ourip, &best_addr, sizeof(*ourip)); memcpy(ourip, &best_addr, sizeof(*ourip));
}
return res; return res;
} }
#endif /* HAVE_GETIFADDRS */ #endif /* HAVE_GETIFADDRS */
@ -250,11 +255,13 @@ struct ast_ha *ast_duplicate_ha_list(struct ast_ha *original)
while (start) { while (start) {
current = ast_duplicate_ha(start); /* Create copy of this object */ current = ast_duplicate_ha(start); /* Create copy of this object */
if (prev) if (prev) {
prev->next = current; /* Link previous to this object */ prev->next = current; /* Link previous to this object */
}
if (!ret) if (!ret) {
ret = current; /* Save starting point */ ret = current; /* Save starting point */
}
start = start->next; /* Go to next object */ start = start->next; /* Go to next object */
prev = current; /* Save pointer to this object */ prev = current; /* Save pointer to this object */
@ -277,12 +284,11 @@ struct ast_ha *ast_append_ha(const char *sense, const char *stuff, struct ast_ha
path = path->next; path = path->next;
} }
ha = ast_malloc(sizeof(*ha)); if (!(ha = ast_malloc(sizeof(*ha)))) {
if (!ha)
return ret; return ret;
}
nm = strchr(tmp, '/'); if (!(nm = strchr(tmp, '/'))) {
if (!nm) {
/* assume /32. Yes, htonl does not do anything for this particular mask /* assume /32. Yes, htonl does not do anything for this particular mask
but we better use it to show we remember about byte order */ but we better use it to show we remember about byte order */
ha->netmask.s_addr = htonl(0xFFFFFFFF); ha->netmask.s_addr = htonl(0xFFFFFFFF);
@ -291,20 +297,22 @@ struct ast_ha *ast_append_ha(const char *sense, const char *stuff, struct ast_ha
nm++; nm++;
if (!strchr(nm, '.')) { if (!strchr(nm, '.')) {
if ((sscanf(nm, "%d", &x) == 1) && (x >= 0) && (x <= 32)) if ((sscanf(nm, "%d", &x) == 1) && (x >= 0) && (x <= 32)) {
ha->netmask.s_addr = htonl(0xFFFFFFFF << (32 - x)); ha->netmask.s_addr = htonl(0xFFFFFFFF << (32 - x));
else { } else {
ast_log(LOG_WARNING, "Invalid CIDR in %s\n", stuff); ast_log(LOG_WARNING, "Invalid CIDR in %s\n", stuff);
ast_free(ha); ast_free(ha);
if (error) if (error) {
*error = 1; *error = 1;
}
return ret; return ret;
} }
} else if (!inet_aton(nm, &ha->netmask)) { } else if (!inet_aton(nm, &ha->netmask)) {
ast_log(LOG_WARNING, "Invalid mask in %s\n", stuff); ast_log(LOG_WARNING, "Invalid mask in %s\n", stuff);
ast_free(ha); ast_free(ha);
if (error) if (error) {
*error = 1; *error = 1;
}
return ret; return ret;
} }
} }
@ -312,8 +320,9 @@ struct ast_ha *ast_append_ha(const char *sense, const char *stuff, struct ast_ha
if (!inet_aton(tmp, &ha->netaddr)) { if (!inet_aton(tmp, &ha->netaddr)) {
ast_log(LOG_WARNING, "Invalid IP address in %s\n", stuff); ast_log(LOG_WARNING, "Invalid IP address in %s\n", stuff);
ast_free(ha); ast_free(ha);
if (error) if (error) {
*error = 1; *error = 1;
}
return ret; return ret;
} }
@ -348,8 +357,9 @@ int ast_apply_ha(struct ast_ha *ha, struct sockaddr_in *sin)
#endif #endif
/* For each rule, if this address and the netmask = the net address /* For each rule, if this address and the netmask = the net address
apply the current rule */ apply the current rule */
if ((sin->sin_addr.s_addr & ha->netmask.s_addr) == ha->netaddr.s_addr) if ((sin->sin_addr.s_addr & ha->netmask.s_addr) == ha->netaddr.s_addr) {
res = ha->sense; res = ha->sense;
}
ha = ha->next; ha = ha->next;
} }
return res; return res;
@ -369,8 +379,7 @@ int ast_get_ip_or_srv(struct sockaddr_in *sin, const char *value, const char *se
value = host; value = host;
} }
} }
hp = ast_gethostbyname(value, &ahp); if ((hp = ast_gethostbyname(value, &ahp))) {
if (hp) {
memcpy(&sin->sin_addr, hp->h_addr, sizeof(sin->sin_addr)); memcpy(&sin->sin_addr, hp->h_addr, sizeof(sin->sin_addr));
} else { } else {
ast_log(LOG_WARNING, "Unable to lookup '%s'\n", value); ast_log(LOG_WARNING, "Unable to lookup '%s'\n", value);
@ -449,9 +458,10 @@ const char *ast_tos2str(unsigned int tos)
unsigned int x; unsigned int x;
for (x = 0; x < ARRAY_LEN(dscp_pool1); x++) { for (x = 0; x < ARRAY_LEN(dscp_pool1); x++) {
if (dscp_pool1[x].space == (tos >> 2)) if (dscp_pool1[x].space == (tos >> 2)) {
return dscp_pool1[x].name; return dscp_pool1[x].name;
} }
}
return "unknown"; return "unknown";
} }
@ -467,8 +477,7 @@ int ast_ouraddrfor(struct in_addr *them, struct in_addr *us)
struct sockaddr_in sin; struct sockaddr_in sin;
socklen_t slen; socklen_t slen;
s = socket(PF_INET, SOCK_DGRAM, 0); if ((s = socket(PF_INET, SOCK_DGRAM, 0)) < 0) {
if (s < 0) {
ast_log(LOG_ERROR, "Cannot create socket\n"); ast_log(LOG_ERROR, "Cannot create socket\n");
return -1; return -1;
} }
@ -509,8 +518,7 @@ int ast_find_ourip(struct in_addr *ourip, struct sockaddr_in bindaddr)
if (gethostname(ourhost, sizeof(ourhost) - 1)) { if (gethostname(ourhost, sizeof(ourhost) - 1)) {
ast_log(LOG_WARNING, "Unable to get hostname\n"); ast_log(LOG_WARNING, "Unable to get hostname\n");
} else { } else {
hp = ast_gethostbyname(ourhost, &ahp); if ((hp = ast_gethostbyname(ourhost, &ahp))) {
if (hp) {
memcpy(ourip, hp->h_addr, sizeof(*ourip)); memcpy(ourip, hp->h_addr, sizeof(*ourip));
ast_debug(3, "Found one IP address based on local hostname %s.\n", ourhost); ast_debug(3, "Found one IP address based on local hostname %s.\n", ourhost);
return 0; return 0;
@ -518,8 +526,9 @@ int ast_find_ourip(struct in_addr *ourip, struct sockaddr_in bindaddr)
} }
ast_debug(3, "Trying to check A.ROOT-SERVERS.NET and get our IP address for that connection\n"); ast_debug(3, "Trying to check A.ROOT-SERVERS.NET and get our IP address for that connection\n");
/* A.ROOT-SERVERS.NET. */ /* A.ROOT-SERVERS.NET. */
if (inet_aton("198.41.0.4", &saddr) && !ast_ouraddrfor(&saddr, ourip)) if (inet_aton("198.41.0.4", &saddr) && !ast_ouraddrfor(&saddr, ourip)) {
return 0; return 0;
}
return get_local_address(ourip); return get_local_address(ourip);
} }

401
main/app.c
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save