diff options
| author | forsyth <forsyth@vitanuova.com> | 2010-02-05 11:01:55 +0000 |
|---|---|---|
| committer | forsyth <forsyth@vitanuova.com> | 2010-02-05 11:01:55 +0000 |
| commit | aaab9bcca9a6fd14bd8496059b80b984906db6bc (patch) | |
| tree | e17885b21ac218b0ae9eb3ff3fdcc91e6d9bd1a6 | |
| parent | cfa39d5adff9be3c5f695c2c28cffb5f93dd4598 (diff) | |
20100205-1101
64 files changed, 227 insertions, 248 deletions
@@ -1,7 +1,10 @@ +20100205 + update man pages to replace most references to Styx by 9P + update man pages to replace references to sys-dial(2) by dial(2) 20100203 - appl/lib/cfg.b treat \r as white space (issue 69, 70) + appl/lib/cfg.b treat \r as white space [issue 69, issue 70] add u64int to lib9.h files that needed it - add sha2.c sha256block.c sha512block.c to libsec/port and include/libsec.h + add sha2.c sha256block.c sha512block.c to libsec/port and include/libsec.h [issue 185, mechiel] add new sha functions to module/keyring.m and libinterp/keyring.c 20100115 appl/cmd/tarfs.b man/4/tarfs changes to permission handling from mechiel [issue 220] diff --git a/appl/cmd/auth/secstore.b b/appl/cmd/auth/secstore.b index 9cb731ee..e26e132d 100644 --- a/appl/cmd/auth/secstore.b +++ b/appl/cmd/auth/secstore.b @@ -29,7 +29,7 @@ Secstorec: module Maxfilesize: con 128*1024; stderr: ref Sys->FD; -conn: ref Sys->Connection; +conn: ref Dial->Connection; seckey: array of byte; filekey: array of byte; file: array of byte; @@ -100,7 +100,7 @@ init(nil: ref Draw->Context, args: list of string) if(nf > 1) pin = hd tl flds; } - conn: ref Sys->Connection; + conn: ref Dial->Connection; Auth: for(;;){ if(!iflag) @@ -229,7 +229,7 @@ verb(op: int, n: string) sys->fprint(stderr, "%c %q\n", op, n); } -getfile(conn: ref Sys->Connection, fname: string, key: array of byte): array of byte +getfile(conn: ref Dial->Connection, fname: string, key: array of byte): array of byte { f := secstore->getfile(conn, fname, 0); if(f == nil) diff --git a/appl/lib/secstore.b b/appl/lib/secstore.b index c5ff24bc..f848d8c6 100644 --- a/appl/lib/secstore.b +++ b/appl/lib/secstore.b @@ -7,6 +7,9 @@ implement Secstore; include "sys.m"; sys: Sys; +include "dial.m"; + dialler: Dial; + include "keyring.m"; kr: Keyring; DigestState, IPint: import kr; @@ -27,6 +30,7 @@ init() kr = load Keyring Keyring->PATH; ssl = load SSL SSL->PATH; base64 = load Encoding Encoding->BASE64PATH; + dialler = load Dial Dial->PATH; initPAKparams(); } @@ -38,7 +42,7 @@ privacy(): int return 1; } -connect(addr: string, user: string, pwhash: array of byte): (ref Sys->Connection, string, string) +connect(addr: string, user: string, pwhash: array of byte): (ref Dial->Connection, string, string) { conn := dial(addr); if(conn == nil){ @@ -53,12 +57,12 @@ connect(addr: string, user: string, pwhash: array of byte): (ref Sys->Connection return (conn, sname, diag); } -dial(netaddr: string): ref Sys->Connection +dial(netaddr: string): ref Dial->Connection { if(netaddr == nil) netaddr = "net!$auth!secstore"; - (ok, conn) := sys->dial(netaddr, nil); - if(ok < 0) + conn := dialler->dial(netaddr, nil); + if(conn == nil) return nil; (err, sslconn) := ssl->connect(conn.dfd); if(err != nil) @@ -66,7 +70,7 @@ dial(netaddr: string): ref Sys->Connection return sslconn; } -auth(conn: ref Sys->Connection, user: string, pwhash: array of byte): (string, string) +auth(conn: ref Dial->Connection, user: string, pwhash: array of byte): (string, string) { sname := PAKclient(conn, user, pwhash); if(sname == nil) @@ -96,7 +100,7 @@ cansecstore(netaddr: string, user: string): int return string buf[0:n] == "!account exists"; } -sendpin(conn: ref Sys->Connection, pin: string): int +sendpin(conn: ref Dial->Connection, pin: string): int { if(sys->fprint(conn.dfd, "STA%s", pin) < 0) return -1; @@ -109,7 +113,7 @@ sendpin(conn: ref Sys->Connection, pin: string): int return 0; } -files(conn: ref Sys->Connection): list of (string, int, string, string, array of byte) +files(conn: ref Dial->Connection): list of (string, int, string, string, array of byte) { file := getfile(conn, ".", 0); if(file == nil) @@ -136,7 +140,7 @@ files(conn: ref Sys->Connection): list of (string, int, string, string, array of return l; } -getfile(conn: ref Sys->Connection, name: string, maxsize: int): array of byte +getfile(conn: ref Dial->Connection, name: string, maxsize: int): array of byte { fd := conn.dfd; if(maxsize <= 0) @@ -171,7 +175,7 @@ getfile(conn: ref Sys->Connection, name: string, maxsize: int): array of byte return file; } -remove(conn: ref Sys->Connection, name: string): int +remove(conn: ref Dial->Connection, name: string): int { if(sys->fprint(conn.dfd, "RM %s\n", name) < 0) return -1; @@ -179,7 +183,7 @@ remove(conn: ref Sys->Connection, name: string): int return 0; } -bye(conn: ref Sys->Connection) +bye(conn: ref Dial->Connection) { if(conn != nil){ if(conn.dfd != nil) @@ -270,7 +274,7 @@ writerr(fd: ref Sys->FD, s: string) sys->werrstr(s); } -setsecret(conn: ref Sys->Connection, sigma: array of byte, direction: int): string +setsecret(conn: ref Dial->Connection, sigma: array of byte, direction: int): string { secretin := array[Keyring->SHA1dlen] of byte; secretout := array[Keyring->SHA1dlen] of byte; @@ -399,14 +403,14 @@ shorthash(mess: string, C: string, S: string, m: string, mu: string, sigma: stri # On output, session secret has been set in conn # (unless return code is negative, which means failure). # -PAKclient(conn: ref Sys->Connection, C: string, pwhash: array of byte): string +PAKclient(conn: ref Dial->Connection, C: string, pwhash: array of byte): string { dfd := conn.dfd; (hexHi, H, nil) := PAK_Hi(C, pwhash); # random 1<=x<=q-1; send C, m=g**x H - x := mod(IPint.random(240, 240), pak.q); + x := mod(IPint.random(240), pak.q); if(x.eq(IPint.inttoip(0))) x = IPint.inttoip(1); m := mod(pak.g.expmod(x, pak.p).mul(H), pak.p); diff --git a/dis/lib/secstore.dis b/dis/lib/secstore.dis Binary files differindex 6e36793a..51aa76b6 100644 --- a/dis/lib/secstore.dis +++ b/dis/lib/secstore.dis diff --git a/doc/port.ms b/doc/port.ms index e495101f..21ae2830 100644 --- a/doc/port.ms +++ b/doc/port.ms @@ -25,7 +25,7 @@ a summary of differences with Unix .I make , can be found in .I "Maintaining Files on Plan 9 with Mk" -by Hume and Flandera, +by Hume and Flandrena, reprinted in this volume. The source for .CW mk @@ -453,7 +453,7 @@ UART, and IrDA mode .CW etherscc.c and .CW devuart.c ). -The IrDA has been used for Styx transport between a FADS board +The IrDA has been used for 9P transport between a FADS board and an IBM Thinkpad 560. The file .CW screen.c diff --git a/doc/port.pdf b/doc/port.pdf Binary files differindex e4111709..d197d304 100644 --- a/doc/port.pdf +++ b/doc/port.pdf diff --git a/include/version.h b/include/version.h index 4f5560e4..4904a3e4 100644 --- a/include/version.h +++ b/include/version.h @@ -1 +1 @@ -#define VERSION "Fourth Edition (20100203)" +#define VERSION "Fourth Edition (20100205)" @@ -89,13 +89,14 @@ it is assumed to be a network address for a machine acting as a file server. This argument should then conform to the conventions described in -.IR sys-dial (2). +.IR dial (2). Otherwise .I source should be the name of a file that when opened gives a connection -to a file server, something serving the Styx protocol +to a file server, something serving the 9P protocol described in -.IR intro (5). +.IR intro (5), +formerly called `Styx'. The optional .I spec argument to @@ -262,7 +263,7 @@ Note the caveats on that page. For .I mount only, -the file server serves the original version of the Styx protocol, and +the file server serves the 1995 version of Inferno's Styx protocol, and .I mount inserts a process that translates to the current version. .SH SOURCE @@ -273,10 +274,10 @@ inserts a process that translates to the current version. .B /appl/cmd/unmount.b .SH SEE ALSO .IR sh (1), +.IR dial (2), .IR keyring-auth (2), .IR security-auth (2), .IR sys-intro (2), .IR sys-bind (2), -.IR sys-dial (2), .IR intro (3), .IR getauthinfo (8) @@ -49,7 +49,7 @@ is not used after authentication. .SH SOURCE .B /appl/cmd/cpu.b .SH SEE ALSO -.IR sys-dial (2), +.IR dial (2), .IR keyring-auth (2), .IR security-auth (2) .SH BUGS diff --git a/man/1/grid-register b/man/1/grid-register index 8eeca460..947875d7 100644 --- a/man/1/grid-register +++ b/man/1/grid-register @@ -11,12 +11,12 @@ grid: register \- registers a resource with a known .SH DESCRIPTION .I Register -takes a program which serves a Styx (see -.IR intro (5)) -namespace on -.I stdin -and registers it with a known -.IR registry (4). +takes a program that serves a namespace using the 9P protocol on its standard input +and registers it with a known +.IR registery (4). +(See +.IR intro (5) +for a description of the protocol.) It then marshals the service by listening for incoming connections and exporting the namespace across them. .I Register prints out various status messages to diff --git a/man/1/grid-session b/man/1/grid-session index 472809d3..19ca4c4f 100644 --- a/man/1/grid-session +++ b/man/1/grid-session @@ -17,9 +17,11 @@ Once started, .IR session presents a heirarchical view of currently registered resources (such as .IR grid-ns (1)) -which export a Styx (see -.IR intro (5)) -namespace. The top level displays the type of resource e.g. +that serve name spaces using 9P. +(See +.IR intro (5) +for a description of the protocol.) +The top level displays the type of resource, for instance .BR 'CPU resource' , whilst the second level shows the name of each individual resource. Descending futher down the tree will reveal the attributes of the selected resource. To mount a resource and see the namespace it exports, click mouse button 3 on the resource name. The view will switch to a split pane view displaying the resource namespace with directories listed on the left and all files in the current directory displayed on the right. .PP diff --git a/man/1/listen b/man/1/listen index 4234ad49..42dc1bac 100644 --- a/man/1/listen +++ b/man/1/listen @@ -59,7 +59,7 @@ waits for an incoming network connection on (as accepted by .B announce in -.IR sys-dial (2)) +.IR dial (2)) and then invokes .IR sh (1) to run the associated @@ -97,7 +97,7 @@ with the shell variable .B net set to the name of the corresponding network directory (see -.IR sys-dial (2)), +.IR dial (2)), before listening for incoming calls. This can be used to change, or find out the characteristics of an announced port (for instance to find out @@ -231,7 +231,7 @@ attach message seen by the command that has been started by .IR styxlisten . .SH "SEE ALSO" -.IR svc (8), -.IR sys-dial (2), +.IR dial (2), +.IR ssl (3), .IR auth (6), -.IR ssl (3) +.IR svc (8) @@ -61,7 +61,7 @@ to the file's owner, members of the file's group and anybody else respectively. .IP 2. The device type (this is the `#' device letter for local devices -or `M' for files mounted over a Styx connection). +or `M' for files mounted over a 9P connection). .IP 3. The device instance number (this distinguishes between separately mounted instances of the same device). @@ -27,7 +27,7 @@ mount or bind, the original name of the file is shown. .PP Mounts of file services on a network show the network address as given to -.IR sys-dial (2) +.IR dial (2) instead of the name of the data file for the connection; the .B -r option causes @@ -40,4 +40,3 @@ to show the raw file name instead. .IR prog (3), .IR namespace (4), .IR namespace (6) - diff --git a/man/1/secstore b/man/1/secstore index bab02a1e..c59a711c 100644 --- a/man/1/secstore +++ b/man/1/secstore @@ -98,7 +98,7 @@ as the extra authentication code if the server demands it. Connect to the server at the given network .IR address , as defined by -.IR sys-dial (2), +.IR dial (2), and translated by .IR cs (8). The default is diff --git a/man/1/sh-file2chan b/man/1/sh-file2chan index d9a57304..27115a8e 100644 --- a/man/1/sh-file2chan +++ b/man/1/sh-file2chan @@ -235,7 +235,9 @@ memory-based file called .EE It is, however, very limited, as binary data stored in the file will be corrupted, and the size of the file is limited to the amount -of data that can be transmitted in a single Styx message (8192 bytes). +of data that can be transmitted in a single write +(see +.IR sys-read (2)). .PP The following code implements a single-threaded logfile which can support multiple concurrent writers: diff --git a/man/1/telnet b/man/1/telnet index 10cdfe22..b840b070 100644 --- a/man/1/telnet +++ b/man/1/telnet @@ -9,7 +9,7 @@ telnet \- make a remote telnet connection uses the Telnet protocol to talk to a remote .IR machine , addressed using any form acceptable to -.IR sys-dial (2): +.IR dial (2): .IB net ! host ! port in general. The default diff --git a/man/10/devattach b/man/10/devattach index 48d48c8d..8d152f48 100644 --- a/man/10/devattach +++ b/man/10/devattach @@ -203,7 +203,7 @@ and consequently those values must remain valid until the last use of .BR up->genbuf .) If channel .I c -corresponds to a file descriptor on which Styx is served, +corresponds to a file descriptor on which 9P is served, .I devdir sets both the flag bit .B QTMOUNT @@ -214,9 +214,7 @@ and the flag bit in .IB dp ->mode (see -.I export -in -.IR sys-dial (2) +.IR sys-export (2) and .I mount in @@ -470,7 +468,7 @@ returned by .BR Qid.path ). If .I c -is a communications channel connecting a Styx server to a current mount point, +is a communications channel connecting a 9P server to a current mount point, the .B DMMOUNT bit is set in the resulting diff --git a/man/10/odbc b/man/10/odbc index fac39877..6367aca9 100644 --- a/man/10/odbc +++ b/man/10/odbc @@ -7,11 +7,13 @@ ODBC \- A Windows ODBC file server .B -d ] [ .BI -p " port" +] [ +.BI -u " user" ] .SH DESCRIPTION .I Odbc is a file server that runs under Windows and -exports a Styx namespace +exports a 9P namespace (see .IR intro (5)). An Inferno process that mounts the namespace @@ -26,6 +28,15 @@ to print debugging information. The .B -p option gives the port number to listen on for connections. The default is 6700. +.PP +By default, the user +.B inferno +owns the files in the name space. +The +.B -u +option makes +.I user +own the files instead. .SS Name space .I Odbc presents the following name space: diff --git a/man/10/styx b/man/10/styx index cbf9bdda..70f37a6a 100644 --- a/man/10/styx +++ b/man/10/styx @@ -40,7 +40,8 @@ uint sizeD2M(Dir *d) These routines convert messages in the machine-independent format of the Inferno file protocol, -Styx (which is equivalent to the Plan 9 protocol 9P2000), +described by +.IR intro (5), to and from a more convenient form, an .B Fcall @@ -129,7 +130,7 @@ void PBIT64(uchar*, vlong) This structure is defined in .BR <styx.h> . See section 5 -for a full description of Styx messages and their encoding. +for a full description of 9P messages and their encoding. For all message types, the .B type field of an @@ -149,7 +150,7 @@ The other fields are used selectively by the message types given in comments. .PP .I ConvM2S -takes a Styx message at +takes a 9P message at .I ap of length .IR nap , @@ -197,7 +198,7 @@ are copied into the message. The constant .B IOHDRSZ is a suitable amount of buffer to reserve for storing -the Styx header; +the 9P header; the data portion of a .B Twrite or @@ -295,7 +296,7 @@ which is a simple but effective test of validity. and .I buf should include the second two-byte (16-bit) length field that precedes the entry when -formatted in a Styx message (see +formatted in a 9P message (see .IR stat (5)); in other words, .I nbuf diff --git a/man/2/drawmux b/man/2/drawmux index 0da1b9e3..3c3989db 100644 --- a/man/2/drawmux +++ b/man/2/drawmux @@ -52,7 +52,7 @@ and the log (base 2) of the number of bits per pixel for windows created on that The remote viewer must then use .B Sys->export (see -.IR sys-dial (2)) +.IR sys-export (2)) to export its .BR /dev/draw , which diff --git a/man/2/registries b/man/2/registries index 526e1c13..f390b1ab 100644 --- a/man/2/registries +++ b/man/2/registries @@ -108,7 +108,7 @@ It has the following members and operations: .TP .B addr A string that represents where the service can be reached: it is often a -.IR sys-dial (2) +.IR dial (2) address string, but might be a name in the name space; the interpretation is internal to .BR Registries . .TP @@ -148,7 +148,7 @@ It provides the following members: .TP .B fd A file descriptor that can be read and written to exchange data with the service. -The meaning of the data depends on the service (eg, it might be a Styx connection +The meaning of the data depends on the service (eg, it might be a 9P connection or a SOAP implementation). Typically an attribute of the service description hints at the protocol. .TP @@ -222,7 +222,7 @@ Connect to the registry at the location determined by the service description if .I svc is nil, the default is to try -.IR sys-dial (2) +.IR dial (2) to .BR net!$registry!registry , the symbolic name of the default registry for the current host. diff --git a/man/2/secstore b/man/2/secstore index 2a14b67a..d6395955 100644 --- a/man/2/secstore +++ b/man/2/secstore @@ -3,6 +3,7 @@ secstore \- fetch data from Plan 9's secure storage service .SH SYNOPSIS .EX +include "dial.m"; include "secstore.m"; secstore := load Secstore Secstore->PATH; @@ -12,19 +13,19 @@ init: fn(); privacy: fn(): int; cansecstore: fn(addr: string, user: string): int; mkseckey: fn(pass: string): array of byte; -dial: fn(addr: string): ref Sys->Connection; -auth: fn(conn: ref Sys->Connection, user: string, seckey: array of byte): +dial: fn(addr: string): ref Dial->Connection; +auth: fn(conn: ref Dial->Connection, user: string, seckey: array of byte): (string, string); connect: fn(addr: string, user: string, seckey: array of byte): - (ref Sys->Connection, string, string); -sendpin: fn(conn: ref Sys->Connection, pin: string): int; -files: fn(conn: ref Sys->Connection): + (ref Dial->Connection, string, string); +sendpin: fn(conn: ref Dial->Connection, pin: string): int; +files: fn(conn: ref Dial->Connection): list of (string, int, string, string, array of byte); -getfile: fn(conn: ref Sys->Connection, name: string, +getfile: fn(conn: ref Dial->Connection, name: string, maxsize: int): array of byte; -.\"putfile: fn(conn: ref Sys->Connection, name: string, data: array of byte,): int; -remove: fn(conn: ref Sys->Connection, file: string): int; -bye: fn(conn: ref Sys->Connection); +.\"putfile: fn(conn: ref Dial->Connection, name: string, data: array of byte,): int; +remove: fn(conn: ref Dial->Connection, file: string): int; +bye: fn(conn: ref Dial->Connection); mkfilekey: fn(pass: string): array of byte; decrypt: fn(data: array of byte, filekey: array of byte): array of byte; @@ -43,16 +44,16 @@ that can then be used to fetch and decrypt data files, such as the file containing the initial keys for an instance of .IR factotum (4). The module's functions hold the file descriptors for the connection in a -.BR Sys->Connection +.BR Dial->Connection value, as returned by -.IR sys-dial (2). +.IR dial (2). The .I addr parameter that gives the network address of the .I secstore service is also as defined in -.IR sys-dial (2). +.IR dial (2). A nil value defaults to .BR "net!$auth!secstore" , for translation in the usual way by @@ -94,9 +95,9 @@ dials the at network address .I addr (as defined by -.IR sys-dial (2)) -and returns a reference to the resulting -.BR Sys->Connection . +.IR dial (2)) +and returns a reference to the resulting +.BR Dial->Connection . It returns nil on an error and sets the error string. .PP .B Auth @@ -106,7 +107,7 @@ of the service. The parameter .I conn refers to the -.B Sys->Connection +.B Dial->Connection value representing the connection. .I User names a user registered with the service. diff --git a/man/2/security-login b/man/2/security-login index cc831319..43a727e7 100644 --- a/man/2/security-login +++ b/man/2/security-login @@ -44,7 +44,7 @@ CA. .PP .B Login connects, using -.IR sys-dial (2), +.IR dial (2), to the signer at network address .IR addr , which is any form accepted by @@ -34,7 +34,7 @@ and .IR dns (6) if available. Other Inferno applications normally give network addresses to the functions of -.IR sys-dial (2), +.IR dial (2), and they are then translated automatically, using the services of .IR cs (8). .PP @@ -1,6 +1,6 @@ .TH STYX 2 .SH NAME -Styx: Rmsg, Tmsg, dir2text, istmsg, packdir, packdirsize, readmsg, qid2text, unpackdir \- interface to Styx file protocol +Styx: Rmsg, Tmsg, dir2text, istmsg, packdir, packdirsize, readmsg, qid2text, unpackdir \- interface to 9P (Styx) file protocol .SH SYNOPSIS .EX include "styx.m"; @@ -118,13 +118,14 @@ MAXRPC: con \fIimplementation-defined\f5; .EE .SH DESCRIPTION .B Styx -provides a Limbo interface to send and receive messages of the Styx file service protocol, -described by Section 5 of this manual (a thorough reading of which -is advised before using this module). +provides a Limbo interface to send and receive messages of the 9P file service protocol, +described by Section 5 of this manual, a thorough reading of which +is advised before using this module. +(The protocol was previously called `Styx' in Inferno, hence the module's name.) .B Init must be called before using any other function in the module. .PP -A Styx client transmits requests to a server as `T-messages' +A 9P client transmits requests to a server as `T-messages' and receives replies in matching `R-messages'. A T-message is here represented by values of the type .BR Tmsg , @@ -232,7 +233,7 @@ Return a printable string showing the contents of for tracing or debugging. .TP .IB t .mtype() -Return the Styx message type of the message. +Return the 9P message type of the message. .PP An R-message is represented by .BR Rmsg . diff --git a/man/2/styxconv b/man/2/styxconv index 9180ad96..296c6abb 100644 --- a/man/2/styxconv +++ b/man/2/styxconv @@ -1,6 +1,6 @@ .TH STYXCONV 2 .SH NAME -styxconv \- convert between old and new Styx +styxconv \- convert between old 1995 Styx and current Styx (9P) .SH SYNOPSIS .EX include "styxconv.m"; @@ -12,9 +12,10 @@ styxconv: fn(client: ref Sys->FD, server: ref Sys->FD); .EE .SH DESCRIPTION .B Styxconv -converts between the previous version of the Styx protocol, +converts between the obsolete 1995 version of the Styx protocol, as used for instance in Inferno's Third Edition and earlier, -and the current version of the protocol, +and the current file service protocol, +previously also called `Styx' but based on 9P2000 and defined by .IR intro (5). .PP @@ -25,10 +26,10 @@ The function .B styxconv takes two file descriptors: .I client -should be a connection to a styx client requiring +should be a connection to a client requiring one version of the protocol; .I server -should be a connection to a styx server serving +should be a connection to a server serving the other version of the protocol. There are two conversion modules: .B PATHNEW2OLD @@ -74,4 +75,4 @@ cvstyx(fd: ref Sys->FD): ref Sys->FD .IR sys-pipe (2), .IR intro (5) .SH BUGS -There is no provision for 9p2000 authentication. +There is no provision for 9P2000 authentication. diff --git a/man/2/styxflush b/man/2/styxflush index b03c5883..845e8973 100644 --- a/man/2/styxflush +++ b/man/2/styxflush @@ -1,6 +1,6 @@ .TH STYXFLUSH 2 .SH NAME -styxflush \- handler for styx flush protocol +styxflush \- handler for 9P (Styx) flush protocol .SH SYNOPSIS .EX include "sys.m"; @@ -16,17 +16,17 @@ rmsg: fn(m: ref Styx->Rmsg): int; Einterrupted: con "interrupted"; .EE .SH DESCRIPTION -Getting the semantics of the Styx +Getting the semantics of the 9P .IR flush (5) protocol correct when handling requests concurrently is surprisingly hard to do. .I Styxflush -is designed to help get it right. It deals with Styx -messages for a single styx session \- if a server needs to +is designed to help get it right. It deals with 9P +messages for a single 9P session \- if a server needs to deal with multiple sessions, then multiple instances of .I styxflush should be loaded. It assumes there is a loop in a central process -which both reads T-messages and sends their R-message replies. +that both reads T-messages and sends their R-message replies. .I Styxflush handles the flushing of requests that are being run outside the central process. diff --git a/man/2/styxpersist b/man/2/styxpersist index 60f370bf..817a96fe 100644 --- a/man/2/styxpersist +++ b/man/2/styxpersist @@ -1,20 +1,20 @@ .TH STYXPERSIST 2 .SH NAME -styxpersist \- persistent Styx connection +styxpersist \- persistent 9P (Styx) connection .SH SYNOPSIS .EX include "sys.m"; include "styxpersist.m"; styxpersist := load Styxpersist Styxpersist->PATH; -init: fn(clientfd: ref Sys->FD, usefac: int, keyspec: string) - : (chan of chan of ref Sys->FD, string); +init: fn(clientfd: ref Sys->FD, usefac: int, keyspec: string): + (chan of chan of ref Sys->FD, string); .EE .SH DESCRIPTION .I Styxpersist -tries to maintain a persistent Styx connection for its client. +tries to maintain a persistent 9P (Styx) connection for its client. .B Init -starts a process to serve Styx for the client on +starts a process to serve 9P for the client on .IR clientfd . If .I usefac @@ -77,4 +77,4 @@ Plan 9 style. If a client uses an external factotum with different keys, may be unable to re-authenticate. .SH "SEE ALSO" .IR mount (1), -.IR sys-dial (2) +.IR dial (2) diff --git a/man/2/styxservers b/man/2/styxservers index 3ba77131..5e4d0334 100644 --- a/man/2/styxservers +++ b/man/2/styxservers @@ -1,7 +1,7 @@ .TH STYXSERVERS 2 .SH NAME styxservers \- -Styx server implementation assistance +9P (Styx) server implementation assistance .SH SYNOPSIS .EX include "sys.m"; @@ -14,7 +14,7 @@ Styxserver, Fid, Navigator: import styxservers; Styxserver: adt { fd: ref Sys->FD; # file server end of connection t: ref Navigator; # name space navigator for this server - msize: int; # negotiated Styx message size + msize: int; # negotiated 9P message size new: fn(fd: ref Sys->FD, t: ref Navigator, rootpath: big) :(chan of ref Tmsg, ref Styxserver); @@ -103,7 +103,7 @@ openok: fn(uname: string, omode, openmode: fn(o: int): int; .EE .SH DESCRIPTION -When writing a Styx file server, there are some +When writing a file server, there are some commonly performed tasks that are fiddly or tedious to implement each time. .B Styxservers @@ -119,7 +119,7 @@ left to the file server program itself. Familiarity with Section 5 of the manual which defines the protocol (see .IR intro (5)), -and with the representation of Styx messages in Limbo +and with the representation of 9P messages in Limbo (see .IR styx (2)), is a prerequisite for use of this module. @@ -322,7 +322,7 @@ reference which can be used to access that navigator; and the file descriptor .IB srv .fd -that is the file server's end of the connection to the Styx client. +that is the file server's end of the connection to the 9P client. Both values are initially provided by the file serving application, but can be accessed through the .B Styxserver @@ -345,7 +345,7 @@ It returns a tuple, say .RI ( c ", " srv ), and spawns a new process, which uses .IR styx (2) -to read and parse Styx messages read +to read and parse 9P messages read from .IR fd , and send them down @@ -892,14 +892,14 @@ with OTRUNC and ORCLOSE flags removed. If .I on is true (non-zero), -will trace Styx requests and replies, on standard error. +will trace 9P requests and replies, on standard error. This option must be set before creating a .BR Styxserver , to ensure that it preserves its standard error descriptor. .SS Constants .B Styxservers defines a number of constants applicable to the writing -of Styx servers, including: +of 9P servers, including: .TP .BR Einuse\fP,\fP\ Ebadfid\fP,\fP\ Eopen\fP,\fP\ Enotfound\fP,\fP\ Enotdir\fP,\fP\ Eperm\fP,\fP\ Ebadarg\fP,\fP\ Eexists These provide standard strings for commonly used error conditions, diff --git a/man/2/sys-0intro b/man/2/sys-0intro index a9d912e9..fd132e58 100644 --- a/man/2/sys-0intro +++ b/man/2/sys-0intro @@ -210,8 +210,8 @@ will be honoured for a file depends entirely on the underlying file server Record locking in the underlying file system is not supported by Inferno. Processes can coordinate their file operations by other mechanisms. .PP -Atomicity is guaranteed for byte counts smaller than the -.I Styx +Atomicity is guaranteed for byte counts no larger than the +.I 9P message size; see .IR read (5). diff --git a/man/2/sys-bind b/man/2/sys-bind index b03379c0..bfec4b2c 100644 --- a/man/2/sys-bind +++ b/man/2/sys-bind @@ -54,7 +54,7 @@ The argument to .B mount is a file descriptor of an open pipe or network connection -to a file server ready to receive Styx messages. +to a file server ready to receive 9P messages. The .I old file must be a directory. diff --git a/man/2/sys-export b/man/2/sys-export index dc2bff50..3872d5dc 100644 --- a/man/2/sys-export +++ b/man/2/sys-export @@ -11,7 +11,7 @@ export: fn(fd: ref FD, dir: string, flag: int): int; .SH DESCRIPTION .B Export receives and replies -to Styx requests from a client on a connection represented by +to 9P requests from a client on a connection represented by .IR fd , for file operations on the part of the current file name space rooted at @@ -40,7 +40,7 @@ of a returned by .B listen (see -.IR sys-dial (2)). +.IR dial (2)). Before calling .BR export , the connection on diff --git a/man/2/sys-fauth b/man/2/sys-fauth index 8e06d6ac..15ec8c44 100644 --- a/man/2/sys-fauth +++ b/man/2/sys-fauth @@ -11,7 +11,7 @@ fauth: fn(fd: ref FD, aname: string): ref FD; .SH DESCRIPTION .B Fauth provides a means for the current user to authenticate to access -resources available through the Styx connection represented by +resources available through the 9P connection represented by .IR fd . The return value is a file descriptor, conventionally called .IR afd , diff --git a/man/2/sys-file2chan b/man/2/sys-file2chan index 33ff29bd..a3f18275 100644 --- a/man/2/sys-file2chan +++ b/man/2/sys-file2chan @@ -49,7 +49,7 @@ the contents of the .B Tread and .B Twrite -Styx messages received by the system on the server's behalf; see +9P messages received by the system on the server's behalf; see .IR intro (5). .PP When the client invokes the diff --git a/man/2/sys-fversion b/man/2/sys-fversion index 200a4f04..94a43139 100644 --- a/man/2/sys-fversion +++ b/man/2/sys-fversion @@ -1,6 +1,6 @@ .TH SYS-FVERSION 2 .SH NAME -fversion \- initialize Styx connection and negotiate version +fversion \- initialize 9P connection and negotiate version .SH SYNOPSIS .EX include "sys.m"; @@ -10,13 +10,13 @@ fversion: fn(fd: ref FD, bufsize: int, version: string): (int, string); .EE .SH DESCRIPTION .B Fversion -initialises the Styx connection represented by +initialises the 9P connection represented by .I fd and negotiates the maximum message size and the version of the protocol to be used. .PP The .I bufsize -determines the size of the I/O buffer used to stage Styx requests to the server, +determines the size of the I/O buffer used to stage 9P requests to the server, subject to the constraints of the server itself. The .I version diff --git a/man/2/sys-iounit b/man/2/sys-iounit index 0f8ef118..b4727411 100644 --- a/man/2/sys-iounit +++ b/man/2/sys-iounit @@ -9,7 +9,7 @@ sys := load Sys Sys->PATH; iounit: fn(fd: ref FD): int; .EE .SH DESCRIPTION -Reads and writes of files are transmitted using the Styx protocol (see +Reads and writes of files are transmitted using the 9P protocol (see .IR intro (5)) and in general, operations involving large amounts of data must be broken into smaller pieces by the operating system. diff --git a/man/2/sys-pipe b/man/2/sys-pipe index 6fb3a25e..bc43e060 100644 --- a/man/2/sys-pipe +++ b/man/2/sys-pipe @@ -33,12 +33,12 @@ communication by cooperating processes. Pipes are still useful, however, to connect applications that do not (or cannot) share such channels, or when a system interface requires a file descriptor. -For instance, a process that serves the Styx protocol can +For instance, a process that serves the 9P protocol can pass the file descriptor for one end of a pipe to .B Sys->mount (see .IR sys-bind (2)), -and read and write Styx messages on the other end of the pipe. +and read and write 9P messages on the other end of the pipe. .SH DIAGNOSTICS Returns 0 on success; -1 on failure. .SH "SEE ALSO" diff --git a/man/2/virgil b/man/2/virgil index 5a7cd347..778ce7b1 100644 --- a/man/2/virgil +++ b/man/2/virgil @@ -39,7 +39,7 @@ It accepts and returns the first answer it receives. .SH SOURCE .B /appl/lib/virgil.b .SH SEE ALSO -.IR sys-dial (2), +.IR dial (2), .IR cs (8), .IR register (8), .IR virgild (8) diff --git a/man/3/0intro b/man/3/0intro index e379f9af..1057dce1 100644 --- a/man/3/0intro +++ b/man/3/0intro @@ -29,7 +29,7 @@ device. .PP A kernel device driver is a .I server -in the sense of the Inferno File Protocol, Styx (see Section 5), +in the sense of the Inferno File Protocol, 9P (see Section 5), but with the messages implemented by local rather than remote procedure calls. Also, several of the messages @@ -243,7 +243,7 @@ The and .BR listen functions described in -.IR sys-dial (2) +.IR dial (2) perform the necessary I/O to establish and manipulate network connections. .SS TCP protocol @@ -747,7 +747,7 @@ and .IB device !0x806 (ARP). See -.IR sys-dial (2) +.IR dial (2) for the interpretation of such addresses. The interface runs until a process does an explicit .BR unbind . @@ -807,7 +807,7 @@ contains a connection will be opened using .B dial (see -.IR sys-dial (2)). +.IR dial (2)). Otherwise the name will be opened as-is; usually it is the name of a serial device (eg, @@ -921,6 +921,6 @@ to be set, or the current user lacks the privileges to set it. .br .B /os/ip/*medium.c .SH "SEE ALSO" -.IR sys-dial (2) +.IR dial (2) .\" joinmulti and leavemulti are unimplemented .\" many media are only partly implemented diff --git a/man/3/logfs b/man/3/logfs index 5e60b308..04a1fdcc 100644 --- a/man/3/logfs +++ b/man/3/logfs @@ -44,7 +44,7 @@ devices are supported. .PP The file system maintains two storage regions on the same medium: a log-structured hierarchical file system that implements all the -functionality communicable by the Styx protocol +functionality communicable by the 9P protocol (see .IR intro (5)), and a boot @@ -106,7 +106,7 @@ two files appear in the device name space, .BI /dev/logfs name and .BI /dev/logfs name\f5boot\fI. -The former serves the Styx protocol giving access to the hierarchical file system; +The former serves the 9P protocol giving access to the hierarchical file system; the latter is a fixed size file that represents the boot partition. .TP .BI [fsys " name\f5] format \fIbootsize" @@ -1,6 +1,6 @@ .TH MNT 3 .SH NAME -mnt \- attach to Styx servers +mnt \- attach to 9P servers .SH SYNOPSIS .nf .B #M @@ -15,12 +15,12 @@ is used by see .IR sys-bind (2)) to connect the name space of a process to -the service provided by a Styx server over a communications channel. +the service provided by a 9P server over a communications channel. After the .BR mount , file operations in that portion of the name space will be converted by the mount driver into the appropriate -Styx messages to the server, and its Styx replies returned +9P messages to the server, and its 9P replies returned as the status of the system calls. .PP Any authentication must precede @@ -40,8 +40,8 @@ Each distinct user of a connection must mount it separately; the mount driver multiplexes the access of the various users and their processes to the service. .PP -File-oriented system calls are converted by the kernel into messages in the Styx protocol. -Within the kernel, Styx is implemented by procedure calls to the +File-oriented system calls are converted by the kernel into messages in the 9P protocol. +Within the kernel, 9P is implemented by procedure calls to the various kernel device drivers, as described in .IR intro (10) and @@ -61,7 +61,7 @@ system call on a file served by the mount driver may be translated into more than one message, -since there is a maximum data size for a Styx message. +since there is a maximum data size for a 9P message. The system call will return when the specified number of bytes have been transferred or a short reply is returned. @@ -126,7 +126,7 @@ The device follows the conventions that allow and .B listen of -.IR sys-dial (2) +.IR dial (2) to do the work needed to establish and manipulate network connections. .SH SOURCE .B /os/pc/devplap.c @@ -267,7 +267,7 @@ and .BR 'sha1' . .SH "SEE ALSO" .IR listen (1), -.IR sys-dial (2), +.IR dial (2), .IR ssl (3) \".IR pushtls (2) .SH SOURCE diff --git a/man/4/0intro b/man/4/0intro index f7d28560..fd36468b 100644 --- a/man/4/0intro +++ b/man/4/0intro @@ -2,7 +2,7 @@ .SH NAME intro \- introduction to file servers .SH DESCRIPTION -This section describes programs that serve Styx +This section describes programs that serve 9P (see .IR intro (5)), and can therefore diff --git a/man/4/dossrv b/man/4/dossrv index 5fd2cc3a..14968a01 100644 --- a/man/4/dossrv +++ b/man/4/dossrv @@ -27,7 +27,7 @@ makes the contents of a DOS/Windows file system visible in the Inferno name spac The options are: .TP .B -v -print a debugging trace, including Styx messages, on standard error +print a debugging trace, including 9P messages, on standard error .TP .B -F display FAT information diff --git a/man/4/export b/man/4/export index 5b9f4ebb..ea2b378c 100644 --- a/man/4/export +++ b/man/4/export @@ -13,12 +13,10 @@ export \- export name space on a connection .SH DESCRIPTION .I Export calls -.B Sys->export -(see -.IR sys-dial (2)) -to serve a name space rooted at +.IR sys-export (2) +to serve the name space rooted at .I dir -over a connection to a Styx client. +over a connection to a 9P (Styx) client. .I Export opens the connection on the given .IR file , @@ -35,7 +33,7 @@ serves the current name space without forking it; changes made to it will be visible to clients. .PP .I Export -starts serving Styx immediately; it assumes that the connection +starts serving 9P immediately; it assumes that the connection has been authenticated if required. .I Export is typically called via @@ -53,5 +51,6 @@ unless a transport protocol is run on the connection. .SH SEE ALSO .IR cpu (1), .IR listen (1), -.IR sys-dial (2), +.IR dial (2), +.IR sys-export (2), .IR intro (5) diff --git a/man/4/ftpfs b/man/4/ftpfs index 947d7338..6857366f 100644 --- a/man/4/ftpfs +++ b/man/4/ftpfs @@ -23,7 +23,7 @@ visible at .BR /n/ftp ) in the current name space, for access by ordinary Inferno file operations. -In other words, it is a protocol translator between FTP and Styx. +In other words, it is a protocol translator between FTP and 9P. The connection is shut down by unmounting the mount point; see .IR bind (1). diff --git a/man/4/grid-cpu b/man/4/grid-cpu index b30c3740..ea364e90 100644 --- a/man/4/grid-cpu +++ b/man/4/grid-cpu @@ -53,7 +53,7 @@ For example, to import .B /dis and .B /dev -from a resource exporting a Styx (see +from a resource exporting a 9P (see .IR intro(5)) namespace at address .B tcp!200.1.5.53!7003 diff --git a/man/4/iostats b/man/4/iostats index e4a3b4fb..376f6325 100644 --- a/man/4/iostats +++ b/man/4/iostats @@ -65,7 +65,7 @@ Display summary of file I/O incurred by iostats ls .EE .PP -Start a new shell, displaying all Styx traffic caused by the shell or its children: +Start a new shell, displaying all 9P traffic caused by the shell or its children: .IP .EX iostats -df /fd/1 sh @@ -21,7 +21,7 @@ kfs \- disk file system implements a hierarchical Inferno file system within an existing .IR file , which is typically a disk or flash memory partition. -It gives access to it through the Styx protocol on its standard input, +It gives access to it through the 9P protocol on its standard input, and the contents can be mounted directly on a given .I dir as shown above. diff --git a/man/4/mntgen b/man/4/mntgen index 934926f1..ceecf6ca 100644 --- a/man/4/mntgen +++ b/man/4/mntgen @@ -5,7 +5,7 @@ mntgen \- dynamically generate mount points .BI "mount {mntgen} " dir .SH DESCRIPTION .I Mntgen -serves a Styx connection on its standard input, providing a name space containing a +serves 9P on its standard input, providing a name space containing a single directory that is initially empty, but in which a subdirectory name appears when is first referenced, and remains only as long as it is needed (referenced). .I Mntgen diff --git a/man/4/registry b/man/4/registry index 4d7259a5..91aa2244 100644 --- a/man/4/registry +++ b/man/4/registry @@ -25,7 +25,7 @@ where services come and go. It was originally intended to register Grid resources but has much wider use. .I Registry -serves Styx on its standard input. +serves 9P on its standard input. That can be mounted in the local name space (see below for an example), or served over a connection (eg, via diff --git a/man/6/image b/man/6/image index 93e668fa..8bd91298 100644 --- a/man/6/image +++ b/man/6/image @@ -135,7 +135,7 @@ image data. The rest of the file is a string of compression blocks, each encoding a number of rows of the image's pixel data. Compression blocks are at most 6024 bytes long, so that they fit comfortably in a -single Styx message. Since a compression block must encode a +single 9P message. Since a compression block must encode a whole number of rows, there is a limit (about 5825 bytes) to the width of images that may be encoded. Most wide images are in subfonts, which, at 1 bit per pixel (the usual case for fonts), can be 46600 pixels wide. diff --git a/man/8/collabsrv b/man/8/collabsrv index 0d425cab..b99e0365 100644 --- a/man/8/collabsrv +++ b/man/8/collabsrv @@ -29,7 +29,7 @@ The services are defined by the contents of directory (default: .BR /services/collab ). .I Collabsrv -serves an authenticated Styx connection that exports the contents of +serves an authenticated 9P connection that exports the contents of .IB dir /export (default: .BR /services/collab/export ). @@ -57,10 +57,10 @@ all share that name space. The name space is determined by the service. .PP A client wishing to make use of the services must first -.IR sys-dial (2) +.IR dial (2) to connect to .IR collabsrv, -and authenticate and mount the resulting Styx connection. +and authenticate and mount the resulting 9P connection. It can do so using the .I mount command @@ -141,7 +141,7 @@ but usually refer to files in Each .I collabsrv service is represented by a name space peculiar to that service. -The interface to the service is therefore implemented by a service-specific Styx server +The interface to the service is therefore implemented by a service-specific 9P server .RI ( disfile in the configuration file). Current services are described below. @@ -31,7 +31,7 @@ answering requests by client processes to translate symbolic network and service names into instructions for connecting to the given service. It is normally accessed indirectly by calls to -.IR sys-dial (2). +.IR dial (2). .PP The network data is taken from the network database files, described in @@ -76,7 +76,7 @@ or .B announce as required. (All this activity is normally encapsulated in a call to -.IR sys-dial (2)). +.IR dial (2).) .I Cs produces a translation for each network and for each network address on which a symbolic .I netaddr @@ -243,6 +243,6 @@ map from symbolic service names to servers .br .B /appl/cmd/ndb/csquery.b .SH "SEE ALSO" -.IR sys-dial (2), +.IR dial (2), .IR ndb (6), .IR dns (8) diff --git a/man/8/httpd b/man/8/httpd index eca8bf25..d00cc31c 100644 --- a/man/8/httpd +++ b/man/8/httpd @@ -60,7 +60,7 @@ has the following options: Listen for calls on the given .IR address , expressed using the syntax of -.IR sys-dial (2). +.IR dial (2). .TP .BI -c " cachesize" Set the size of the daemon's cache to @@ -17,7 +17,7 @@ ping \- probe the Internet sends ICMP echo requests to a network .I destination (which has the syntax accepted by -.IR sys-dial (2)). +.IR dial (2)). The target host, if up, should send a corresponding reply. By default, one line is printed for each reply, containing the sequence number (starting at 0) of the message it answers, @@ -54,7 +54,7 @@ in bytes .SH SOURCE .B /appl/cmd/ip/ping.b .SH SEE ALSO -.IR sys-dial (2), +.IR dial (2), .IR ip (3) .SH DIAGNOSTICS .I Ping diff --git a/man/8/rdbgsrv b/man/8/rdbgsrv index 139cd4c5..c3d9d0ba 100644 --- a/man/8/rdbgsrv +++ b/man/8/rdbgsrv @@ -15,19 +15,13 @@ rdbgsrv \- remote debug server .I mountpoint .SH DESCRIPTION .I Rdbgsrv -is intended for use with versions of -.IR sboot (10.8) -that do not use -.IR styxmon (10.8), -but serve Styx directly. -.I Rdbgsrv interposes itself between .I dev (default: .BR /dev/eia0 ) and .I mountpoint -to convey Styx messages via the serial port to and from a Styx server program +to convey 9P messages via the serial port to and from a 9P server program running on a board running native Inferno. The .B \-f @@ -39,8 +33,8 @@ option sets the line speed; the default is 38400 baud. The .B \-d option selects debugging options by a bit mask: -1, print trace of Styx message types; -2, print actual Styx message contents. +1, print trace of 9P message types; +2, print actual 9P message contents. .PP The monitor program on the board must be started first. .I Rdbgsrv @@ -49,63 +43,16 @@ writes the two byte message and keeps reading the device until it sees the reply .BR ok . It then attempts to mount the exported name space, and -copies Styx messages to and from the device. +copies 9P messages to and from the device. .PP Once .I rdbgsrv -is running, several device files provided by the program +is running, any device files provided by the program will be visible at .IR mountpoint . -The files include flash partitions, a console file, and a file representing -temporary storage in the device's memory: -.TF sbootconsole -.PD -.TP -.B sbootconsole -Accepts -.IR sboot (10.8) -commands. -When read, it returns output from recent commands. -.TP -.B tmp -Temporary memory buffer that accepts data to be copied to the flash. -.TP -.BI F! partition -Represents the flash partition with the name -.IR partition . -.PP -The following example -Inferno -session on the host mounts the serial device on -.BR /n/rdbg , -and sends commands by writing to -.BR /n/rdbg/sbootconsole . -.IP -.EX -% bind -b '#t' /dev # ensure /dev/eia0 is visible -% auxi/rdbgsrv /n/rdbg -% ls /n/rdbg -/n/rdbg/F!kern -/n/rdbg/F!fs -/n/rdbg/sbootconsole -/n/rdbg/tmp -% cp /os/sa1100/isword.p9.gz /n/rdbg/F!kern # copy kernel -% cp /tmp/fs.tgz /n/rdbg/tmp # copy compressed file system -% echo c/u T! F!fs >/n/rdbg/sbootconsole -% cat /n/rdbg/sbootconsole -% echo P >/n/rdbg/sbootconsole -% echo b F!kern >/n/rdbg/sbootconsole # boot from F!kern -.EE -.PP -Copying a file containing -.I sboot -commands to -.B /n/rdbg/sbootconsole -has the same effect as writing the individual commands to the console. .SH SOURCE .B /appl/auxi/rdbgsrv.b .SH SEE ALSO -.IR sboot (10.8), -.IR styxmon (10.8) +.IR styxchat (8) .SH BUGS No error recovery is applied, let alone error correction. diff --git a/man/8/styxchat b/man/8/styxchat index 11fdb378..29a04dd8 100644 --- a/man/8/styxchat +++ b/man/8/styxchat @@ -1,6 +1,6 @@ .TH STYXCHAT 8 .SH NAME -styxchat \- exchange Styx messages with a server or client +styxchat \- exchange 9P (Styx) messages with a server or client .SH SYNOPSIS .B styxchat [ @@ -16,7 +16,8 @@ styxchat \- exchange Styx messages with a server or client ] .SH DESCRIPTION .I Styxchat -exchanges messages with a Styx service. +exchanges messages with a 9P service. +(9P was previously called `Styx' when used by Inferno, hence the command's name.) See .IR intro (5) for the protocol definition. @@ -27,9 +28,9 @@ It makes a connection to a given if the .B -s option is specified), -then reads a textual representation of Styx T-messages from the standard +then reads a textual representation of 9P T-messages from the standard input and writes them on the connection, with a copy on standard output, -simultaneously reading Styx R-messages from the connection and printing a representation of them +simultaneously reading 9P R-messages from the connection and printing a representation of them on standard output. Each message is represented by one line on the standard output in the form of a literal of either @@ -58,7 +59,7 @@ The option causes .I destination to be interpreted as a network address, as accepted by -.IR sys-dial (2) +.IR dial (2) (or .I listen with @@ -67,7 +68,7 @@ If .I destination is not provided, .B styxchat -reads and writes Styx messages on its standard input, +reads and writes 9P messages on its standard input, using .B /dev/cons where it would usually use its standard input and output. @@ -192,10 +193,10 @@ option, allowing data display to be enabled later. .PP By default, .I styxchat -sends a Styx client's T-messages and prints a server's R-messages. +sends a 9P client's T-messages and prints a server's R-messages. The .B -s -option causes it to present a server's view: it prints the T-messages from Styx clients, and sends R-messages +option causes it to present a server's view: it prints the T-messages from 9P clients, and sends R-messages as it reads a textual representation of them from standard input: .IP .br diff --git a/man/8/styxmon b/man/8/styxmon index 48012736..60c194e6 100644 --- a/man/8/styxmon +++ b/man/8/styxmon @@ -1,6 +1,6 @@ .TH STYXMON 8 .SH NAME -styxmon \- monitor a Styx conversation +styxmon \- monitor a 9P (Styx) conversation .SH SYNOPSIS .B styxmon [ @@ -14,13 +14,13 @@ styxmon \- monitor a Styx conversation ] .SH DESCRIPTION .I Styxmon -allows the monitoring of styx messages sent and received +allows the monitoring of 9P messages sent and received by .IR cmd , -which should serve Styx through its standard input. +which should serve 9P through its standard input. .I Styxmon -in its turn serves Styx through its standard input, -and writes information on the Styx messages that +in its turn serves 9P through its standard input, +and writes information on the 9P messages that it sees to the standard error. The .B -r @@ -5,6 +5,9 @@ svc: auth, net, registry, rstyx, styx \- start Inferno network services .B svc/net .br .B svc/auth +[ +.B -n +] .br .B svc/registry .br @@ -38,6 +41,11 @@ file service or remote execution. .I Auth must be run (only) on a host that is to act as an authentication server, providing signing and other authentication services to itself and the network. +The +.B -n +flag tells it not to start +.IR keyfs (4), +perhaps because it has been started already. The files .BR /keydb/signerkey , created by @@ -85,7 +93,7 @@ putting it at the conventional location for the local registry, Initial (static) service descriptions are taken from .B /lib/ndb/registry if it exists. -It then starts a listener to give other hosts access to the registry as a Styx +It then starts a listener to give other hosts access to the registry as a 9P service at .BR tcp!*!registry , normally port 6675. diff --git a/module/secstore.m b/module/secstore.m index ef9fa100..1cba9d1f 100644 --- a/module/secstore.m +++ b/module/secstore.m @@ -9,15 +9,15 @@ Secstore: module privacy: fn(): int; cansecstore: fn(addr: string, user: string): int; mkseckey: fn(pass: string): array of byte; - connect: fn(addr: string, user: string, pwhash: array of byte): (ref Sys->Connection, string, string); - dial: fn(addr: string): ref Sys->Connection; - auth: fn(conn: ref Sys->Connection, user: string, pwhash: array of byte): (string, string); - sendpin: fn(conn: ref Sys->Connection, pin: string): int; - files: fn(conn: ref Sys->Connection): list of (string, int, string, string, array of byte); - getfile: fn(conn: ref Sys->Connection, filename: string, maxsize: int): array of byte; - remove: fn(conn: ref Sys->Connection, filename: string): int; -# putfile: fn(conn: ref Sys->Connection, filename: string, data: array of byte,): int; - bye: fn(conn: ref Sys->Connection); + connect: fn(addr: string, user: string, pwhash: array of byte): (ref Dial->Connection, string, string); + dial: fn(addr: string): ref Dial->Connection; + auth: fn(conn: ref Dial->Connection, user: string, pwhash: array of byte): (string, string); + sendpin: fn(conn: ref Dial->Connection, pin: string): int; + files: fn(conn: ref Dial->Connection): list of (string, int, string, string, array of byte); + getfile: fn(conn: ref Dial->Connection, filename: string, maxsize: int): array of byte; + remove: fn(conn: ref Dial->Connection, filename: string): int; +# putfile: fn(conn: ref Dial->Connection, filename: string, data: array of byte,): int; + bye: fn(conn: ref Dial->Connection); mkfilekey: fn(pass: string): array of byte; decrypt: fn(a: array of byte, key: array of byte): array of byte; |