Mercurial > docs > diploma
changeset 397:13e630c5a44d
rename img -> fig
| author | meillo@marmaro.de |
|---|---|
| date | Sat, 07 Feb 2009 22:39:07 +0100 |
| parents | 8ef85e22ff7d |
| children | 40c2c6810f38 |
| files | .hgignore thesis/Makefile thesis/fig/Makefile thesis/fig/comm-classification.pic thesis/fig/comm-lifecycle.pic thesis/fig/email-swot.pic thesis/fig/ipc-protocol.pic thesis/fig/mail-agents.pic thesis/fig/marker.pic.inc thesis/fig/masqmail-arch-new.pic thesis/fig/masqmail-channels.pic thesis/fig/masqmail-typical-usage.pic thesis/fig/mta-channels.pic thesis/fig/proxy-setup.pic thesis/fig/stunnel.pic thesis/img/Makefile thesis/img/comm-classification.pic thesis/img/comm-lifecycle.pic thesis/img/email-swot.pic thesis/img/ipc-protocol.pic thesis/img/mail-agents.pic thesis/img/marker.pic.inc thesis/img/masqmail-arch-new.pic thesis/img/masqmail-channels.pic thesis/img/masqmail-typical-usage.pic thesis/img/mta-channels.pic thesis/img/proxy-setup.pic thesis/img/stunnel.pic thesis/tex/1-Introduction.tex thesis/tex/2-MarketAnalysis.tex thesis/tex/4-MasqmailsFuture.tex thesis/tex/5-Improvements.tex |
| diffstat | 32 files changed, 542 insertions(+), 542 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Sat Feb 07 19:00:25 2009 +0100 +++ b/.hgignore Sat Feb 07 22:39:07 2009 +0100 @@ -7,4 +7,4 @@ thesis/.*\.(aux|bak|bbl|blg|dvi|idx|ilg|ind|lof|log|lot|pdf|toc|ps)$ syntax: glob -thesis/img/*.eps +thesis/fig/*.eps
--- a/thesis/Makefile Sat Feb 07 19:00:25 2009 +0100 +++ b/thesis/Makefile Sat Feb 07 22:39:07 2009 +0100 @@ -19,13 +19,13 @@ clean: latexmk -c rm web.* - cd img ; $(MAKE) clean ; cd - + cd fig ; $(MAKE) clean ; cd - .PHONY: cover cover: latexmk -ps -pdfps $(COVER) .PHONY: img -img: img/*.pic - cd img ; $(MAKE) ; cd - +img: fig/*.pic + cd fig ; $(MAKE) ; cd -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thesis/fig/Makefile Sat Feb 07 22:39:07 2009 +0100 @@ -0,0 +1,36 @@ +# generate clipped EPS pictures of PIC files +# +# requires: pic, troff (with font Palatino), grops, ps2eps + +#IMG=`ls *.pic | sed 's/\.pic$$/.eps/'` +IMG=\ +comm-classification.eps \ +masqmail-arch-new.eps \ +comm-lifecycle.eps \ +email-swot.eps \ +mta-channels.eps \ +stunnel.eps \ +mail-agents.eps \ +masqmail-typical-usage.eps \ +masqmail-channels.eps \ +proxy-setup.eps \ +ipc-protocol.eps \ + + +.PHONY: all +all: info $(IMG) + +info: + @echo "pictures to generate: $(IMG)" + + + +.SUFFIXES: .pic .eps +.pic.eps: *.pic + @echo ">>>> processing: $*" + pic $*.pic | troff -fP | grops | ps2eps -f > $*.eps + + +.PHONY: clean +clean: + rm -f `ls *.pic | sed 's/\.pic$$/.eps/'`
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thesis/fig/comm-classification.pic Sat Feb 07 22:39:07 2009 +0100 @@ -0,0 +1,32 @@ +.PS + + +boxwid = 2 +boxht = 1 +colheaderh = 0.4 +rowheaderw = 1.3 + + +copy "marker.pic.inc" + +define row { + [ + right + B1: box $1 + B2: box $2 + ] +} + + +down +row("email" "SMS", "voice mail" "video messages") +row("Instant Messaging" "chat", "VoIP" "video conferencing") + +marker_top(1st [].B1, "written") +marker_top(1st [].B2, "recorded") + +marker_left(1st [], "asyncronous" rjust "(messages)" rjust) +marker_left(2nd [], "syncronous" rjust "(dialog)" rjust) + + +.PE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thesis/fig/comm-lifecycle.pic Sat Feb 07 22:39:07 2009 +0100 @@ -0,0 +1,71 @@ +.PS + + +boxwid = 1.25 +boxht = 3 +colheaderh = 0.4 +rowheaderw = 1.0 +ad = 0.1 # arrow distance + +copy "marker.pic.inc" + + + +define segment { + [ + down + A: box "" invis + line dotted from A.ne to A.se + marker_bot(last box, $1) + ] +} + + +move up boxht/2-markerlen/2 +right + +segment("introduction") +segment("growth") +segment("mature") +segment("saturation") +segment("decline") + + +arrow from 1st [].A.sw to last [].A.se +"\fI" "time" above rjust "\fR" at last arrow.end + (-0.2,0.00) +arrow from 1st [].A.sw to 1st [].A.nw +"\fI" "market share," ljust "importance," ljust "etc." ljust "\fR" at last arrow.end + (0.05,-0.45) + + +spline from 1st [].A.sw right boxwid*0.7 up 0.1 \ + then right boxwid*0.8 up 1.0 \ + then right boxwid up 1.2 \ + then right boxwid up 0.5 \ + then right boxwid down 0.3 \ + then right boxwid/2 down 0.1 + + +move to (0,0) + +line left ad up ad*3 with .start at (0.38*boxwid, 0.1) +box "video" "messages" invis wid 0.6 ht 0.4 + +line left ad up ad*3 with .start at (0.77*boxwid, 0.3) +box "voice" "mail" invis same + +line left ad up ad*3 with .start at (1.61*boxwid, 1.3) +box "Voice" "over IP" invis same + +line right ad down ad*3 with .start at (2.31*boxwid, 2.0) +box "instant" "messaging" invis same + +line right ad down ad*3 with .start at (3.23*boxwid, 2.6) +box "email" invis wid 0.6 ht 0.2 + +line right ad down ad*3 with .start at (4.31*boxwid, 2.5) +box "telefax" invis same + + + + +.PE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thesis/fig/email-swot.pic Sat Feb 07 22:39:07 2009 +0100 @@ -0,0 +1,32 @@ +.PS + + +boxwid = 2 +boxht = 1 +colheaderh = 0.4 +rowheaderw = 1.3 + + +copy "marker.pic.inc" + +define row { + [ + right + B1: box $1 + B2: box $2 + ] +} + + +down +row("standard" "modular" "extensible", "\(em") +row("large data transfers" "complex networks", "spam") + +marker_bot(last [].B1, "" "opportunities" "of the market") +marker_bot(last [].B2, "" "threats" "of the market") + +marker_left(1st [], "strengths" rjust "of email" rjust) +marker_left(2nd [], "weaknesses" rjust "of email" rjust) + + +.PE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thesis/fig/ipc-protocol.pic Sat Feb 07 22:39:07 2009 +0100 @@ -0,0 +1,41 @@ +.PS +# ipc-protocol + +boxwid = 0.3 +boxht = 0.3 + +linewid = 0.8 + + +B: box "B" +arrow linewid*1.3 "connection" "attempt" + +W1: box "W" +arrow linewid/2 dashed "0" "" +box "" +arrow "header" "transfer" + +W2: box "W" +arrow linewid/2 dashed "0" "" +box "" +arrow "body" "transfer" + +W3: box "W" +arrow linewid/2 dashed "0" "" + +S: box "S" + +down +arrow dashed down from W1.s " 1" +box "E" + +arrow dashed down from W2.s " 1" +box "E" + +arrow dashed down from W3.s " 1" +box "E" + + +"\fI" "B: begin" ljust "W: wait for reply" ljust "E: error" ljust "S: success" ljust "\fR" at B.sw -(0,0.5) + +.PE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thesis/fig/mail-agents.pic Sat Feb 07 22:39:07 2009 +0100 @@ -0,0 +1,30 @@ +.PS +# mail-agents + +lineht = 0.25 +circlerad = 0.3 + +A: box "MTA" +arrow 1.5*linewid +B: box "MTA" +line +box invis ". . ." wid 0.5 +arrow +C: box "MTA" + +arrow down from C.s +D: box "MDA" +arrow right linewid/2 from D.e +E: circle "mailbox" +line <-> down from E.s +F: box "MUA" +down +box invis "\fIrecipient\fR" + + +line <- down 2*lineht+boxht/2+circlerad from A.s +G: box "MUA" +box invis "\fIsender\fR" + + +.PE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thesis/fig/marker.pic.inc Sat Feb 07 22:39:07 2009 +0100 @@ -0,0 +1,22 @@ +markerlen = 0.2 + +define marker_top { + line up markerlen from $1.nw + line up markerlen from $1.ne + "\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end> +} +define marker_bot { + line $3 down markerlen from $1.sw + line $3 down markerlen from $1.se + "\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end> +} +define marker_left { + line left markerlen from $1.nw + line left markerlen from $1.sw + "\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end> +} +define marker_right { + line right markerlen from $1.nw + line right markerlen from $1.sw + "\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end> +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thesis/fig/masqmail-arch-new.pic Sat Feb 07 22:39:07 2009 +0100 @@ -0,0 +1,59 @@ +.PS +# the new architecture + +maxpswid = 6.0 +linewid = 0.2 +movewid = 0.3 + + +I: [ +down +I1: ellipse "smtpd" +move 0.2 +I2: ellipse "sendmail" +move 0.2 +I3: ellipse "..." +] + +move + +QI: ellipse "queue-in" +arrow up right +IQ: box dashed "incoming" "queue" +arrow +SC: ellipse "scanning" +arrow +OQ: box dashed "outgoing" "queue" +arrow down right +QO: ellipse "queue-out" + +move + +O: [ +down +O1: ellipse "smtp" +move 0.2 +O2: ellipse "pipe" +move 0.2 +O3: ellipse "..." +] + +arrow from I.I1.e to QI.w +arrow from I.I2.e to QI.w +arrow from I.I3.e to QI.w + +arrow from QO.e to O.O1.w +arrow from QO.e to O.O2.w +arrow from QO.e to O.O3.w + + +line dotted up from SC.n +box invis "external mail scanners" ht 0.2 + +line dotted down from SC.s +PL: box dashed "message" "pool" +line -> down right from QI.e then to PL.w +line <- down left from QO.w then to PL.e + + +.PE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thesis/fig/masqmail-channels.pic Sat Feb 07 22:39:07 2009 +0100 @@ -0,0 +1,28 @@ +.PS +# in and out channels of masqmail + +linewid = 1.5 + + +A: box "masqmail" wid 1.5*boxwid ht 1.5*boxht + +line <- left from 0.5<A.w,A.nw> "remote (SMTP)" above +line <- left from 0.5<A.w,A.sw> "local (stdin)" above + +line -> right from 0.7<A.e,A.ne> "remote (SMTP)" above +line -> right from A.e "local (pipe)" above +box "command" wid boxwid ht 0.5*boxht +line right from 0.7<A.e,A.se> "local (delivery)" above +line down .1 +move 0.5*moveht +C: box invis "mailboxes" ht 0.3 + +arrow from last line.end to 0.2<C.nw,C.ne> +arrow from last line.end to 0.4<C.nw,C.ne> +arrow from last line.end to 0.6<C.nw,C.ne> +arrow from last line.end to 0.8<C.nw,C.ne> + +line <- up from A.n +box invis ht 0.3 "online state" + +.PE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thesis/fig/masqmail-typical-usage.pic Sat Feb 07 22:39:07 2009 +0100 @@ -0,0 +1,80 @@ +.PS +# masqmail-typical-usage +scale = 1.2 + +[ +moveht = 0.3 +lineht = 0.3 + + +down +line <-> +ISP: ellipse "ISP" +line <- +R: box invis "router" ht .2 +S1: box dashed wid 3.6 ht 1.95 +" \fIInternet\fR" at S1.nw above ljust +" \fILocal network\fR" at S1.nw below ljust +move to S1.n +move 2*moveht+boxht + +[ +right +W1: box "workstation" "(masqmail)" +line <-> 0.3 +W2: box "workstation" "(masqmail)" +line <-> 0.3 +W3: box "workstation" "(masqmail)" +] + +line from last [].W1.n to R.s-(0.05,lineht) then to R.s-(0.05,0) +line from last [].W2.n to R.s-(0,lineht) then to R.s +line from last [].W3.n to R.s+(0.05,-lineht) then to R.s+(0.05,0) + +arrow from R.n-(0.05,0) to ISP.s-(0.05,0) +arrow from R.n+(0.05,0) to ISP.s+(0.05,0) + +] +"Scenario 1" with .nw at last [].nw +(0.4,-0.1) + +move to last [].e + +move 0.5 + + +[ + +moveht = 0.3 +lineht = 0.3 + +down +line <-> +ISP: ellipse "ISP" +line <- +R: box invis "router" ht .2 +S1: box dashed wid 3.6 ht 1.95 +" \fIInternet\fR" at S1.nw above ljust +" \fILocal network\fR" at S1.nw below ljust +move to S1.n +line +S: box "server" "(masqmail)" +move + +[ +right +W1: box "workstation" "(forwarder)" +move 0.3 +W2: box "workstation" "(forwarder)" +move 0.3 +W3: box "workstation" "(forwarder)" +] + +arrow from last [].W1.n to S.s-(0.05,0) +arrow from last [].W2.n to S.s +arrow from last [].W3.n to S.s+(0.05,0) + +] +"Scenario 2" with .nw at last [].nw +(0.4,-0.1) + + +.PE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thesis/fig/mta-channels.pic Sat Feb 07 22:39:07 2009 +0100 @@ -0,0 +1,24 @@ +.PS +# in and out channels of an mta + +linewid = 1.5 + + +A: box "MTA" wid 1.5*boxwid ht 1.5*boxht + +line <- left from 0.3<A.w,A.nw> "remote (SMTP)" above +line <- left from 0.3<A.w,A.sw> "local (stdin)" below + +line -> right from 0.3<A.e,A.ne> "remote (SMTP)" above +line right linewid*2/3 from 0.3<A.e,A.se> "local (pipe)" below +line -> down 1/6*linewid +B: box "MDA" wid 0.75*boxwid ht 0.75*boxht + +move 0.5*moveht + +C: box invis "mailboxes" ht 0.3 + +arrow from 0.35<B.sw,B.se> to 0.2<C.nw,C.ne> +arrow from 0.45<B.sw,B.se> to 0.4<C.nw,C.ne> +arrow from 0.55<B.sw,B.se> to 0.6<C.nw,C.ne> +arrow from 0.65<B.sw,B.se> to 0.8<C.nw,C.ne>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thesis/fig/proxy-setup.pic Sat Feb 07 22:39:07 2009 +0100 @@ -0,0 +1,47 @@ +.PS +# proxy-setup + +linewid = 0.5 +lineht = 0.3 + +externlen = 0.8 + +L: box wid 4.2 ht 1.3 +box invis + + +P25: box wid 0.3 ht 0.3 with .e at 0.40<L.nw,L.sw> "25" +left +line <- externlen from P25.w "SMTP" "from remote " + +right +line -> right from P25.e "SMTP" "" +box "proxy" +arrow "SMTP" "" + +Pi: box wid 0.3 ht 0.3 "X" +arrow "SMTP" "" + +M2: box "masqmail" +arrow linewid*1.8 from 0.20<M2.ne,M2.se> "SMTP" "" +box wid 0.3 ht 0.3 "" +line -> externlen "SMTP" "to remote" +arrow linewid*2/3 from 0.50<M2.ne,M2.se> +box "pipe" ht 0.16 wid 0.4 +arrow right from 0.80<M2.ne,M2.se> then down 0.2 +"" "mailbox" + +line <- down left from 0.75<M2.nw,M2.sw> "" "" " stdin" +box invis ht 0.3 "" "sendmail" "command" + + +#box dashed "remote" "host" + +#spline -> from P465.e right 0.4 then to 0.5<P465.s, P25.n> then to P25.w-(0.4,0) then to P25.w "stunnel" + +#right +#line -> 0.5 right from P25.e "SMTP" "(unencrypted)" +#box "MTA" + + +.PE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thesis/fig/stunnel.pic Sat Feb 07 22:39:07 2009 +0100 @@ -0,0 +1,22 @@ +.PS +# stunnel + +L: box wid 2 ht 2 +box invis "local host" below with .n at L.n + + +P465: box wid 0.3 ht 0.3 with .e at 0.25<L.nw,L.sw> "465" +P25: box wid 0.3 ht 0.3 with .e at 0.75<L.nw,L.sw> "25" + +left +line <- 1.0 left from P465.w "SMTP over TLS" "(encrypted)" +box dashed "remote" "host" + +spline -> from P465.e right 0.4 then to 0.5<P465.s, P25.n> then to P25.w-(0.4,0) then to P25.w "" "stunnel " + +right +line -> 0.5 right from P25.e "SMTP" "(unencrypted)" +box "MTA" + + +.PE
--- a/thesis/img/Makefile Sat Feb 07 19:00:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -# generate clipped EPS pictures of PIC files -# -# requires: pic, troff (with font Palatino), grops, ps2eps - -#IMG=`ls *.pic | sed 's/\.pic$$/.eps/'` -IMG=\ -comm-classification.eps \ -masqmail-arch-new.eps \ -comm-lifecycle.eps \ -email-swot.eps \ -mta-channels.eps \ -stunnel.eps \ -mail-agents.eps \ -masqmail-typical-usage.eps \ -masqmail-channels.eps \ -proxy-setup.eps \ -ipc-protocol.eps \ - - -.PHONY: all -all: info $(IMG) - -info: - @echo "pictures to generate: $(IMG)" - - - -.SUFFIXES: .pic .eps -.pic.eps: *.pic - @echo ">>>> processing: $*" - pic $*.pic | troff -fP | grops | ps2eps -f > $*.eps - - -.PHONY: clean -clean: - rm -f `ls *.pic | sed 's/\.pic$$/.eps/'`
--- a/thesis/img/comm-classification.pic Sat Feb 07 19:00:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -.PS - - -boxwid = 2 -boxht = 1 -colheaderh = 0.4 -rowheaderw = 1.3 - - -copy "marker.pic.inc" - -define row { - [ - right - B1: box $1 - B2: box $2 - ] -} - - -down -row("email" "SMS", "voice mail" "video messages") -row("Instant Messaging" "chat", "VoIP" "video conferencing") - -marker_top(1st [].B1, "written") -marker_top(1st [].B2, "recorded") - -marker_left(1st [], "asyncronous" rjust "(messages)" rjust) -marker_left(2nd [], "syncronous" rjust "(dialog)" rjust) - - -.PE
--- a/thesis/img/comm-lifecycle.pic Sat Feb 07 19:00:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ -.PS - - -boxwid = 1.25 -boxht = 3 -colheaderh = 0.4 -rowheaderw = 1.0 -ad = 0.1 # arrow distance - -copy "marker.pic.inc" - - - -define segment { - [ - down - A: box "" invis - line dotted from A.ne to A.se - marker_bot(last box, $1) - ] -} - - -move up boxht/2-markerlen/2 -right - -segment("introduction") -segment("growth") -segment("mature") -segment("saturation") -segment("decline") - - -arrow from 1st [].A.sw to last [].A.se -"\fI" "time" above rjust "\fR" at last arrow.end + (-0.2,0.00) -arrow from 1st [].A.sw to 1st [].A.nw -"\fI" "market share," ljust "importance," ljust "etc." ljust "\fR" at last arrow.end + (0.05,-0.45) - - -spline from 1st [].A.sw right boxwid*0.7 up 0.1 \ - then right boxwid*0.8 up 1.0 \ - then right boxwid up 1.2 \ - then right boxwid up 0.5 \ - then right boxwid down 0.3 \ - then right boxwid/2 down 0.1 - - -move to (0,0) - -line left ad up ad*3 with .start at (0.38*boxwid, 0.1) -box "video" "messages" invis wid 0.6 ht 0.4 - -line left ad up ad*3 with .start at (0.77*boxwid, 0.3) -box "voice" "mail" invis same - -line left ad up ad*3 with .start at (1.61*boxwid, 1.3) -box "Voice" "over IP" invis same - -line right ad down ad*3 with .start at (2.31*boxwid, 2.0) -box "instant" "messaging" invis same - -line right ad down ad*3 with .start at (3.23*boxwid, 2.6) -box "email" invis wid 0.6 ht 0.2 - -line right ad down ad*3 with .start at (4.31*boxwid, 2.5) -box "telefax" invis same - - - - -.PE
--- a/thesis/img/email-swot.pic Sat Feb 07 19:00:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -.PS - - -boxwid = 2 -boxht = 1 -colheaderh = 0.4 -rowheaderw = 1.3 - - -copy "marker.pic.inc" - -define row { - [ - right - B1: box $1 - B2: box $2 - ] -} - - -down -row("standard" "modular" "extensible", "\(em") -row("large data transfers" "complex networks", "spam") - -marker_bot(last [].B1, "" "opportunities" "of the market") -marker_bot(last [].B2, "" "threats" "of the market") - -marker_left(1st [], "strengths" rjust "of email" rjust) -marker_left(2nd [], "weaknesses" rjust "of email" rjust) - - -.PE
--- a/thesis/img/ipc-protocol.pic Sat Feb 07 19:00:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -.PS -# ipc-protocol - -boxwid = 0.3 -boxht = 0.3 - -linewid = 0.8 - - -B: box "B" -arrow linewid*1.3 "connection" "attempt" - -W1: box "W" -arrow linewid/2 dashed "0" "" -box "" -arrow "header" "transfer" - -W2: box "W" -arrow linewid/2 dashed "0" "" -box "" -arrow "body" "transfer" - -W3: box "W" -arrow linewid/2 dashed "0" "" - -S: box "S" - -down -arrow dashed down from W1.s " 1" -box "E" - -arrow dashed down from W2.s " 1" -box "E" - -arrow dashed down from W3.s " 1" -box "E" - - -"\fI" "B: begin" ljust "W: wait for reply" ljust "E: error" ljust "S: success" ljust "\fR" at B.sw -(0,0.5) - -.PE
--- a/thesis/img/mail-agents.pic Sat Feb 07 19:00:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -.PS -# mail-agents - -lineht = 0.25 -circlerad = 0.3 - -A: box "MTA" -arrow 1.5*linewid -B: box "MTA" -line -box invis ". . ." wid 0.5 -arrow -C: box "MTA" - -arrow down from C.s -D: box "MDA" -arrow right linewid/2 from D.e -E: circle "mailbox" -line <-> down from E.s -F: box "MUA" -down -box invis "\fIrecipient\fR" - - -line <- down 2*lineht+boxht/2+circlerad from A.s -G: box "MUA" -box invis "\fIsender\fR" - - -.PE
--- a/thesis/img/marker.pic.inc Sat Feb 07 19:00:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -markerlen = 0.2 - -define marker_top { - line up markerlen from $1.nw - line up markerlen from $1.ne - "\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end> -} -define marker_bot { - line $3 down markerlen from $1.sw - line $3 down markerlen from $1.se - "\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end> -} -define marker_left { - line left markerlen from $1.nw - line left markerlen from $1.sw - "\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end> -} -define marker_right { - line right markerlen from $1.nw - line right markerlen from $1.sw - "\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end> -}
--- a/thesis/img/masqmail-arch-new.pic Sat Feb 07 19:00:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -.PS -# the new architecture - -maxpswid = 6.0 -linewid = 0.2 -movewid = 0.3 - - -I: [ -down -I1: ellipse "smtpd" -move 0.2 -I2: ellipse "sendmail" -move 0.2 -I3: ellipse "..." -] - -move - -QI: ellipse "queue-in" -arrow up right -IQ: box dashed "incoming" "queue" -arrow -SC: ellipse "scanning" -arrow -OQ: box dashed "outgoing" "queue" -arrow down right -QO: ellipse "queue-out" - -move - -O: [ -down -O1: ellipse "smtp" -move 0.2 -O2: ellipse "pipe" -move 0.2 -O3: ellipse "..." -] - -arrow from I.I1.e to QI.w -arrow from I.I2.e to QI.w -arrow from I.I3.e to QI.w - -arrow from QO.e to O.O1.w -arrow from QO.e to O.O2.w -arrow from QO.e to O.O3.w - - -line dotted up from SC.n -box invis "external mail scanners" ht 0.2 - -line dotted down from SC.s -PL: box dashed "message" "pool" -line -> down right from QI.e then to PL.w -line <- down left from QO.w then to PL.e - - -.PE
--- a/thesis/img/masqmail-channels.pic Sat Feb 07 19:00:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -.PS -# in and out channels of masqmail - -linewid = 1.5 - - -A: box "masqmail" wid 1.5*boxwid ht 1.5*boxht - -line <- left from 0.5<A.w,A.nw> "remote (SMTP)" above -line <- left from 0.5<A.w,A.sw> "local (stdin)" above - -line -> right from 0.7<A.e,A.ne> "remote (SMTP)" above -line -> right from A.e "local (pipe)" above -box "command" wid boxwid ht 0.5*boxht -line right from 0.7<A.e,A.se> "local (delivery)" above -line down .1 -move 0.5*moveht -C: box invis "mailboxes" ht 0.3 - -arrow from last line.end to 0.2<C.nw,C.ne> -arrow from last line.end to 0.4<C.nw,C.ne> -arrow from last line.end to 0.6<C.nw,C.ne> -arrow from last line.end to 0.8<C.nw,C.ne> - -line <- up from A.n -box invis ht 0.3 "online state" - -.PE
--- a/thesis/img/masqmail-typical-usage.pic Sat Feb 07 19:00:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -.PS -# masqmail-typical-usage -scale = 1.2 - -[ -moveht = 0.3 -lineht = 0.3 - - -down -line <-> -ISP: ellipse "ISP" -line <- -R: box invis "router" ht .2 -S1: box dashed wid 3.6 ht 1.95 -" \fIInternet\fR" at S1.nw above ljust -" \fILocal network\fR" at S1.nw below ljust -move to S1.n -move 2*moveht+boxht - -[ -right -W1: box "workstation" "(masqmail)" -line <-> 0.3 -W2: box "workstation" "(masqmail)" -line <-> 0.3 -W3: box "workstation" "(masqmail)" -] - -line from last [].W1.n to R.s-(0.05,lineht) then to R.s-(0.05,0) -line from last [].W2.n to R.s-(0,lineht) then to R.s -line from last [].W3.n to R.s+(0.05,-lineht) then to R.s+(0.05,0) - -arrow from R.n-(0.05,0) to ISP.s-(0.05,0) -arrow from R.n+(0.05,0) to ISP.s+(0.05,0) - -] -"Scenario 1" with .nw at last [].nw +(0.4,-0.1) - -move to last [].e - -move 0.5 - - -[ - -moveht = 0.3 -lineht = 0.3 - -down -line <-> -ISP: ellipse "ISP" -line <- -R: box invis "router" ht .2 -S1: box dashed wid 3.6 ht 1.95 -" \fIInternet\fR" at S1.nw above ljust -" \fILocal network\fR" at S1.nw below ljust -move to S1.n -line -S: box "server" "(masqmail)" -move - -[ -right -W1: box "workstation" "(forwarder)" -move 0.3 -W2: box "workstation" "(forwarder)" -move 0.3 -W3: box "workstation" "(forwarder)" -] - -arrow from last [].W1.n to S.s-(0.05,0) -arrow from last [].W2.n to S.s -arrow from last [].W3.n to S.s+(0.05,0) - -] -"Scenario 2" with .nw at last [].nw +(0.4,-0.1) - - -.PE
--- a/thesis/img/mta-channels.pic Sat Feb 07 19:00:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -.PS -# in and out channels of an mta - -linewid = 1.5 - - -A: box "MTA" wid 1.5*boxwid ht 1.5*boxht - -line <- left from 0.3<A.w,A.nw> "remote (SMTP)" above -line <- left from 0.3<A.w,A.sw> "local (stdin)" below - -line -> right from 0.3<A.e,A.ne> "remote (SMTP)" above -line right linewid*2/3 from 0.3<A.e,A.se> "local (pipe)" below -line -> down 1/6*linewid -B: box "MDA" wid 0.75*boxwid ht 0.75*boxht - -move 0.5*moveht - -C: box invis "mailboxes" ht 0.3 - -arrow from 0.35<B.sw,B.se> to 0.2<C.nw,C.ne> -arrow from 0.45<B.sw,B.se> to 0.4<C.nw,C.ne> -arrow from 0.55<B.sw,B.se> to 0.6<C.nw,C.ne> -arrow from 0.65<B.sw,B.se> to 0.8<C.nw,C.ne>
--- a/thesis/img/proxy-setup.pic Sat Feb 07 19:00:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -.PS -# proxy-setup - -linewid = 0.5 -lineht = 0.3 - -externlen = 0.8 - -L: box wid 4.2 ht 1.3 -box invis - - -P25: box wid 0.3 ht 0.3 with .e at 0.40<L.nw,L.sw> "25" -left -line <- externlen from P25.w "SMTP" "from remote " - -right -line -> right from P25.e "SMTP" "" -box "proxy" -arrow "SMTP" "" - -Pi: box wid 0.3 ht 0.3 "X" -arrow "SMTP" "" - -M2: box "masqmail" -arrow linewid*1.8 from 0.20<M2.ne,M2.se> "SMTP" "" -box wid 0.3 ht 0.3 "" -line -> externlen "SMTP" "to remote" -arrow linewid*2/3 from 0.50<M2.ne,M2.se> -box "pipe" ht 0.16 wid 0.4 -arrow right from 0.80<M2.ne,M2.se> then down 0.2 -"" "mailbox" - -line <- down left from 0.75<M2.nw,M2.sw> "" "" " stdin" -box invis ht 0.3 "" "sendmail" "command" - - -#box dashed "remote" "host" - -#spline -> from P465.e right 0.4 then to 0.5<P465.s, P25.n> then to P25.w-(0.4,0) then to P25.w "stunnel" - -#right -#line -> 0.5 right from P25.e "SMTP" "(unencrypted)" -#box "MTA" - - -.PE
--- a/thesis/img/stunnel.pic Sat Feb 07 19:00:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -.PS -# stunnel - -L: box wid 2 ht 2 -box invis "local host" below with .n at L.n - - -P465: box wid 0.3 ht 0.3 with .e at 0.25<L.nw,L.sw> "465" -P25: box wid 0.3 ht 0.3 with .e at 0.75<L.nw,L.sw> "25" - -left -line <- 1.0 left from P465.w "SMTP over TLS" "(encrypted)" -box dashed "remote" "host" - -spline -> from P465.e right 0.4 then to 0.5<P465.s, P25.n> then to P25.w-(0.4,0) then to P25.w "" "stunnel " - -right -line -> 0.5 right from P25.e "SMTP" "(unencrypted)" -box "MTA" - - -.PE
--- a/thesis/tex/1-Introduction.tex Sat Feb 07 19:00:25 2009 +0100 +++ b/thesis/tex/1-Introduction.tex Sat Feb 07 22:39:07 2009 +0100 @@ -35,7 +35,7 @@ \begin{figure} \begin{center} - \includegraphics[scale=0.75]{img/mail-agents.eps} + \includegraphics[scale=0.75]{fig/mail-agents.eps} \end{center} \caption{Mail agents and the way a mail message takes} \label{fig:mail-agents} @@ -135,7 +135,7 @@ \begin{figure} \begin{center} - \includegraphics[scale=0.75]{img/masqmail-typical-usage.eps} + \includegraphics[scale=0.75]{fig/masqmail-typical-usage.eps} \end{center} \caption{Typical usage scenarios for \masqmail} \label{fig:masqmail-typical-usage} @@ -262,7 +262,7 @@ \begin{figure} \begin{center} - \includegraphics[scale=0.75]{img/masqmail-channels.eps} + \includegraphics[scale=0.75]{fig/masqmail-channels.eps} \end{center} \caption{Incoming and outgoing channels of \masqmail} \label{fig:masqmail-channels}
--- a/thesis/tex/2-MarketAnalysis.tex Sat Feb 07 19:00:25 2009 +0100 +++ b/thesis/tex/2-MarketAnalysis.tex Sat Feb 07 22:39:07 2009 +0100 @@ -30,7 +30,7 @@ \begin{figure} \begin{center} - \includegraphics[scale=0.75]{img/comm-classification.eps} + \includegraphics[scale=0.75]{fig/comm-classification.eps} \end{center} \caption{Classification of electronic communication technologies} \label{fig:comm-classification} @@ -54,7 +54,7 @@ \begin{figure} \begin{center} - \includegraphics[scale=0.75]{img/comm-lifecycle.eps} + \includegraphics[scale=0.75]{fig/comm-lifecycle.eps} \end{center} \caption{Life cycle of electronic communication technologies} \label{fig:comm-lifecycle} @@ -189,7 +189,7 @@ \begin{figure} \begin{center} - \includegraphics[scale=0.75]{img/email-swot.eps} + \includegraphics[scale=0.75]{fig/email-swot.eps} \end{center} \caption{\NAME{SWOT} analysis for email} \label{fig:email-swot}
--- a/thesis/tex/4-MasqmailsFuture.tex Sat Feb 07 19:00:25 2009 +0100 +++ b/thesis/tex/4-MasqmailsFuture.tex Sat Feb 07 22:39:07 2009 +0100 @@ -63,7 +63,7 @@ \begin{figure} \begin{center} - \includegraphics[scale=0.75]{img/mta-channels.eps} + \includegraphics[scale=0.75]{fig/mta-channels.eps} \end{center} \caption{Required incoming and outgoing channels} \index{figure!Required incoming and outgoing channels} @@ -167,7 +167,7 @@ \begin{figure} \begin{center} - \includegraphics[scale=0.75]{img/stunnel.eps} + \includegraphics[scale=0.75]{fig/stunnel.eps} \end{center} \caption{Using \name{stunnel} for incoming connections} \index{figure!Using \name{stunnel} for incoming connections} @@ -322,9 +322,9 @@ \begin{figure} \begin{center} \vspace*{2ex} - %\includegraphics[scale=0.75]{img/callgraph.eps} - %\includegraphics[scale=0.75]{img/masqmail-3-omitlog5.eps} - \includegraphics[scale=0.75]{img/bb.eps} + \includegraphics[scale=0.75]{fig/callgraph.eps} + %\includegraphics[scale=0.75]{fig/masqmail-3-omitlog5.eps} + %\includegraphics[scale=0.75]{fig/bb.eps} \end{center} \caption{Internal structure of \masqmail, showed by a call graph. (Logging functions are ignored; test and \NAME{POP3} code is excluded.)} \index{figure!Internal structure of \masqmail.}
--- a/thesis/tex/5-Improvements.tex Sat Feb 07 19:00:25 2009 +0100 +++ b/thesis/tex/5-Improvements.tex Sat Feb 07 22:39:07 2009 +0100 @@ -148,7 +148,7 @@ \begin{figure} \begin{center} - \includegraphics[scale=0.75]{img/proxy-setup.eps} + \includegraphics[scale=0.75]{fig/proxy-setup.eps} \end{center} \caption{A setup with a proxy} \index{figure!A setup with a proxy} @@ -403,7 +403,7 @@ \begin{figure} \begin{center} - \includegraphics[width=\textwidth]{img/masqmail-arch-new.eps} + \includegraphics[width=\textwidth]{fig/masqmail-arch-new.eps} \end{center} \caption{The new designed architecture for \masqmail} \index{figure!The new designed architecture for \masqmail} @@ -487,7 +487,7 @@ \begin{figure} \begin{center} - \includegraphics[scale=0.75]{img/ipc-protocol.eps} + \includegraphics[scale=0.75]{fig/ipc-protocol.eps} \end{center} \caption{State diagram of the \NAME{IPC} protocol. (Solid lines indicate client actions, dashed lines indicate server responses.)} \index{figure!State diagram of the \NAME{IPC} protocol.}