1.1 --- a/.hgignore	Sat Feb 07 19:00:25 2009 +0100
     1.2 +++ b/.hgignore	Sat Feb 07 22:39:07 2009 +0100
     1.3 @@ -7,4 +7,4 @@
     1.4  thesis/.*\.(aux|bak|bbl|blg|dvi|idx|ilg|ind|lof|log|lot|pdf|toc|ps)$
     1.5  
     1.6  syntax: glob
     1.7 -thesis/img/*.eps
     1.8 +thesis/fig/*.eps

     2.1 --- a/thesis/Makefile	Sat Feb 07 19:00:25 2009 +0100
     2.2 +++ b/thesis/Makefile	Sat Feb 07 22:39:07 2009 +0100
     2.3 @@ -19,13 +19,13 @@
     2.4  clean:
     2.5  	latexmk -c
     2.6  	rm web.*
     2.7 -	cd img ; $(MAKE) clean ; cd -
     2.8 +	cd fig ; $(MAKE) clean ; cd -
     2.9  
    2.10  .PHONY: cover
    2.11  cover:
    2.12  	latexmk -ps -pdfps $(COVER)
    2.13  
    2.14  .PHONY: img
    2.15 -img: img/*.pic
    2.16 -	cd img ; $(MAKE) ; cd -
    2.17 +img: fig/*.pic
    2.18 +	cd fig ; $(MAKE) ; cd -
    2.19  

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/thesis/fig/Makefile	Sat Feb 07 22:39:07 2009 +0100
     3.3 @@ -0,0 +1,36 @@
     3.4 +# generate clipped EPS pictures of PIC files
     3.5 +#
     3.6 +# requires: pic, troff (with font Palatino), grops, ps2eps
     3.7 +
     3.8 +#IMG=`ls *.pic | sed 's/\.pic$$/.eps/'`
     3.9 +IMG=\
    3.10 +comm-classification.eps \
    3.11 +masqmail-arch-new.eps \
    3.12 +comm-lifecycle.eps \
    3.13 +email-swot.eps \
    3.14 +mta-channels.eps \
    3.15 +stunnel.eps \
    3.16 +mail-agents.eps \
    3.17 +masqmail-typical-usage.eps \
    3.18 +masqmail-channels.eps \
    3.19 +proxy-setup.eps \
    3.20 +ipc-protocol.eps \
    3.21 +
    3.22 +
    3.23 +.PHONY: all
    3.24 +all: info $(IMG)
    3.25 +
    3.26 +info:
    3.27 +	@echo "pictures to generate: $(IMG)"
    3.28 +
    3.29 +
    3.30 +
    3.31 +.SUFFIXES: .pic .eps
    3.32 +.pic.eps: *.pic
    3.33 +	@echo ">>>> processing: $*"
    3.34 +	pic $*.pic | troff -fP | grops | ps2eps -f > $*.eps
    3.35 +
    3.36 +
    3.37 +.PHONY: clean
    3.38 +clean:
    3.39 +	rm -f `ls *.pic | sed 's/\.pic$$/.eps/'`

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/thesis/fig/comm-classification.pic	Sat Feb 07 22:39:07 2009 +0100
     4.3 @@ -0,0 +1,32 @@
     4.4 +.PS
     4.5 +
     4.6 +
     4.7 +boxwid = 2
     4.8 +boxht = 1
     4.9 +colheaderh = 0.4
    4.10 +rowheaderw = 1.3
    4.11 +
    4.12 +
    4.13 +copy "marker.pic.inc"
    4.14 +
    4.15 +define row {
    4.16 +	[
    4.17 +		right
    4.18 +		B1: box $1
    4.19 +		B2: box $2
    4.20 +	]
    4.21 +}
    4.22 +
    4.23 +
    4.24 +down
    4.25 +row("email" "SMS",  "voice mail" "video messages")
    4.26 +row("Instant Messaging" "chat",  "VoIP" "video conferencing")
    4.27 +
    4.28 +marker_top(1st [].B1, "written")
    4.29 +marker_top(1st [].B2, "recorded")
    4.30 +
    4.31 +marker_left(1st [], "asyncronous" rjust "(messages)" rjust)
    4.32 +marker_left(2nd [], "syncronous" rjust "(dialog)" rjust)
    4.33 +
    4.34 +
    4.35 +.PE

     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/thesis/fig/comm-lifecycle.pic	Sat Feb 07 22:39:07 2009 +0100
     5.3 @@ -0,0 +1,71 @@
     5.4 +.PS
     5.5 +
     5.6 +
     5.7 +boxwid = 1.25
     5.8 +boxht = 3
     5.9 +colheaderh = 0.4
    5.10 +rowheaderw = 1.0
    5.11 +ad = 0.1 # arrow distance
    5.12 +
    5.13 +copy "marker.pic.inc"
    5.14 +
    5.15 +
    5.16 +
    5.17 +define segment {
    5.18 +	[
    5.19 +		down
    5.20 +		A: box "" invis
    5.21 +		line dotted from A.ne to A.se
    5.22 +		marker_bot(last box, $1)
    5.23 +	]
    5.24 +}
    5.25 +
    5.26 +
    5.27 +move up boxht/2-markerlen/2
    5.28 +right
    5.29 +
    5.30 +segment("introduction")
    5.31 +segment("growth")
    5.32 +segment("mature")
    5.33 +segment("saturation")
    5.34 +segment("decline")
    5.35 +
    5.36 +
    5.37 +arrow from 1st [].A.sw to last [].A.se
    5.38 +"\fI" "time" above rjust "\fR" at last arrow.end + (-0.2,0.00)
    5.39 +arrow from 1st [].A.sw to 1st [].A.nw
    5.40 +"\fI" "market share," ljust  "importance," ljust  "etc." ljust "\fR" at last arrow.end + (0.05,-0.45)
    5.41 +
    5.42 +
    5.43 +spline from 1st [].A.sw right boxwid*0.7 up 0.1 \
    5.44 +	then right boxwid*0.8 up 1.0 \
    5.45 +	then right boxwid up 1.2 \
    5.46 +	then right boxwid up 0.5 \
    5.47 +	then right boxwid down 0.3 \
    5.48 +	then right boxwid/2 down 0.1
    5.49 +
    5.50 +
    5.51 +move to (0,0)
    5.52 +
    5.53 +line left ad up ad*3 with .start at (0.38*boxwid, 0.1)
    5.54 +box "video" "messages" invis wid 0.6 ht 0.4
    5.55 +
    5.56 +line left ad up ad*3 with .start at (0.77*boxwid, 0.3)
    5.57 +box "voice" "mail" invis same
    5.58 +
    5.59 +line left ad up ad*3 with .start at (1.61*boxwid, 1.3)
    5.60 +box "Voice" "over IP" invis same
    5.61 +
    5.62 +line right ad down ad*3 with .start at (2.31*boxwid, 2.0)
    5.63 +box "instant" "messaging" invis same
    5.64 +
    5.65 +line right ad down ad*3 with .start at (3.23*boxwid, 2.6)
    5.66 +box "email" invis wid 0.6 ht 0.2
    5.67 +
    5.68 +line right ad down ad*3 with .start at (4.31*boxwid, 2.5)
    5.69 +box "telefax" invis same
    5.70 +
    5.71 +
    5.72 +
    5.73 +
    5.74 +.PE

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/thesis/fig/email-swot.pic	Sat Feb 07 22:39:07 2009 +0100
     6.3 @@ -0,0 +1,32 @@
     6.4 +.PS
     6.5 +
     6.6 +
     6.7 +boxwid = 2
     6.8 +boxht = 1
     6.9 +colheaderh = 0.4
    6.10 +rowheaderw = 1.3
    6.11 +
    6.12 +
    6.13 +copy "marker.pic.inc"
    6.14 +
    6.15 +define row {
    6.16 +	[
    6.17 +		right
    6.18 +		B1: box $1
    6.19 +		B2: box $2
    6.20 +	]
    6.21 +}
    6.22 +
    6.23 +
    6.24 +down
    6.25 +row("standard" "modular" "extensible",  "\(em")
    6.26 +row("large data transfers" "complex networks",  "spam")
    6.27 +
    6.28 +marker_bot(last [].B1, "" "opportunities" "of the market")
    6.29 +marker_bot(last [].B2, "" "threats" "of the market")
    6.30 +
    6.31 +marker_left(1st [], "strengths" rjust "of email" rjust)
    6.32 +marker_left(2nd [], "weaknesses" rjust "of email" rjust)
    6.33 +
    6.34 +
    6.35 +.PE

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/thesis/fig/ipc-protocol.pic	Sat Feb 07 22:39:07 2009 +0100
     7.3 @@ -0,0 +1,41 @@
     7.4 +.PS
     7.5 +# ipc-protocol
     7.6 +
     7.7 +boxwid = 0.3
     7.8 +boxht = 0.3
     7.9 +
    7.10 +linewid = 0.8
    7.11 +
    7.12 +
    7.13 +B: box "B"
    7.14 +arrow linewid*1.3 "connection" "attempt"
    7.15 +
    7.16 +W1: box "W"
    7.17 +arrow linewid/2 dashed "0" ""
    7.18 +box ""
    7.19 +arrow "header" "transfer"
    7.20 +
    7.21 +W2: box "W"
    7.22 +arrow linewid/2 dashed "0" ""
    7.23 +box ""
    7.24 +arrow "body" "transfer"
    7.25 +
    7.26 +W3: box "W"
    7.27 +arrow linewid/2 dashed "0" ""
    7.28 +
    7.29 +S: box "S"
    7.30 +
    7.31 +down
    7.32 +arrow dashed down from W1.s "     1"
    7.33 +box "E"
    7.34 +
    7.35 +arrow dashed down from W2.s "     1"
    7.36 +box "E"
    7.37 +
    7.38 +arrow dashed down from W3.s "     1"
    7.39 +box "E"
    7.40 +
    7.41 +
    7.42 +"\fI" "B:  begin" ljust "W: wait for reply" ljust "E:  error" ljust "S:  success" ljust "\fR" at B.sw -(0,0.5)
    7.43 +
    7.44 +.PE

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/thesis/fig/mail-agents.pic	Sat Feb 07 22:39:07 2009 +0100
     8.3 @@ -0,0 +1,30 @@
     8.4 +.PS
     8.5 +# mail-agents
     8.6 +
     8.7 +lineht = 0.25
     8.8 +circlerad = 0.3
     8.9 +
    8.10 +A: box "MTA"
    8.11 +arrow 1.5*linewid
    8.12 +B: box "MTA"
    8.13 +line
    8.14 +box invis ". . ." wid 0.5
    8.15 +arrow
    8.16 +C: box "MTA"
    8.17 +
    8.18 +arrow down from C.s
    8.19 +D: box "MDA"
    8.20 +arrow right linewid/2 from D.e
    8.21 +E: circle "mailbox"
    8.22 +line <-> down from E.s
    8.23 +F: box "MUA"
    8.24 +down
    8.25 +box invis "\fIrecipient\fR"
    8.26 +
    8.27 +
    8.28 +line <- down 2*lineht+boxht/2+circlerad from A.s
    8.29 +G: box "MUA"
    8.30 +box invis "\fIsender\fR"
    8.31 +
    8.32 +
    8.33 +.PE

     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/thesis/fig/marker.pic.inc	Sat Feb 07 22:39:07 2009 +0100
     9.3 @@ -0,0 +1,22 @@
     9.4 +markerlen = 0.2
     9.5 +
     9.6 +define marker_top {
     9.7 +	line up markerlen from $1.nw
     9.8 +	line up markerlen from $1.ne
     9.9 +	"\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end>
    9.10 +}
    9.11 +define marker_bot {
    9.12 +	line $3 down markerlen from $1.sw
    9.13 +	line $3 down markerlen from $1.se
    9.14 +	"\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end>
    9.15 +}
    9.16 +define marker_left {
    9.17 +	line left markerlen from $1.nw
    9.18 +	line left markerlen from $1.sw
    9.19 +	"\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end>
    9.20 +}
    9.21 +define marker_right {
    9.22 +	line right markerlen from $1.nw
    9.23 +	line right markerlen from $1.sw
    9.24 +	"\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end>
    9.25 +}

    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/thesis/fig/masqmail-arch-new.pic	Sat Feb 07 22:39:07 2009 +0100
    10.3 @@ -0,0 +1,59 @@
    10.4 +.PS
    10.5 +# the new architecture
    10.6 +
    10.7 +maxpswid = 6.0
    10.8 +linewid = 0.2
    10.9 +movewid = 0.3
   10.10 +
   10.11 +
   10.12 +I: [
   10.13 +down
   10.14 +I1: ellipse "smtpd"
   10.15 +move 0.2
   10.16 +I2: ellipse "sendmail"
   10.17 +move 0.2
   10.18 +I3: ellipse "..."
   10.19 +]
   10.20 +
   10.21 +move
   10.22 +
   10.23 +QI: ellipse "queue-in"
   10.24 +arrow up right
   10.25 +IQ: box dashed "incoming" "queue"
   10.26 +arrow
   10.27 +SC: ellipse "scanning"
   10.28 +arrow
   10.29 +OQ: box dashed "outgoing" "queue"
   10.30 +arrow down right
   10.31 +QO: ellipse "queue-out"
   10.32 +
   10.33 +move
   10.34 +
   10.35 +O: [
   10.36 +down
   10.37 +O1: ellipse "smtp"
   10.38 +move 0.2
   10.39 +O2: ellipse "pipe"
   10.40 +move 0.2
   10.41 +O3: ellipse "..."
   10.42 +]
   10.43 +
   10.44 +arrow from I.I1.e to QI.w
   10.45 +arrow from I.I2.e to QI.w
   10.46 +arrow from I.I3.e to QI.w
   10.47 +
   10.48 +arrow from QO.e to O.O1.w
   10.49 +arrow from QO.e to O.O2.w
   10.50 +arrow from QO.e to O.O3.w
   10.51 +
   10.52 +
   10.53 +line dotted up from SC.n
   10.54 +box invis "external mail scanners" ht 0.2
   10.55 +
   10.56 +line dotted down from SC.s
   10.57 +PL: box dashed "message" "pool"
   10.58 +line -> down right from QI.e then to PL.w
   10.59 +line <- down left from QO.w then to PL.e
   10.60 +
   10.61 +
   10.62 +.PE

    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/thesis/fig/masqmail-channels.pic	Sat Feb 07 22:39:07 2009 +0100
    11.3 @@ -0,0 +1,28 @@
    11.4 +.PS
    11.5 +# in and out channels of masqmail
    11.6 +
    11.7 +linewid = 1.5
    11.8 +
    11.9 +
   11.10 +A: box "masqmail" wid 1.5*boxwid ht 1.5*boxht
   11.11 +
   11.12 +line <- left from 0.5<A.w,A.nw> "remote (SMTP)" above
   11.13 +line <- left from 0.5<A.w,A.sw> "local (stdin)" above
   11.14 +
   11.15 +line -> right from 0.7<A.e,A.ne> "remote (SMTP)" above
   11.16 +line -> right from A.e "local (pipe)" above
   11.17 +box "command" wid boxwid ht 0.5*boxht
   11.18 +line  right from 0.7<A.e,A.se> "local (delivery)" above
   11.19 +line down .1
   11.20 +move 0.5*moveht
   11.21 +C: box invis "mailboxes" ht 0.3
   11.22 +
   11.23 +arrow from last line.end to 0.2<C.nw,C.ne>
   11.24 +arrow from last line.end to 0.4<C.nw,C.ne>
   11.25 +arrow from last line.end to 0.6<C.nw,C.ne>
   11.26 +arrow from last line.end to 0.8<C.nw,C.ne>
   11.27 +
   11.28 +line <- up from A.n
   11.29 +box invis ht 0.3 "online state"
   11.30 +
   11.31 +.PE

    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/thesis/fig/masqmail-typical-usage.pic	Sat Feb 07 22:39:07 2009 +0100
    12.3 @@ -0,0 +1,80 @@
    12.4 +.PS
    12.5 +# masqmail-typical-usage
    12.6 +scale = 1.2
    12.7 +
    12.8 +[
    12.9 +moveht = 0.3
   12.10 +lineht = 0.3
   12.11 +
   12.12 +
   12.13 +down
   12.14 +line <->
   12.15 +ISP: ellipse "ISP"
   12.16 +line <-
   12.17 +R: box invis "router" ht .2
   12.18 +S1: box dashed wid 3.6 ht 1.95
   12.19 +" \fIInternet\fR" at S1.nw above ljust
   12.20 +" \fILocal network\fR" at S1.nw below ljust
   12.21 +move to S1.n
   12.22 +move 2*moveht+boxht
   12.23 +
   12.24 +[
   12.25 +right
   12.26 +W1: box "workstation" "(masqmail)"
   12.27 +line <-> 0.3
   12.28 +W2: box "workstation" "(masqmail)"
   12.29 +line <-> 0.3
   12.30 +W3: box "workstation" "(masqmail)"
   12.31 +]
   12.32 +
   12.33 +line from last [].W1.n to R.s-(0.05,lineht) then to R.s-(0.05,0)
   12.34 +line from last [].W2.n to R.s-(0,lineht) then to R.s
   12.35 +line from last [].W3.n to R.s+(0.05,-lineht) then to R.s+(0.05,0)
   12.36 +
   12.37 +arrow from R.n-(0.05,0) to ISP.s-(0.05,0)
   12.38 +arrow from R.n+(0.05,0) to ISP.s+(0.05,0)
   12.39 +
   12.40 +]
   12.41 +"Scenario 1" with .nw at last [].nw +(0.4,-0.1)
   12.42 +
   12.43 +move to last [].e
   12.44 +
   12.45 +move 0.5
   12.46 +
   12.47 +
   12.48 +[
   12.49 +
   12.50 +moveht = 0.3
   12.51 +lineht = 0.3
   12.52 +
   12.53 +down
   12.54 +line <->
   12.55 +ISP: ellipse "ISP"
   12.56 +line <-
   12.57 +R: box invis "router" ht .2
   12.58 +S1: box dashed wid 3.6 ht 1.95
   12.59 +" \fIInternet\fR" at S1.nw above ljust
   12.60 +" \fILocal network\fR" at S1.nw below ljust
   12.61 +move to S1.n
   12.62 +line
   12.63 +S: box "server" "(masqmail)"
   12.64 +move
   12.65 +
   12.66 +[
   12.67 +right
   12.68 +W1: box "workstation" "(forwarder)"
   12.69 +move 0.3
   12.70 +W2: box "workstation" "(forwarder)"
   12.71 +move 0.3
   12.72 +W3: box "workstation" "(forwarder)"
   12.73 +]
   12.74 +
   12.75 +arrow from last [].W1.n to S.s-(0.05,0)
   12.76 +arrow from last [].W2.n to S.s
   12.77 +arrow from last [].W3.n to S.s+(0.05,0)
   12.78 +
   12.79 +]
   12.80 +"Scenario 2" with .nw at last [].nw +(0.4,-0.1)
   12.81 +
   12.82 +
   12.83 +.PE

    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/thesis/fig/mta-channels.pic	Sat Feb 07 22:39:07 2009 +0100
    13.3 @@ -0,0 +1,24 @@
    13.4 +.PS
    13.5 +# in and out channels of an mta
    13.6 +
    13.7 +linewid = 1.5
    13.8 +
    13.9 +
   13.10 +A: box "MTA" wid 1.5*boxwid ht 1.5*boxht
   13.11 +
   13.12 +line <- left from 0.3<A.w,A.nw> "remote (SMTP)" above
   13.13 +line <- left from 0.3<A.w,A.sw> "local (stdin)" below
   13.14 +
   13.15 +line -> right from 0.3<A.e,A.ne> "remote (SMTP)" above
   13.16 +line  right linewid*2/3 from 0.3<A.e,A.se> "local (pipe)" below
   13.17 +line -> down 1/6*linewid
   13.18 +B: box "MDA" wid 0.75*boxwid ht 0.75*boxht
   13.19 +
   13.20 +move 0.5*moveht
   13.21 +
   13.22 +C: box invis "mailboxes" ht 0.3
   13.23 +
   13.24 +arrow from 0.35<B.sw,B.se> to 0.2<C.nw,C.ne>
   13.25 +arrow from 0.45<B.sw,B.se> to 0.4<C.nw,C.ne>
   13.26 +arrow from 0.55<B.sw,B.se> to 0.6<C.nw,C.ne>
   13.27 +arrow from 0.65<B.sw,B.se> to 0.8<C.nw,C.ne>

    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/thesis/fig/proxy-setup.pic	Sat Feb 07 22:39:07 2009 +0100
    14.3 @@ -0,0 +1,47 @@
    14.4 +.PS
    14.5 +# proxy-setup
    14.6 +
    14.7 +linewid = 0.5
    14.8 +lineht = 0.3
    14.9 +
   14.10 +externlen = 0.8
   14.11 +
   14.12 +L: box wid 4.2 ht 1.3
   14.13 +box invis
   14.14 +
   14.15 +
   14.16 +P25: box wid 0.3 ht 0.3 with .e at 0.40<L.nw,L.sw> "25"
   14.17 +left
   14.18 +line <- externlen from P25.w "SMTP" "from remote "
   14.19 +
   14.20 +right
   14.21 +line -> right from P25.e "SMTP" ""
   14.22 +box "proxy"
   14.23 +arrow "SMTP" ""
   14.24 +
   14.25 +Pi: box wid 0.3 ht 0.3 "X"
   14.26 +arrow "SMTP" ""
   14.27 +
   14.28 +M2: box "masqmail"
   14.29 +arrow linewid*1.8 from 0.20<M2.ne,M2.se> "SMTP" ""
   14.30 +box wid 0.3 ht 0.3 ""
   14.31 +line -> externlen "SMTP" "to remote"
   14.32 +arrow linewid*2/3 from 0.50<M2.ne,M2.se>
   14.33 +box "pipe" ht 0.16 wid 0.4
   14.34 +arrow right from 0.80<M2.ne,M2.se> then down 0.2
   14.35 +"" "mailbox"
   14.36 +
   14.37 +line <- down left from 0.75<M2.nw,M2.sw> "" "" "   stdin"
   14.38 +box invis ht 0.3 "" "sendmail" "command"
   14.39 +
   14.40 +
   14.41 +#box dashed "remote" "host"
   14.42 +
   14.43 +#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"
   14.44 +
   14.45 +#right
   14.46 +#line -> 0.5 right from P25.e "SMTP" "(unencrypted)"
   14.47 +#box "MTA"
   14.48 +
   14.49 +
   14.50 +.PE

    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/thesis/fig/stunnel.pic	Sat Feb 07 22:39:07 2009 +0100
    15.3 @@ -0,0 +1,22 @@
    15.4 +.PS
    15.5 +# stunnel
    15.6 +
    15.7 +L: box wid 2 ht 2
    15.8 +box invis "local host" below with .n at L.n
    15.9 +
   15.10 +
   15.11 +P465: box wid 0.3 ht 0.3 with .e at 0.25<L.nw,L.sw> "465"
   15.12 +P25: box wid 0.3 ht 0.3 with .e at 0.75<L.nw,L.sw> "25"
   15.13 +
   15.14 +left
   15.15 +line <- 1.0 left from P465.w "SMTP over TLS" "(encrypted)"
   15.16 +box dashed "remote" "host"
   15.17 +
   15.18 +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                       "
   15.19 +
   15.20 +right
   15.21 +line -> 0.5 right from P25.e "SMTP" "(unencrypted)"
   15.22 +box "MTA"
   15.23 +
   15.24 +
   15.25 +.PE

    16.1 --- a/thesis/img/Makefile	Sat Feb 07 19:00:25 2009 +0100
    16.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.3 @@ -1,36 +0,0 @@
    16.4 -# generate clipped EPS pictures of PIC files
    16.5 -#
    16.6 -# requires: pic, troff (with font Palatino), grops, ps2eps
    16.7 -
    16.8 -#IMG=`ls *.pic | sed 's/\.pic$$/.eps/'`
    16.9 -IMG=\
   16.10 -comm-classification.eps \
   16.11 -masqmail-arch-new.eps \
   16.12 -comm-lifecycle.eps \
   16.13 -email-swot.eps \
   16.14 -mta-channels.eps \
   16.15 -stunnel.eps \
   16.16 -mail-agents.eps \
   16.17 -masqmail-typical-usage.eps \
   16.18 -masqmail-channels.eps \
   16.19 -proxy-setup.eps \
   16.20 -ipc-protocol.eps \
   16.21 -
   16.22 -
   16.23 -.PHONY: all
   16.24 -all: info $(IMG)
   16.25 -
   16.26 -info:
   16.27 -	@echo "pictures to generate: $(IMG)"
   16.28 -
   16.29 -
   16.30 -
   16.31 -.SUFFIXES: .pic .eps
   16.32 -.pic.eps: *.pic
   16.33 -	@echo ">>>> processing: $*"
   16.34 -	pic $*.pic | troff -fP | grops | ps2eps -f > $*.eps
   16.35 -
   16.36 -
   16.37 -.PHONY: clean
   16.38 -clean:
   16.39 -	rm -f `ls *.pic | sed 's/\.pic$$/.eps/'`

    17.1 --- a/thesis/img/comm-classification.pic	Sat Feb 07 19:00:25 2009 +0100
    17.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.3 @@ -1,32 +0,0 @@
    17.4 -.PS
    17.5 -
    17.6 -
    17.7 -boxwid = 2
    17.8 -boxht = 1
    17.9 -colheaderh = 0.4
   17.10 -rowheaderw = 1.3
   17.11 -
   17.12 -
   17.13 -copy "marker.pic.inc"
   17.14 -
   17.15 -define row {
   17.16 -	[
   17.17 -		right
   17.18 -		B1: box $1
   17.19 -		B2: box $2
   17.20 -	]
   17.21 -}
   17.22 -
   17.23 -
   17.24 -down
   17.25 -row("email" "SMS",  "voice mail" "video messages")
   17.26 -row("Instant Messaging" "chat",  "VoIP" "video conferencing")
   17.27 -
   17.28 -marker_top(1st [].B1, "written")
   17.29 -marker_top(1st [].B2, "recorded")
   17.30 -
   17.31 -marker_left(1st [], "asyncronous" rjust "(messages)" rjust)
   17.32 -marker_left(2nd [], "syncronous" rjust "(dialog)" rjust)
   17.33 -
   17.34 -
   17.35 -.PE

    18.1 --- a/thesis/img/comm-lifecycle.pic	Sat Feb 07 19:00:25 2009 +0100
    18.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.3 @@ -1,71 +0,0 @@
    18.4 -.PS
    18.5 -
    18.6 -
    18.7 -boxwid = 1.25
    18.8 -boxht = 3
    18.9 -colheaderh = 0.4
   18.10 -rowheaderw = 1.0
   18.11 -ad = 0.1 # arrow distance
   18.12 -
   18.13 -copy "marker.pic.inc"
   18.14 -
   18.15 -
   18.16 -
   18.17 -define segment {
   18.18 -	[
   18.19 -		down
   18.20 -		A: box "" invis
   18.21 -		line dotted from A.ne to A.se
   18.22 -		marker_bot(last box, $1)
   18.23 -	]
   18.24 -}
   18.25 -
   18.26 -
   18.27 -move up boxht/2-markerlen/2
   18.28 -right
   18.29 -
   18.30 -segment("introduction")
   18.31 -segment("growth")
   18.32 -segment("mature")
   18.33 -segment("saturation")
   18.34 -segment("decline")
   18.35 -
   18.36 -
   18.37 -arrow from 1st [].A.sw to last [].A.se
   18.38 -"\fI" "time" above rjust "\fR" at last arrow.end + (-0.2,0.00)
   18.39 -arrow from 1st [].A.sw to 1st [].A.nw
   18.40 -"\fI" "market share," ljust  "importance," ljust  "etc." ljust "\fR" at last arrow.end + (0.05,-0.45)
   18.41 -
   18.42 -
   18.43 -spline from 1st [].A.sw right boxwid*0.7 up 0.1 \
   18.44 -	then right boxwid*0.8 up 1.0 \
   18.45 -	then right boxwid up 1.2 \
   18.46 -	then right boxwid up 0.5 \
   18.47 -	then right boxwid down 0.3 \
   18.48 -	then right boxwid/2 down 0.1
   18.49 -
   18.50 -
   18.51 -move to (0,0)
   18.52 -
   18.53 -line left ad up ad*3 with .start at (0.38*boxwid, 0.1)
   18.54 -box "video" "messages" invis wid 0.6 ht 0.4
   18.55 -
   18.56 -line left ad up ad*3 with .start at (0.77*boxwid, 0.3)
   18.57 -box "voice" "mail" invis same
   18.58 -
   18.59 -line left ad up ad*3 with .start at (1.61*boxwid, 1.3)
   18.60 -box "Voice" "over IP" invis same
   18.61 -
   18.62 -line right ad down ad*3 with .start at (2.31*boxwid, 2.0)
   18.63 -box "instant" "messaging" invis same
   18.64 -
   18.65 -line right ad down ad*3 with .start at (3.23*boxwid, 2.6)
   18.66 -box "email" invis wid 0.6 ht 0.2
   18.67 -
   18.68 -line right ad down ad*3 with .start at (4.31*boxwid, 2.5)
   18.69 -box "telefax" invis same
   18.70 -
   18.71 -
   18.72 -
   18.73 -
   18.74 -.PE

    19.1 --- a/thesis/img/email-swot.pic	Sat Feb 07 19:00:25 2009 +0100
    19.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.3 @@ -1,32 +0,0 @@
    19.4 -.PS
    19.5 -
    19.6 -
    19.7 -boxwid = 2
    19.8 -boxht = 1
    19.9 -colheaderh = 0.4
   19.10 -rowheaderw = 1.3
   19.11 -
   19.12 -
   19.13 -copy "marker.pic.inc"
   19.14 -
   19.15 -define row {
   19.16 -	[
   19.17 -		right
   19.18 -		B1: box $1
   19.19 -		B2: box $2
   19.20 -	]
   19.21 -}
   19.22 -
   19.23 -
   19.24 -down
   19.25 -row("standard" "modular" "extensible",  "\(em")
   19.26 -row("large data transfers" "complex networks",  "spam")
   19.27 -
   19.28 -marker_bot(last [].B1, "" "opportunities" "of the market")
   19.29 -marker_bot(last [].B2, "" "threats" "of the market")
   19.30 -
   19.31 -marker_left(1st [], "strengths" rjust "of email" rjust)
   19.32 -marker_left(2nd [], "weaknesses" rjust "of email" rjust)
   19.33 -
   19.34 -
   19.35 -.PE

    20.1 --- a/thesis/img/ipc-protocol.pic	Sat Feb 07 19:00:25 2009 +0100
    20.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.3 @@ -1,41 +0,0 @@
    20.4 -.PS
    20.5 -# ipc-protocol
    20.6 -
    20.7 -boxwid = 0.3
    20.8 -boxht = 0.3
    20.9 -
   20.10 -linewid = 0.8
   20.11 -
   20.12 -
   20.13 -B: box "B"
   20.14 -arrow linewid*1.3 "connection" "attempt"
   20.15 -
   20.16 -W1: box "W"
   20.17 -arrow linewid/2 dashed "0" ""
   20.18 -box ""
   20.19 -arrow "header" "transfer"
   20.20 -
   20.21 -W2: box "W"
   20.22 -arrow linewid/2 dashed "0" ""
   20.23 -box ""
   20.24 -arrow "body" "transfer"
   20.25 -
   20.26 -W3: box "W"
   20.27 -arrow linewid/2 dashed "0" ""
   20.28 -
   20.29 -S: box "S"
   20.30 -
   20.31 -down
   20.32 -arrow dashed down from W1.s "     1"
   20.33 -box "E"
   20.34 -
   20.35 -arrow dashed down from W2.s "     1"
   20.36 -box "E"
   20.37 -
   20.38 -arrow dashed down from W3.s "     1"
   20.39 -box "E"
   20.40 -
   20.41 -
   20.42 -"\fI" "B:  begin" ljust "W: wait for reply" ljust "E:  error" ljust "S:  success" ljust "\fR" at B.sw -(0,0.5)
   20.43 -
   20.44 -.PE

    21.1 --- a/thesis/img/mail-agents.pic	Sat Feb 07 19:00:25 2009 +0100
    21.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.3 @@ -1,30 +0,0 @@
    21.4 -.PS
    21.5 -# mail-agents
    21.6 -
    21.7 -lineht = 0.25
    21.8 -circlerad = 0.3
    21.9 -
   21.10 -A: box "MTA"
   21.11 -arrow 1.5*linewid
   21.12 -B: box "MTA"
   21.13 -line
   21.14 -box invis ". . ." wid 0.5
   21.15 -arrow
   21.16 -C: box "MTA"
   21.17 -
   21.18 -arrow down from C.s
   21.19 -D: box "MDA"
   21.20 -arrow right linewid/2 from D.e
   21.21 -E: circle "mailbox"
   21.22 -line <-> down from E.s
   21.23 -F: box "MUA"
   21.24 -down
   21.25 -box invis "\fIrecipient\fR"
   21.26 -
   21.27 -
   21.28 -line <- down 2*lineht+boxht/2+circlerad from A.s
   21.29 -G: box "MUA"
   21.30 -box invis "\fIsender\fR"
   21.31 -
   21.32 -
   21.33 -.PE

    22.1 --- a/thesis/img/marker.pic.inc	Sat Feb 07 19:00:25 2009 +0100
    22.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.3 @@ -1,22 +0,0 @@
    22.4 -markerlen = 0.2
    22.5 -
    22.6 -define marker_top {
    22.7 -	line up markerlen from $1.nw
    22.8 -	line up markerlen from $1.ne
    22.9 -	"\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end>
   22.10 -}
   22.11 -define marker_bot {
   22.12 -	line $3 down markerlen from $1.sw
   22.13 -	line $3 down markerlen from $1.se
   22.14 -	"\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end>
   22.15 -}
   22.16 -define marker_left {
   22.17 -	line left markerlen from $1.nw
   22.18 -	line left markerlen from $1.sw
   22.19 -	"\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end>
   22.20 -}
   22.21 -define marker_right {
   22.22 -	line right markerlen from $1.nw
   22.23 -	line right markerlen from $1.sw
   22.24 -	"\fI" $2 "\fR" at 0.5<2nd last line.end, last line.end>
   22.25 -}

    23.1 --- a/thesis/img/masqmail-arch-new.pic	Sat Feb 07 19:00:25 2009 +0100
    23.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.3 @@ -1,59 +0,0 @@
    23.4 -.PS
    23.5 -# the new architecture
    23.6 -
    23.7 -maxpswid = 6.0
    23.8 -linewid = 0.2
    23.9 -movewid = 0.3
   23.10 -
   23.11 -
   23.12 -I: [
   23.13 -down
   23.14 -I1: ellipse "smtpd"
   23.15 -move 0.2
   23.16 -I2: ellipse "sendmail"
   23.17 -move 0.2
   23.18 -I3: ellipse "..."
   23.19 -]
   23.20 -
   23.21 -move
   23.22 -
   23.23 -QI: ellipse "queue-in"
   23.24 -arrow up right
   23.25 -IQ: box dashed "incoming" "queue"
   23.26 -arrow
   23.27 -SC: ellipse "scanning"
   23.28 -arrow
   23.29 -OQ: box dashed "outgoing" "queue"
   23.30 -arrow down right
   23.31 -QO: ellipse "queue-out"
   23.32 -
   23.33 -move
   23.34 -
   23.35 -O: [
   23.36 -down
   23.37 -O1: ellipse "smtp"
   23.38 -move 0.2
   23.39 -O2: ellipse "pipe"
   23.40 -move 0.2
   23.41 -O3: ellipse "..."
   23.42 -]
   23.43 -
   23.44 -arrow from I.I1.e to QI.w
   23.45 -arrow from I.I2.e to QI.w
   23.46 -arrow from I.I3.e to QI.w
   23.47 -
   23.48 -arrow from QO.e to O.O1.w
   23.49 -arrow from QO.e to O.O2.w
   23.50 -arrow from QO.e to O.O3.w
   23.51 -
   23.52 -
   23.53 -line dotted up from SC.n
   23.54 -box invis "external mail scanners" ht 0.2
   23.55 -
   23.56 -line dotted down from SC.s
   23.57 -PL: box dashed "message" "pool"
   23.58 -line -> down right from QI.e then to PL.w
   23.59 -line <- down left from QO.w then to PL.e
   23.60 -
   23.61 -
   23.62 -.PE

    24.1 --- a/thesis/img/masqmail-channels.pic	Sat Feb 07 19:00:25 2009 +0100
    24.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.3 @@ -1,28 +0,0 @@
    24.4 -.PS
    24.5 -# in and out channels of masqmail
    24.6 -
    24.7 -linewid = 1.5
    24.8 -
    24.9 -
   24.10 -A: box "masqmail" wid 1.5*boxwid ht 1.5*boxht
   24.11 -
   24.12 -line <- left from 0.5<A.w,A.nw> "remote (SMTP)" above
   24.13 -line <- left from 0.5<A.w,A.sw> "local (stdin)" above
   24.14 -
   24.15 -line -> right from 0.7<A.e,A.ne> "remote (SMTP)" above
   24.16 -line -> right from A.e "local (pipe)" above
   24.17 -box "command" wid boxwid ht 0.5*boxht
   24.18 -line  right from 0.7<A.e,A.se> "local (delivery)" above
   24.19 -line down .1
   24.20 -move 0.5*moveht
   24.21 -C: box invis "mailboxes" ht 0.3
   24.22 -
   24.23 -arrow from last line.end to 0.2<C.nw,C.ne>
   24.24 -arrow from last line.end to 0.4<C.nw,C.ne>
   24.25 -arrow from last line.end to 0.6<C.nw,C.ne>
   24.26 -arrow from last line.end to 0.8<C.nw,C.ne>
   24.27 -
   24.28 -line <- up from A.n
   24.29 -box invis ht 0.3 "online state"
   24.30 -
   24.31 -.PE

    25.1 --- a/thesis/img/masqmail-typical-usage.pic	Sat Feb 07 19:00:25 2009 +0100
    25.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.3 @@ -1,80 +0,0 @@
    25.4 -.PS
    25.5 -# masqmail-typical-usage
    25.6 -scale = 1.2
    25.7 -
    25.8 -[
    25.9 -moveht = 0.3
   25.10 -lineht = 0.3
   25.11 -
   25.12 -
   25.13 -down
   25.14 -line <->
   25.15 -ISP: ellipse "ISP"
   25.16 -line <-
   25.17 -R: box invis "router" ht .2
   25.18 -S1: box dashed wid 3.6 ht 1.95
   25.19 -" \fIInternet\fR" at S1.nw above ljust
   25.20 -" \fILocal network\fR" at S1.nw below ljust
   25.21 -move to S1.n
   25.22 -move 2*moveht+boxht
   25.23 -
   25.24 -[
   25.25 -right
   25.26 -W1: box "workstation" "(masqmail)"
   25.27 -line <-> 0.3
   25.28 -W2: box "workstation" "(masqmail)"
   25.29 -line <-> 0.3
   25.30 -W3: box "workstation" "(masqmail)"
   25.31 -]
   25.32 -
   25.33 -line from last [].W1.n to R.s-(0.05,lineht) then to R.s-(0.05,0)
   25.34 -line from last [].W2.n to R.s-(0,lineht) then to R.s
   25.35 -line from last [].W3.n to R.s+(0.05,-lineht) then to R.s+(0.05,0)
   25.36 -
   25.37 -arrow from R.n-(0.05,0) to ISP.s-(0.05,0)
   25.38 -arrow from R.n+(0.05,0) to ISP.s+(0.05,0)
   25.39 -
   25.40 -]
   25.41 -"Scenario 1" with .nw at last [].nw +(0.4,-0.1)
   25.42 -
   25.43 -move to last [].e
   25.44 -
   25.45 -move 0.5
   25.46 -
   25.47 -
   25.48 -[
   25.49 -
   25.50 -moveht = 0.3
   25.51 -lineht = 0.3
   25.52 -
   25.53 -down
   25.54 -line <->
   25.55 -ISP: ellipse "ISP"
   25.56 -line <-
   25.57 -R: box invis "router" ht .2
   25.58 -S1: box dashed wid 3.6 ht 1.95
   25.59 -" \fIInternet\fR" at S1.nw above ljust
   25.60 -" \fILocal network\fR" at S1.nw below ljust
   25.61 -move to S1.n
   25.62 -line
   25.63 -S: box "server" "(masqmail)"
   25.64 -move
   25.65 -
   25.66 -[
   25.67 -right
   25.68 -W1: box "workstation" "(forwarder)"
   25.69 -move 0.3
   25.70 -W2: box "workstation" "(forwarder)"
   25.71 -move 0.3
   25.72 -W3: box "workstation" "(forwarder)"
   25.73 -]
   25.74 -
   25.75 -arrow from last [].W1.n to S.s-(0.05,0)
   25.76 -arrow from last [].W2.n to S.s
   25.77 -arrow from last [].W3.n to S.s+(0.05,0)
   25.78 -
   25.79 -]
   25.80 -"Scenario 2" with .nw at last [].nw +(0.4,-0.1)
   25.81 -
   25.82 -
   25.83 -.PE

    26.1 --- a/thesis/img/mta-channels.pic	Sat Feb 07 19:00:25 2009 +0100
    26.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.3 @@ -1,24 +0,0 @@
    26.4 -.PS
    26.5 -# in and out channels of an mta
    26.6 -
    26.7 -linewid = 1.5
    26.8 -
    26.9 -
   26.10 -A: box "MTA" wid 1.5*boxwid ht 1.5*boxht
   26.11 -
   26.12 -line <- left from 0.3<A.w,A.nw> "remote (SMTP)" above
   26.13 -line <- left from 0.3<A.w,A.sw> "local (stdin)" below
   26.14 -
   26.15 -line -> right from 0.3<A.e,A.ne> "remote (SMTP)" above
   26.16 -line  right linewid*2/3 from 0.3<A.e,A.se> "local (pipe)" below
   26.17 -line -> down 1/6*linewid
   26.18 -B: box "MDA" wid 0.75*boxwid ht 0.75*boxht
   26.19 -
   26.20 -move 0.5*moveht
   26.21 -
   26.22 -C: box invis "mailboxes" ht 0.3
   26.23 -
   26.24 -arrow from 0.35<B.sw,B.se> to 0.2<C.nw,C.ne>
   26.25 -arrow from 0.45<B.sw,B.se> to 0.4<C.nw,C.ne>
   26.26 -arrow from 0.55<B.sw,B.se> to 0.6<C.nw,C.ne>
   26.27 -arrow from 0.65<B.sw,B.se> to 0.8<C.nw,C.ne>

    27.1 --- a/thesis/img/proxy-setup.pic	Sat Feb 07 19:00:25 2009 +0100
    27.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.3 @@ -1,47 +0,0 @@
    27.4 -.PS
    27.5 -# proxy-setup
    27.6 -
    27.7 -linewid = 0.5
    27.8 -lineht = 0.3
    27.9 -
   27.10 -externlen = 0.8
   27.11 -
   27.12 -L: box wid 4.2 ht 1.3
   27.13 -box invis
   27.14 -
   27.15 -
   27.16 -P25: box wid 0.3 ht 0.3 with .e at 0.40<L.nw,L.sw> "25"
   27.17 -left
   27.18 -line <- externlen from P25.w "SMTP" "from remote "
   27.19 -
   27.20 -right
   27.21 -line -> right from P25.e "SMTP" ""
   27.22 -box "proxy"
   27.23 -arrow "SMTP" ""
   27.24 -
   27.25 -Pi: box wid 0.3 ht 0.3 "X"
   27.26 -arrow "SMTP" ""
   27.27 -
   27.28 -M2: box "masqmail"
   27.29 -arrow linewid*1.8 from 0.20<M2.ne,M2.se> "SMTP" ""
   27.30 -box wid 0.3 ht 0.3 ""
   27.31 -line -> externlen "SMTP" "to remote"
   27.32 -arrow linewid*2/3 from 0.50<M2.ne,M2.se>
   27.33 -box "pipe" ht 0.16 wid 0.4
   27.34 -arrow right from 0.80<M2.ne,M2.se> then down 0.2
   27.35 -"" "mailbox"
   27.36 -
   27.37 -line <- down left from 0.75<M2.nw,M2.sw> "" "" "   stdin"
   27.38 -box invis ht 0.3 "" "sendmail" "command"
   27.39 -
   27.40 -
   27.41 -#box dashed "remote" "host"
   27.42 -
   27.43 -#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"
   27.44 -
   27.45 -#right
   27.46 -#line -> 0.5 right from P25.e "SMTP" "(unencrypted)"
   27.47 -#box "MTA"
   27.48 -
   27.49 -
   27.50 -.PE

    28.1 --- a/thesis/img/stunnel.pic	Sat Feb 07 19:00:25 2009 +0100
    28.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.3 @@ -1,22 +0,0 @@
    28.4 -.PS
    28.5 -# stunnel
    28.6 -
    28.7 -L: box wid 2 ht 2
    28.8 -box invis "local host" below with .n at L.n
    28.9 -
   28.10 -
   28.11 -P465: box wid 0.3 ht 0.3 with .e at 0.25<L.nw,L.sw> "465"
   28.12 -P25: box wid 0.3 ht 0.3 with .e at 0.75<L.nw,L.sw> "25"
   28.13 -
   28.14 -left
   28.15 -line <- 1.0 left from P465.w "SMTP over TLS" "(encrypted)"
   28.16 -box dashed "remote" "host"
   28.17 -
   28.18 -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                       "
   28.19 -
   28.20 -right
   28.21 -line -> 0.5 right from P25.e "SMTP" "(unencrypted)"
   28.22 -box "MTA"
   28.23 -
   28.24 -
   28.25 -.PE

    29.1 --- a/thesis/tex/1-Introduction.tex	Sat Feb 07 19:00:25 2009 +0100
    29.2 +++ b/thesis/tex/1-Introduction.tex	Sat Feb 07 22:39:07 2009 +0100
    29.3 @@ -35,7 +35,7 @@
    29.4  
    29.5  \begin{figure}
    29.6  	\begin{center}
    29.7 -		\includegraphics[scale=0.75]{img/mail-agents.eps}
    29.8 +		\includegraphics[scale=0.75]{fig/mail-agents.eps}
    29.9  	\end{center}
   29.10  	\caption{Mail agents and the way a mail message takes}
   29.11  	\label{fig:mail-agents}
   29.12 @@ -135,7 +135,7 @@
   29.13  
   29.14  \begin{figure}
   29.15  	\begin{center}
   29.16 -		\includegraphics[scale=0.75]{img/masqmail-typical-usage.eps}
   29.17 +		\includegraphics[scale=0.75]{fig/masqmail-typical-usage.eps}
   29.18  	\end{center}
   29.19  	\caption{Typical usage scenarios for \masqmail}
   29.20  	\label{fig:masqmail-typical-usage}
   29.21 @@ -262,7 +262,7 @@
   29.22  
   29.23  \begin{figure}
   29.24  	\begin{center}
   29.25 -		\includegraphics[scale=0.75]{img/masqmail-channels.eps}
   29.26 +		\includegraphics[scale=0.75]{fig/masqmail-channels.eps}
   29.27  	\end{center}
   29.28  	\caption{Incoming and outgoing channels of \masqmail}
   29.29  	\label{fig:masqmail-channels}

    30.1 --- a/thesis/tex/2-MarketAnalysis.tex	Sat Feb 07 19:00:25 2009 +0100
    30.2 +++ b/thesis/tex/2-MarketAnalysis.tex	Sat Feb 07 22:39:07 2009 +0100
    30.3 @@ -30,7 +30,7 @@
    30.4  
    30.5  \begin{figure}
    30.6  	\begin{center}
    30.7 -		\includegraphics[scale=0.75]{img/comm-classification.eps}
    30.8 +		\includegraphics[scale=0.75]{fig/comm-classification.eps}
    30.9  	\end{center}
   30.10  	\caption{Classification of electronic communication technologies}
   30.11  	\label{fig:comm-classification}
   30.12 @@ -54,7 +54,7 @@
   30.13  
   30.14  \begin{figure}
   30.15  	\begin{center}
   30.16 -		\includegraphics[scale=0.75]{img/comm-lifecycle.eps}
   30.17 +		\includegraphics[scale=0.75]{fig/comm-lifecycle.eps}
   30.18  	\end{center}
   30.19  	\caption{Life cycle of electronic communication technologies}
   30.20  	\label{fig:comm-lifecycle}
   30.21 @@ -189,7 +189,7 @@
   30.22  
   30.23  \begin{figure}
   30.24  	\begin{center}
   30.25 -		\includegraphics[scale=0.75]{img/email-swot.eps}
   30.26 +		\includegraphics[scale=0.75]{fig/email-swot.eps}
   30.27  	\end{center}
   30.28  	\caption{\NAME{SWOT} analysis for email}
   30.29  	\label{fig:email-swot}

    31.1 --- a/thesis/tex/4-MasqmailsFuture.tex	Sat Feb 07 19:00:25 2009 +0100
    31.2 +++ b/thesis/tex/4-MasqmailsFuture.tex	Sat Feb 07 22:39:07 2009 +0100
    31.3 @@ -63,7 +63,7 @@
    31.4  
    31.5  \begin{figure}
    31.6  	\begin{center}
    31.7 -		\includegraphics[scale=0.75]{img/mta-channels.eps}
    31.8 +		\includegraphics[scale=0.75]{fig/mta-channels.eps}
    31.9  	\end{center}
   31.10  	\caption{Required incoming and outgoing channels}
   31.11  	\index{figure!Required incoming and outgoing channels}
   31.12 @@ -167,7 +167,7 @@
   31.13  
   31.14  \begin{figure}
   31.15  	\begin{center}
   31.16 -		\includegraphics[scale=0.75]{img/stunnel.eps}
   31.17 +		\includegraphics[scale=0.75]{fig/stunnel.eps}
   31.18  	\end{center}
   31.19  	\caption{Using \name{stunnel} for incoming connections}
   31.20  	\index{figure!Using \name{stunnel} for incoming connections}
   31.21 @@ -322,9 +322,9 @@
   31.22  \begin{figure}
   31.23  	\begin{center}
   31.24  		\vspace*{2ex}
   31.25 -		%\includegraphics[scale=0.75]{img/callgraph.eps}
   31.26 -		%\includegraphics[scale=0.75]{img/masqmail-3-omitlog5.eps}
   31.27 -		\includegraphics[scale=0.75]{img/bb.eps}
   31.28 +		\includegraphics[scale=0.75]{fig/callgraph.eps}
   31.29 +		%\includegraphics[scale=0.75]{fig/masqmail-3-omitlog5.eps}
   31.30 +		%\includegraphics[scale=0.75]{fig/bb.eps}
   31.31  	\end{center}
   31.32  	\caption{Internal structure of \masqmail, showed by a call graph. (Logging functions are ignored; test and \NAME{POP3} code is excluded.)}
   31.33  	\index{figure!Internal structure of \masqmail.}

    32.1 --- a/thesis/tex/5-Improvements.tex	Sat Feb 07 19:00:25 2009 +0100
    32.2 +++ b/thesis/tex/5-Improvements.tex	Sat Feb 07 22:39:07 2009 +0100
    32.3 @@ -148,7 +148,7 @@
    32.4  
    32.5  \begin{figure}
    32.6  	\begin{center}
    32.7 -		\includegraphics[scale=0.75]{img/proxy-setup.eps}
    32.8 +		\includegraphics[scale=0.75]{fig/proxy-setup.eps}
    32.9  	\end{center}
   32.10  	\caption{A setup with a proxy}
   32.11  	\index{figure!A setup with a proxy}
   32.12 @@ -403,7 +403,7 @@
   32.13  
   32.14  \begin{figure}
   32.15  	\begin{center}
   32.16 -		\includegraphics[width=\textwidth]{img/masqmail-arch-new.eps}
   32.17 +		\includegraphics[width=\textwidth]{fig/masqmail-arch-new.eps}
   32.18  	\end{center}
   32.19  	\caption{The new designed architecture for \masqmail}
   32.20  	\index{figure!The new designed architecture for \masqmail}
   32.21 @@ -487,7 +487,7 @@
   32.22  
   32.23  \begin{figure}
   32.24  	\begin{center}
   32.25 -		\includegraphics[scale=0.75]{img/ipc-protocol.eps}
   32.26 +		\includegraphics[scale=0.75]{fig/ipc-protocol.eps}
   32.27  	\end{center}
   32.28  	\caption{State diagram of the \NAME{IPC} protocol. (Solid lines indicate client actions, dashed lines indicate server responses.)}
   32.29  	\index{figure!State diagram of the \NAME{IPC} protocol.}