Merge branch 'master' into runtime-overflows

Spec/nock/4.txt

@@ -0,0 +1,44 @@
+A noun is an atom or a cell.  An atom is a natural number.  A cell is an ordered pair of nouns.
+
+nock(a)             *a
+[a b c]             [a [b c]]
+
+?[a b]              0
+?a                  1
++[a b]              +[a b]
++a                  1 + a
+=[a a]              0
+=[a b]              1
+=a                  =a
+
+/[1 a]              a
+/[2 a b]            a
+/[3 a b]            b
+/[(a + a) b]        /[2 /[a b]]
+/[(a + a + 1) b]    /[3 /[a b]]
+/a                  /a
+
+#[1 a b]            a
+#[(a + a) b c]      #[a [b /[(a + a + 1) c]] c]
+#[(a + a + 1) b c]  #[a [/[(a + a) c] b] c]
+#a                  #a
+
+*[a [b c] d]        [*[a b c] *[a d]]
+
+*[a 0 b]            /[b a]
+*[a 1 b]            b
+*[a 2 b c]          *[*[a b] *[a c]]
+*[a 3 b]            ?*[a b]
+*[a 4 b]            +*[a b]
+*[a 5 b]            =*[a b]
+
+*[a 6 b c d]        *[a 2 [0 1] 2 [1 c d] [1 0] 2 [1 2 3] [1 0] 4 4 b]
+*[a 7 b c]          *[a 2 b 1 c]
+*[a 8 b c]          *[a 7 [[7 [0 1] b] 0 1] c]
+*[a 9 b c]          *[a 7 c 2 [0 1] 0 b]
+*[a 10 [b c] d]     *[a 8 c 7 [0 3] d]
+*[a 10 b c]         *[a c]
+*[a 12 [b c] d]     #[b *[a c] *[a d]]
+
+*a                  *a
+

vere/ames.c

@@ -210,6 +210,10 @@ u3_ames_ef_send(u3_noun lan, u3_noun 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 ) {
       pip_w = 0x7f000001;
       por_s = u3_Host.sam_u.por_s;
@@ -349,7 +353,9 @@ u3_ames_io_init()
 
     memset(&add_u, 0, sizeof(add_u));
     add_u.sin_family = AF_INET;
-    add_u.sin_addr.s_addr = htonl(INADDR_ANY);
+    add_u.sin_addr.s_addr = _(u3_Host.ops_u.net) ?
+                              htonl(INADDR_ANY) :
+                              htonl(INADDR_LOOPBACK);
     add_u.sin_port = htons(por_s);
 
     int ret;

vere/http.c

@@ -135,7 +135,7 @@ _http_write_cb(uv_write_t* wri_u, c3_i sas_i)
 {
   _u3_write_t* ruq_u = (void *)wri_u;
 
-  if ( (u3C.wag_w & u3o_verbose) && 0 != sas_i && UV__EPIPE != sas_i ) {
+  if ( (u3C.wag_w & u3o_verbose) && 0 != sas_i && UV_EPIPE != sas_i ) {
     uL(fprintf(uH, "http: write: ERROR %d\n", sas_i));
     uL(fprintf(uH, "  (%s)\n", uv_strerror(sas_i)));
   }

vere/main.c

@@ -322,16 +322,16 @@ u3_ve_usage(c3_i argc, c3_c** argv)
     "-c pier       Create a new urbit in pier/\n",
     "-d            Daemon mode\n",
     "-D            Recompute from events\n",
-    "-F            Fake keys\n",
+    "-F            Fake keys; also disables networking\n",
     "-f            Fuzz testing\n",
     "-g            Set GC flag\n",
     "-H domain     Set ames bootstrap domain (default urbit.org)\n",
     "-I galaxy     Start as ~galaxy\n",
     "-k stage      Start at Hoon kernel version stage\n",
-    "-L            Local-only network\n",
     "-l port       Initial peer port\n",
     "-M            Memory madness\n",
     "-n host       Set unix hostname\n",
+    "-N            Enable networking in fake mode (-F)\n",
     "-p ames_port  Set the HTTP port to bind to\n",
     "-P            Profiling\n",
     "-q            Quiet\n",

vere/sist.c

@@ -1177,7 +1177,7 @@ u3_sist_boot(void)
 
     if ( 0 == u3_Host.ops_u.imp_c ) {
       u3_noun ten = _sist_zen();
-      uL(fprintf(uH, "generating 2048-bit RSA pair...\n"));
+      uL(fprintf(uH, "generating curve25519 key pair...\n"));
 
       pig = u3nq(c3__make, u3_nul, 11, u3nc(ten, u3_Host.ops_u.fak));
     }

vere/term.c

@@ -585,7 +585,6 @@ static void
 _term_it_show_blank(u3_utty* uty_u)
 {
   _term_it_write_txt(uty_u, uty_u->ufo_u.out.clear_y);
-  uty_u->tat_u.mir.cus_w = 0;
 }
 
 /* _term_it_show_cursor(): set current line, transferring pointer.
@@ -1229,6 +1228,8 @@ u3_term_ef_ctlc(void)
   u3_noun pax = u3nq(u3_blip, c3__term, '1', u3_nul);
 
   u3v_plan(pax, u3nt(c3__belt, c3__ctl, 'c'));
+
+  _term_it_refresh_line(_term_main());
 }
 
 /* u3_term_ef_boil(): initial effects for loaded servers.