diff --git a/diags/.gitignore b/diags/.gitignore index e33609d..6633554 100644 --- a/diags/.gitignore +++ b/diags/.gitignore @@ -1 +1,2 @@ *.png +*.pdf diff --git a/diags/graph-this.sh b/diags/graph-this.sh index 14a4e2b..f0406c1 100755 --- a/diags/graph-this.sh +++ b/diags/graph-this.sh @@ -22,22 +22,22 @@ do fi done -# PKTDIAG=pktdiag -# for i in *\.$PKTDIAG -# do -# PNG=$(echo ${i} | sed "s/$PKTDIAG$/pdf/") -# -# if [ ! -f ${PNG} ] || [ $(stat -c "%X" ${PNG}) -lt $(stat -c "%X" ${i}) ] -# then -# -# echo seqdiag ${i} -# packetdiag -Tpdf -a -f $FONT ${i} -# -# echo touch ${PNG} -# touch ${PNG} -# fi -# done -# +PKTDIAG=pktdiag +for i in *\.$PKTDIAG +do + PNG=$(echo ${i} | sed "s/$PKTDIAG$/pdf/") + + if [ ! -f ${PNG} ] || [ $(stat -c "%X" ${PNG}) -lt $(stat -c "%X" ${i}) ] + then + + echo seqdiag ${i} + packetdiag -Tpdf -a -f $FONT ${i} + + echo touch ${PNG} + touch ${PNG} + fi +done + # GDOT="gviz-dot" # for i in *\.$GDOT # do diff --git a/diags/remoted.diag b/diags/remoted.diag index eed66c8..aa11602 100644 --- a/diags/remoted.diag +++ b/diags/remoted.diag @@ -1,7 +1,8 @@ diagram { edge_length = 300; - default_fontsize = 13; // default value is 11 - span_height = 10; // default value is 40 + default_fontsize = 16; // default value is 11 + span_height = 8; // default value is 40 + node_height = 60; // default value is 40 activation = none; // Numbering edges automaticaly @@ -11,12 +12,26 @@ diagram { default_note_color = lightblue; - client; remoted; transportd; service; + client [label = "client\nlocal"]; + remoted [label = "remoted\nlocal"]; + transportd [label = "transportd\n(ex: tcpd)\nlocal"]; + transportd2 [label = "transportd\n(ex: tcpd)\nremote"]; + remoted2 [label = "remoted\nremote"]; + service [label = "service\nremote"]; - client -> remoted [label = "service-name"]; - client -> remoted [label = "REMOTED_VAR=URI"]; - client -> remoted [label = "END"]; - remoted -> transportd [label = "connect URI"]; + client -> remoted [label = "service-name (ex: pongd)"]; + client -> remoted [label = "REMOTED_VAR=URI + ex: tcp://user:password@example.com:9000", fontsize=13]; + client -> remoted [label = "END (mark the end of the options)" + , rightnote = "Remoted: authenticates, authorizes, determines the right transport daemon and + applies forwarding rules", fontsize=13]; + remoted -> transportd [label = "connect URI + service name"]; + transportd -> transportd2 [label = "connection init + service name + URI"]; + transportd2 -> remoted2 [label = "connection request + service name + URI"]; + remoted2 -> transportd2 [label = "authorization (yes|no)"]; + transportd2 -> transportd [label = "connection established"]; transportd -> remoted [label = "socket"]; remoted -> client [label = "socket"]; client -> service [label = "connection"]; diff --git a/diags/remoted.pdf b/diags/remoted.pdf deleted file mode 100644 index e91f579..0000000 Binary files a/diags/remoted.pdf and /dev/null differ diff --git a/diags/remoted_end.pktdiag b/diags/remoted_end.pktdiag new file mode 100644 index 0000000..365792b --- /dev/null +++ b/diags/remoted_end.pktdiag @@ -0,0 +1,13 @@ +packetdiag { + colwidth = 64 + node_height = 60 + node_width = 15 + default_fontsize = 16; // default value is 11 + + // basic header (type then length) + 0-7: type\n1 byte [color = "#CCEECC"] + 8-23: length\n2 bytes [color = "#CCEECC"] + + // payload + 24-63: END\n3 bytes [color = "#CCCCEE"] +} diff --git a/diags/remoted_init.pktdiag b/diags/remoted_init.pktdiag new file mode 100644 index 0000000..0ab28d2 --- /dev/null +++ b/diags/remoted_init.pktdiag @@ -0,0 +1,13 @@ +packetdiag { + colwidth = 64 + node_height = 60 + node_width = 15 + default_fontsize = 16; // default value is 11 + + // basic header (type then length) + 0-7: type\n1 byte [color = "#CCEECC"] + 8-23: length\n2 bytes [color = "#CCEECC"] + + // payload + 24-63: service name\nn bytes [color = "#CCCCEE"] +} diff --git a/diags/remoted_options.pktdiag b/diags/remoted_options.pktdiag new file mode 100644 index 0000000..8fd8058 --- /dev/null +++ b/diags/remoted_options.pktdiag @@ -0,0 +1,13 @@ +packetdiag { + colwidth = 64 + node_height = 60 + node_width = 15 + default_fontsize = 16; // default value is 11 + + // basic header (type then length) + 0-7: type\n1 byte [color = "#CCEECC"] + 8-23: length\n2 bytes [color = "#CCEECC"] + + // payload + 24-63: environment variable (one per packet)\nex: REMOTED_URI=tcp://user:pass@host.example.com:9000\nn bytes [color = "#CCCCEE"] +}