Merge pull request #972 from joemfb/ames-f-n

allows imperial addresses in the absence of -N (fix -F)
This commit is contained in:
Joe Bryan 2018-04-25 14:45:00 -07:00 committed by GitHub
commit 38f9c546c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -200,7 +200,7 @@ u3_ames_ef_send(u3_noun lan, u3_noun pac)
c3_w pip_w; c3_w pip_w;
if ( u3_Host.ops_u.fuz_w && ((rand() % 100) < u3_Host.ops_u.fuz_w) ) { if ( u3_Host.ops_u.fuz_w && ((rand() % 100) < u3_Host.ops_u.fuz_w) ) {
u3z(pac); u3z(lan); u3z(pac);
return; return;
} }
@ -210,10 +210,6 @@ u3_ames_ef_send(u3_noun lan, u3_noun pac)
u3r_bytes(0, len_w, buf_y, pac); u3r_bytes(0, len_w, buf_y, pac);
if ( c3n == u3_Host.ops_u.net && 0x7f000001 != pip_w) {
return; // remote sending disabled
}
if ( 0 == pip_w ) { if ( 0 == pip_w ) {
pip_w = 0x7f000001; pip_w = 0x7f000001;
por_s = u3_Host.sam_u.por_s; por_s = u3_Host.sam_u.por_s;
@ -227,7 +223,8 @@ u3_ames_ef_send(u3_noun lan, u3_noun pac)
pip_w = _ames_czar(imp_y, &por_s, u3_Host.ops_u.dns_c); pip_w = _ames_czar(imp_y, &por_s, u3_Host.ops_u.dns_c);
} }
if ( 0 != pip_w ) { if ( (0 != pip_w) &&
( (c3y == u3_Host.ops_u.net) || (0x7f000001 == pip_w) ) ) {
uv_buf_t buf_u = uv_buf_init((c3_c*)buf_y, len_w); uv_buf_t buf_u = uv_buf_init((c3_c*)buf_y, len_w);
_u3_udp_send_t* ruq_u = c3_malloc(sizeof(_u3_udp_send_t)); _u3_udp_send_t* ruq_u = c3_malloc(sizeof(_u3_udp_send_t));