aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2002-08-28 21:04:11 +0000
committerJörg Mayer <jmayer@loplof.de>2002-08-28 21:04:11 +0000
commit7c4176d8688d6642026d3d322570663c9655c7db (patch)
treefb24347c14c65d6b8d7f7e93e4060abbb7217e0c
parent48be4e530d6635dbf1ef1dafa984c2060f3caa8a (diff)
Removed trailing whitespaces from .h and .c files using the
winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
-rw-r--r--acconfig.h8
-rw-r--r--afn.c6
-rw-r--r--afn.h6
-rw-r--r--aftypes.h8
-rw-r--r--alignment.h8
-rw-r--r--asn1.c12
-rw-r--r--asn1.h4
-rw-r--r--bridged_pids.h8
-rw-r--r--capture-wpcap.c8
-rw-r--r--capture-wpcap.h8
-rw-r--r--capture.c70
-rw-r--r--capture.h8
-rw-r--r--capture_stop_conditions.c48
-rw-r--r--capture_stop_conditions.h8
-rw-r--r--color.h8
-rw-r--r--column.c24
-rw-r--r--column.h8
-rw-r--r--conditions.c62
-rw-r--r--conditions.h22
-rw-r--r--dftest.c8
-rw-r--r--editcap.c12
-rw-r--r--etypes.h8
-rw-r--r--file.c34
-rw-r--r--file.h12
-rw-r--r--filters.c18
-rw-r--r--filters.h8
-rw-r--r--follow.c56
-rw-r--r--follow.h10
-rw-r--r--format-oid.h8
-rw-r--r--getopt.c10
-rw-r--r--globals.h8
-rw-r--r--greproto.h8
-rw-r--r--gtk/capture_dlg.c70
-rw-r--r--gtk/capture_dlg.h8
-rw-r--r--gtk/capture_prefs.c12
-rw-r--r--gtk/capture_prefs.h8
-rw-r--r--gtk/color_dlg.c12
-rw-r--r--gtk/color_dlg.h8
-rw-r--r--gtk/color_utils.c8
-rw-r--r--gtk/color_utils.h8
-rw-r--r--gtk/colors.c12
-rw-r--r--gtk/colors.h8
-rw-r--r--gtk/column_prefs.c68
-rw-r--r--gtk/column_prefs.h8
-rw-r--r--gtk/decode_as_dlg.c12
-rw-r--r--gtk/decode_as_dlg.h6
-rw-r--r--gtk/dfilter_expr_dlg.c16
-rw-r--r--gtk/dfilter_expr_dlg.h8
-rw-r--r--gtk/display_opts.c24
-rw-r--r--gtk/display_opts.h8
-rw-r--r--gtk/dlg_utils.c10
-rw-r--r--gtk/dlg_utils.h8
-rw-r--r--gtk/file_dlg.c20
-rw-r--r--gtk/file_dlg.h8
-rw-r--r--gtk/filter_prefs.c34
-rw-r--r--gtk/filter_prefs.h8
-rw-r--r--gtk/find_dlg.c22
-rw-r--r--gtk/find_dlg.h8
-rw-r--r--gtk/follow_dlg.c14
-rw-r--r--gtk/follow_dlg.h6
-rw-r--r--gtk/goto_dlg.c16
-rw-r--r--gtk/goto_dlg.h8
-rw-r--r--gtk/gtkclist.c298
-rw-r--r--gtk/gtkclist.h88
-rw-r--r--gtk/gtkglobals.h8
-rw-r--r--gtk/gui_prefs.c52
-rw-r--r--gtk/gui_prefs.h8
-rw-r--r--gtk/help_dlg.c50
-rw-r--r--gtk/help_dlg.h6
-rw-r--r--gtk/keys.h8
-rw-r--r--gtk/main.c104
-rw-r--r--gtk/main.h8
-rw-r--r--gtk/menu.c26
-rw-r--r--gtk/menu.h8
-rw-r--r--gtk/nameres_prefs.c8
-rw-r--r--gtk/nameres_prefs.h8
-rw-r--r--gtk/packet_win.c16
-rw-r--r--gtk/packet_win.h6
-rw-r--r--gtk/prefs_dlg.c54
-rw-r--r--gtk/prefs_dlg.h8
-rw-r--r--gtk/print_dlg.c20
-rw-r--r--gtk/print_mswin.c46
-rw-r--r--gtk/print_mswin.h8
-rw-r--r--gtk/print_prefs.c14
-rw-r--r--gtk/print_prefs.h8
-rw-r--r--gtk/progress_dlg.c22
-rw-r--r--gtk/proto_dlg.c40
-rw-r--r--gtk/proto_dlg.h6
-rw-r--r--gtk/proto_draw.c24
-rw-r--r--gtk/proto_draw.h8
-rw-r--r--gtk/proto_hier_stats_dlg.c4
-rw-r--r--gtk/simple_dialog.c22
-rw-r--r--gtk/stream_prefs.c24
-rw-r--r--gtk/stream_prefs.h8
-rw-r--r--gtk/summary_dlg.c4
-rw-r--r--gtk/tcp_graph.c44
-rw-r--r--gtk/tcp_graph.h8
-rw-r--r--gtk/ui_util.c14
-rw-r--r--gtk/ui_util.h8
-rw-r--r--in_cksum.c4
-rw-r--r--ipproto.c8
-rw-r--r--ipproto.h8
-rw-r--r--llcsaps.h8
-rw-r--r--menu.h8
-rw-r--r--mergecap.c38
-rw-r--r--mkstemp.c2
-rw-r--r--nlpid.h6
-rw-r--r--oui.h8
-rw-r--r--packet-aarp.c36
-rw-r--r--packet-afp.c476
-rw-r--r--packet-afs-defs.h6
-rw-r--r--packet-afs-macros.h16
-rw-r--r--packet-afs-register-info.h486
-rw-r--r--packet-afs.c72
-rw-r--r--packet-aim.c170
-rw-r--r--packet-ajp13.c24
-rw-r--r--packet-aodv.c102
-rw-r--r--packet-aodv6.c8
-rw-r--r--packet-arp.c20
-rw-r--r--packet-arp.h8
-rw-r--r--packet-asap.c122
-rw-r--r--packet-ascend.c12
-rw-r--r--packet-atalk.c260
-rw-r--r--packet-atalk.h6
-rw-r--r--packet-atm.c10
-rw-r--r--packet-atm.h8
-rw-r--r--packet-auto_rp.c12
-rw-r--r--packet-bacapp.c6
-rw-r--r--packet-bacnet.c92
-rw-r--r--packet-beep.c138
-rw-r--r--packet-bgp.c68
-rw-r--r--packet-bgp.h10
-rw-r--r--packet-bootp.c56
-rw-r--r--packet-bootparams.c20
-rw-r--r--packet-bpdu.c60
-rw-r--r--packet-bvlc.c64
-rw-r--r--packet-cdp.c24
-rw-r--r--packet-cgmp.c20
-rw-r--r--packet-chdlc.c6
-rw-r--r--packet-chdlc.h8
-rw-r--r--packet-clip.c8
-rw-r--r--packet-clip.h8
-rw-r--r--packet-clnp.c196
-rw-r--r--packet-cops.c98
-rw-r--r--packet-cosine.c34
-rw-r--r--packet-cpha.c56
-rw-r--r--packet-cups.c8
-rw-r--r--packet-data.c8
-rw-r--r--packet-data.h8
-rw-r--r--packet-dccp.c92
-rw-r--r--packet-dccp.h10
-rw-r--r--packet-dcerpc-browser.c60
-rw-r--r--packet-dcerpc-browser.h8
-rw-r--r--packet-dcerpc-dfs.c10
-rw-r--r--packet-dcerpc-dfs.h8
-rw-r--r--packet-dcerpc-epm.c58
-rw-r--r--packet-dcerpc-lsa.c246
-rw-r--r--packet-dcerpc-lsa.h12
-rw-r--r--packet-dcerpc-mapi.c56
-rw-r--r--packet-dcerpc-mapi.h10
-rw-r--r--packet-dcerpc-ndr.c28
-rw-r--r--packet-dcerpc-netlogon.c242
-rw-r--r--packet-dcerpc-netlogon.h8
-rw-r--r--packet-dcerpc-nt.c168
-rw-r--r--packet-dcerpc-nt.h78
-rw-r--r--packet-dcerpc-reg.c124
-rw-r--r--packet-dcerpc-reg.h8
-rw-r--r--packet-dcerpc-samr.c928
-rw-r--r--packet-dcerpc-samr.h8
-rw-r--r--packet-dcerpc-spoolss.c1472
-rw-r--r--packet-dcerpc-spoolss.h10
-rw-r--r--packet-dcerpc-srvsvc.c1886
-rw-r--r--packet-dcerpc-srvsvc.h8
-rw-r--r--packet-dcerpc-tapi.c36
-rw-r--r--packet-dcerpc-tapi.h10
-rw-r--r--packet-dcerpc-wkssvc.c14
-rw-r--r--packet-dcerpc-wkssvc.h8
-rw-r--r--packet-dcerpc.c174
-rw-r--r--packet-dcerpc.h42
-rw-r--r--packet-ddtp.c8
-rw-r--r--packet-ddtp.h8
-rw-r--r--packet-dec-bpdu.c16
-rw-r--r--packet-dhcpv6.c28
-rw-r--r--packet-diameter-defs.h6
-rw-r--r--packet-diameter.c136
-rw-r--r--packet-dlsw.c36
-rw-r--r--packet-dns.c124
-rw-r--r--packet-dns.h8
-rw-r--r--packet-dsi.c52
-rw-r--r--packet-dvmrp.c80
-rw-r--r--packet-dvmrp.h8
-rw-r--r--packet-eap.c108
-rw-r--r--packet-eapol.c18
-rw-r--r--packet-eigrp.c68
-rw-r--r--packet-esis.c64
-rw-r--r--packet-esis.h8
-rw-r--r--packet-eth.c10
-rw-r--r--packet-eth.h8
-rw-r--r--packet-ethertype.c14
-rw-r--r--packet-fddi.c12
-rw-r--r--packet-fddi.h8
-rw-r--r--packet-fr.c58
-rw-r--r--packet-frame.c14
-rw-r--r--packet-frame.h8
-rw-r--r--packet-ftp.c16
-rw-r--r--packet-fw1.c18
-rw-r--r--packet-giop.c790
-rw-r--r--packet-giop.h74
-rw-r--r--packet-gmrp.c36
-rw-r--r--packet-gnutella.c84
-rw-r--r--packet-gnutella.h6
-rw-r--r--packet-gre.c20
-rw-r--r--packet-gssapi.c24
-rw-r--r--packet-gssapi.h8
-rw-r--r--packet-gtp.c890
-rw-r--r--packet-gtp.h8
-rw-r--r--packet-gvrp.c26
-rw-r--r--packet-h1.c18
-rw-r--r--packet-h261.c178
-rw-r--r--packet-hclnfsd.c72
-rw-r--r--packet-hclnfsd.h8
-rw-r--r--packet-hsrp.c14
-rw-r--r--packet-http.c28
-rw-r--r--packet-http.h8
-rw-r--r--packet-iapp.c38
-rw-r--r--packet-icap.c18
-rw-r--r--packet-icmpv6.c16
-rw-r--r--packet-icp.c14
-rw-r--r--packet-icq.c48
-rw-r--r--packet-ieee80211.c50
-rw-r--r--packet-ieee80211.h8
-rw-r--r--packet-ieee8023.c8
-rw-r--r--packet-ieee8023.h8
-rw-r--r--packet-igmp.c36
-rw-r--r--packet-igmp.h8
-rw-r--r--packet-igrp.c62
-rw-r--r--packet-imap.c10
-rw-r--r--packet-ip.c68
-rw-r--r--packet-ip.h8
-rw-r--r--packet-ipp.c8
-rw-r--r--packet-ipsec.c22
-rw-r--r--packet-ipsec.h8
-rw-r--r--packet-ipv6.c4
-rw-r--r--packet-ipv6.h10
-rw-r--r--packet-ipx.c56
-rw-r--r--packet-ipx.h8
-rw-r--r--packet-irc.c10
-rw-r--r--packet-isakmp.c94
-rw-r--r--packet-iscsi.c104
-rw-r--r--packet-isis-clv.c94
-rw-r--r--packet-isis-clv.h10
-rw-r--r--packet-isis-hello.c108
-rw-r--r--packet-isis-hello.h10
-rw-r--r--packet-isis-lsp.c242
-rw-r--r--packet-isis-lsp.h18
-rw-r--r--packet-isis-snp.c50
-rw-r--r--packet-isis-snp.h10
-rw-r--r--packet-isis.c34
-rw-r--r--packet-isis.h8
-rw-r--r--packet-isl.c10
-rw-r--r--packet-isl.h8
-rw-r--r--packet-isup.c918
-rw-r--r--packet-iua.c120
-rw-r--r--packet-kerberos.c32
-rw-r--r--packet-klm.c28
-rw-r--r--packet-klm.h8
-rw-r--r--packet-l2tp.c54
-rw-r--r--packet-lapb.c10
-rw-r--r--packet-lapbether.c14
-rw-r--r--packet-lapd.c10
-rw-r--r--packet-ldap.c92
-rw-r--r--packet-ldap.h8
-rw-r--r--packet-ldp.c274
-rw-r--r--packet-llc.c38
-rw-r--r--packet-llc.h8
-rw-r--r--packet-lmi.c24
-rw-r--r--packet-lmp.c780
-rw-r--r--packet-lpd.c10
-rw-r--r--packet-m2pa.c18
-rw-r--r--packet-m2tp.c110
-rw-r--r--packet-m2ua.c134
-rw-r--r--packet-m3ua.c292
-rw-r--r--packet-mbtcp.c106
-rw-r--r--packet-mip.c86
-rw-r--r--packet-mount.c38
-rw-r--r--packet-mpeg1.c290
-rw-r--r--packet-mpls.c44
-rw-r--r--packet-mrdisc.c18
-rw-r--r--packet-mrdisc.h8
-rw-r--r--packet-msnip.c24
-rw-r--r--packet-msnip.h8
-rw-r--r--packet-msproxy.c224
-rw-r--r--packet-mtp2.c44
-rw-r--r--packet-nbipx.c10
-rw-r--r--packet-nbns.c78
-rw-r--r--packet-ncp-int.h8
-rw-r--r--packet-ncp.c18
-rw-r--r--packet-ndmp.c150
-rw-r--r--packet-netbios.c44
-rw-r--r--packet-netbios.h12
-rw-r--r--packet-nfs.c678
-rw-r--r--packet-nisplus.c162
-rw-r--r--packet-nisplus.h8
-rw-r--r--packet-nlm.c122
-rw-r--r--packet-nntp.c8
-rw-r--r--packet-ntlmssp.c182
-rw-r--r--packet-ntp.c68
-rw-r--r--packet-ntp.h8
-rw-r--r--packet-null.c10
-rw-r--r--packet-null.h8
-rw-r--r--packet-osi-options.c80
-rw-r--r--packet-osi-options.h12
-rw-r--r--packet-osi.c10
-rw-r--r--packet-osi.h16
-rw-r--r--packet-ospf.c284
-rw-r--r--packet-pcnfsd.c18
-rw-r--r--packet-pcnfsd.h8
-rw-r--r--packet-pflog.c6
-rw-r--r--packet-pgm.c192
-rw-r--r--packet-pim.c50
-rw-r--r--packet-pim.h8
-rw-r--r--packet-pop.c10
-rw-r--r--packet-portmap.c12
-rw-r--r--packet-portmap.h10
-rw-r--r--packet-ppp.c270
-rw-r--r--packet-ppp.h8
-rw-r--r--packet-pppoe.c24
-rw-r--r--packet-pptp.c110
-rw-r--r--packet-prism.c14
-rw-r--r--packet-prism.h6
-rw-r--r--packet-q2931.c14
-rw-r--r--packet-q931.c32
-rw-r--r--packet-q931.h8
-rw-r--r--packet-qllc.c14
-rw-r--r--packet-quake.c30
-rw-r--r--packet-quake2.c158
-rw-r--r--packet-quake3.c28
-rw-r--r--packet-quakeworld.c52
-rw-r--r--packet-radius.c72
-rw-r--r--packet-ranap.c2836
-rw-r--r--packet-raw.c14
-rw-r--r--packet-raw.h8
-rw-r--r--packet-rip.c18
-rw-r--r--packet-ripng.c18
-rw-r--r--packet-ripng.h12
-rw-r--r--packet-rlogin.c74
-rw-r--r--packet-rmi.c34
-rw-r--r--packet-rmi.h6
-rw-r--r--packet-rpc.c88
-rw-r--r--packet-rpc.h8
-rw-r--r--packet-rquota.c30
-rw-r--r--packet-rquota.h8
-rw-r--r--packet-rsh.c16
-rw-r--r--packet-rsvp.c1412
-rw-r--r--packet-rtcp.c600
-rw-r--r--packet-rtcp.h10
-rw-r--r--packet-rtp.c298
-rw-r--r--packet-rtp.h10
-rw-r--r--packet-rtsp.c10
-rw-r--r--packet-rwall.c4
-rw-r--r--packet-rwall.h8
-rw-r--r--packet-rx.c44
-rw-r--r--packet-sap.c10
-rw-r--r--packet-scsi.c168
-rw-r--r--packet-scsi.h10
-rw-r--r--packet-sctp.c702
-rw-r--r--packet-sdp.c122
-rw-r--r--packet-sip.c26
-rw-r--r--packet-skinny.c328
-rw-r--r--packet-slimp3.c162
-rw-r--r--packet-sll.c8
-rw-r--r--packet-sll.h8
-rw-r--r--packet-slowprotocols.c30
-rw-r--r--packet-smb-browse.c90
-rw-r--r--packet-smb-browse.h8
-rw-r--r--packet-smb-common.c24
-rw-r--r--packet-smb-common.h8
-rw-r--r--packet-smb-logon.c30
-rw-r--r--packet-smb-logon.h6
-rw-r--r--packet-smb-mailslot.c10
-rw-r--r--packet-smb-mailslot.h8
-rw-r--r--packet-smb-pipe.c24
-rw-r--r--packet-smb-pipe.h8
-rw-r--r--packet-smb.c502
-rw-r--r--packet-smtp.c26
-rw-r--r--packet-sna.c10
-rw-r--r--packet-sna.h6
-rw-r--r--packet-snaeth.c8
-rw-r--r--packet-snego.c16
-rw-r--r--packet-snmp.c90
-rw-r--r--packet-snmp.h8
-rw-r--r--packet-socks.c192
-rw-r--r--packet-spnego.c108
-rw-r--r--packet-spray.c10
-rw-r--r--packet-spray.h8
-rw-r--r--packet-srvloc.c72
-rw-r--r--packet-sscop.c8
-rw-r--r--packet-ssl.c14
-rw-r--r--packet-stat-notify.c6
-rw-r--r--packet-stat-notify.h8
-rw-r--r--packet-stat.c36
-rw-r--r--packet-stat.h8
-rw-r--r--packet-sua.c708
-rw-r--r--packet-syslog.c22
-rw-r--r--packet-tacacs.c18
-rw-r--r--packet-tcp.c50
-rw-r--r--packet-tcp.h8
-rw-r--r--packet-tds.c146
-rw-r--r--packet-telnet.c14
-rw-r--r--packet-tftp.c10
-rw-r--r--packet-time.c18
-rw-r--r--packet-tns.c458
-rw-r--r--packet-tns.h8
-rw-r--r--packet-tpkt.c70
-rw-r--r--packet-tpkt.h8
-rw-r--r--packet-tr.c36
-rw-r--r--packet-tr.h8
-rw-r--r--packet-trmac.c12
-rw-r--r--packet-tsp.c24
-rw-r--r--packet-ucp.c10
-rw-r--r--packet-udp.c22
-rw-r--r--packet-udp.h8
-rw-r--r--packet-v120.c8
-rw-r--r--packet-vines.c82
-rw-r--r--packet-vines.h12
-rw-r--r--packet-vj.c42
-rw-r--r--packet-vlan.c26
-rw-r--r--packet-vlan.h8
-rw-r--r--packet-vrrp.c12
-rw-r--r--packet-vtp.c24
-rw-r--r--packet-wap.c12
-rw-r--r--packet-wap.h10
-rw-r--r--packet-wccp.c24
-rw-r--r--packet-wccp.h12
-rw-r--r--packet-wcp.c74
-rw-r--r--packet-who.c18
-rw-r--r--packet-wsp.c196
-rw-r--r--packet-wsp.h8
-rw-r--r--packet-wtls.c222
-rw-r--r--packet-wtls.h8
-rw-r--r--packet-wtp.c100
-rw-r--r--packet-wtp.h8
-rw-r--r--packet-x11-keysym.h26
-rw-r--r--packet-x11.c84
-rw-r--r--packet-x25.c12
-rw-r--r--packet-xdmcp.c100
-rw-r--r--packet-xot.c16
-rw-r--r--packet-xyplex.c8
-rw-r--r--packet-yhoo.c50
-rw-r--r--packet-yhoo.h8
-rw-r--r--packet-ypbind.c26
-rw-r--r--packet-ypbind.h8
-rw-r--r--packet-yppasswd.c18
-rw-r--r--packet-yppasswd.h8
-rw-r--r--packet-ypserv.c60
-rw-r--r--packet-ypserv.h8
-rw-r--r--packet-ypxfr.h8
-rw-r--r--packet-zebra.c18
-rw-r--r--pcap-util.c78
-rw-r--r--pcap-util.h8
-rw-r--r--ppptypes.h8
-rw-r--r--prefs-int.h8
-rw-r--r--prefs.c40
-rw-r--r--prefs.h8
-rw-r--r--print.c10
-rw-r--r--print.h14
-rw-r--r--progress_dlg.h12
-rw-r--r--proto_hier_stats.c4
-rw-r--r--proto_hier_stats.h8
-rw-r--r--ps.h8
-rw-r--r--ptvcursor.c10
-rw-r--r--ptvcursor.h10
-rw-r--r--randpkt.c8
-rw-r--r--rdps.c8
-rw-r--r--reassemble.c80
-rw-r--r--reassemble.h26
-rw-r--r--register.h8
-rw-r--r--ringbuffer.c48
-rw-r--r--ringbuffer.h14
-rw-r--r--rpc_defrag.h8
-rw-r--r--simple_dialog.h8
-rw-r--r--smb.h16
-rw-r--r--snprintf-imp.h26
-rw-r--r--snprintf.c62
-rw-r--r--statusbar.h8
-rw-r--r--strerror.c6
-rw-r--r--strerror.h6
-rw-r--r--strptime.h6
-rw-r--r--tethereal.c40
-rw-r--r--text2pcap.c264
-rw-r--r--text2pcap.h26
-rw-r--r--tools/lemon/lemon.c36
-rw-r--r--tools/lemon/lempar.c30
-rw-r--r--ui_util.h8
-rw-r--r--util.c12
-rw-r--r--util.h8
-rw-r--r--x264_prt_id.h6
-rw-r--r--xdlc.c10
-rw-r--r--xdlc.h8
-rw-r--r--xmlstub.c14
-rw-r--r--xmlstub.h20
501 files changed, 17490 insertions, 17490 deletions
diff --git a/acconfig.h b/acconfig.h
index 21b1718..7a814c2 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,22 +1,22 @@
/* acconfig.h
* #ifdefs to be controlled by "configure"
*
- * $Id: acconfig.h,v 1.24 2002/04/08 01:34:38 guy Exp $
+ * $Id: acconfig.h,v 1.25 2002/08/28 21:00:05 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.org>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/afn.c b/afn.c
index d554a21..403b255 100644
--- a/afn.c
+++ b/afn.c
@@ -1,7 +1,7 @@
/* afn.c
* RFC 1700 address family numbers
*
- * $Id: afn.c,v 1.3 2002/08/24 10:22:29 guy Exp $
+ * $Id: afn.c,v 1.4 2002/08/28 21:00:05 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/afn.h b/afn.h
index 32364ed..c1c8338 100644
--- a/afn.h
+++ b/afn.h
@@ -1,7 +1,7 @@
/* afn.h
* RFC 1700 address family numbers
*
- * $Id: afn.h,v 1.2 2002/08/24 10:22:29 guy Exp $
+ * $Id: afn.h,v 1.3 2002/08/28 21:00:05 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/aftypes.h b/aftypes.h
index 2f0d506..6c43295 100644
--- a/aftypes.h
+++ b/aftypes.h
@@ -1,24 +1,24 @@
/* aftypes.h
* AF_ values on various flavors of BSD
*
- * $Id: aftypes.h,v 1.2 2002/07/30 07:25:29 guy Exp $
+ * $Id: aftypes.h,v 1.3 2002/08/28 21:00:05 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
*
* This file created and by Mike Hall <mlh@io.com>
* Copyright 1998
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/alignment.h b/alignment.h
index 3a7c89c..5918638 100644
--- a/alignment.h
+++ b/alignment.h
@@ -1,15 +1,15 @@
/*
* alignment.h, Copyright, 1998, Richard Sharpe, All Rights Reserved
*
- * $Id: alignment.h,v 1.3 1999/09/23 05:26:18 guy Exp $
+ * $Id: alignment.h,v 1.4 2002/08/28 21:00:05 jmayer Exp $
*
* Please see the file COPYING in the top level for details of copying
- * this software. Use of this software is approved only under certain
+ * this software. Use of this software is approved only under certain
* conditions.
- *
+ *
* This file implements the alignment macros for the Threaded SMB Server
*
- * For the moment we assume Intel style architecture, but can support
+ * For the moment we assume Intel style architecture, but can support
* others.
*
* Modification History
diff --git a/asn1.c b/asn1.c
index 3ff4d4a..afe18c8 100644
--- a/asn1.c
+++ b/asn1.c
@@ -1,7 +1,7 @@
/* asn1.c
* Routines for ASN.1 BER dissection
*
- * $Id: asn1.c,v 1.16 2002/08/02 23:35:45 jmayer Exp $
+ * $Id: asn1.c,v 1.17 2002/08/28 21:00:05 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -29,7 +29,7 @@
/*
* MODULE INFORMATION
- * ------------------
+ * ------------------
* FILE NAME: g_asn1.c
* SYSTEM NAME: ASN1 Basic Encoding
* ORIGINAL AUTHOR(S): Dirk Wisse
@@ -48,7 +48,7 @@
* asn1_int_decode (asn1, end_of_int, &integer);
* asn1_eoc_decode (asn1, end_of_seq);
* asn1_close (asn1, &offset);
- *
+ *
* For indefinite encoding end_of_seq and &end_of_seq in the
* example above should be replaced by NULL.
* For indefinite decoding nothing has to be changed.
@@ -113,7 +113,7 @@ asn1_open(ASN1_SCK *asn1, tvbuff_t *tvb, int offset)
* RETURNS: void
*/
-void
+void
asn1_close(ASN1_SCK *asn1, int *offset)
{
*offset = asn1->offset;
@@ -332,7 +332,7 @@ asn1_eoc_decode (ASN1_SCK *asn1, int eoc)
{
int ret;
guchar ch;
-
+
if (eoc == -1) {
ret = asn1_octet_decode (asn1, &ch);
if (ret != ASN1_ERR_NOERROR)
@@ -829,7 +829,7 @@ asn1_oid_value_decode ( ASN1_SCK *asn1, int enc_len, subid_t **oid, guint *len)
size = enc_len + 1;
*oid = g_malloc(size * sizeof(gulong));
optr = *oid;
-
+
ret = asn1_subid_decode (asn1, &subid);
if (ret != ASN1_ERR_NOERROR) {
g_free(*oid);
diff --git a/asn1.h b/asn1.h
index 0dca046..fa44bb7 100644
--- a/asn1.h
+++ b/asn1.h
@@ -1,7 +1,7 @@
/* asn1.h
* Definitions for ASN.1 BER dissection
*
- * $Id: asn1.h,v 1.9 2002/08/02 23:35:46 jmayer Exp $
+ * $Id: asn1.h,v 1.10 2002/08/28 21:00:05 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -127,7 +127,7 @@ int asn1_int32_value_decode (ASN1_SCK *asn1, int enc_len, gint32 *integer);
int asn1_int32_decode (ASN1_SCK *asn1, gint32 *integer, guint *nbytes);
int asn1_uint32_value_decode (ASN1_SCK *asn1, int enc_len, guint *integer);
int asn1_uint32_decode (ASN1_SCK *asn1, guint32 *integer, guint *nbytes);
-int asn1_bits_decode (ASN1_SCK *asn1, int eoc, guchar **bits,
+int asn1_bits_decode (ASN1_SCK *asn1, int eoc, guchar **bits,
guint *len, guchar *unused);
int asn1_string_value_decode (ASN1_SCK *asn1, int enc_len,
guchar **octets);
diff --git a/bridged_pids.h b/bridged_pids.h
index a0b3310..db675c8 100644
--- a/bridged_pids.h
+++ b/bridged_pids.h
@@ -2,23 +2,23 @@
* Definitions of protocol IDs for the 00-80-C2 OUI, used for
* bridging various networks over ATM (RFC 2684) or Frame Relay (RFC 2427).
*
- * $Id: bridged_pids.h,v 1.1 2001/01/10 09:07:35 guy Exp $
+ * $Id: bridged_pids.h,v 1.2 2002/08/28 21:00:05 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 - 2000 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/capture-wpcap.c b/capture-wpcap.c
index 746c77d..98de62a 100644
--- a/capture-wpcap.c
+++ b/capture-wpcap.c
@@ -1,23 +1,23 @@
/* capture-wpcap.c
* Try to load WinPcap DLL at run-time.
*
- * $Id: capture-wpcap.c,v 1.2 2002/08/02 23:35:46 jmayer Exp $
+ * $Id: capture-wpcap.c,v 1.3 2002/08/28 21:00:05 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/capture-wpcap.h b/capture-wpcap.h
index 8324980..66e3da2 100644
--- a/capture-wpcap.h
+++ b/capture-wpcap.h
@@ -1,22 +1,22 @@
/* capture-wpcap.h
*
- * $Id: capture-wpcap.h,v 1.1 2001/04/03 05:26:26 gram Exp $
+ * $Id: capture-wpcap.h,v 1.2 2002/08/28 21:00:05 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/capture.c b/capture.c
index a6a0591..4e6b05b 100644
--- a/capture.c
+++ b/capture.c
@@ -1,22 +1,22 @@
/* capture.c
* Routines for packet capture windows
*
- * $Id: capture.c,v 1.188 2002/08/13 18:12:11 guy Exp $
+ * $Id: capture.c,v 1.189 2002/08/28 21:00:05 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -735,7 +735,7 @@ cap_timer_cb(gpointer data)
/* There's stuff to read from the sync pipe, meaning the child has sent
us a message, or the sync pipe has closed, meaning the child has
closed it (perhaps because it exited). */
-static void
+static void
cap_file_input_cb(gpointer data, gint source _U_,
GdkInputCondition condition _U_)
{
@@ -756,7 +756,7 @@ cap_file_input_cb(gpointer data, gint source _U_,
capturing any more packets. Pick up its exit status, and
complain if it did anything other than exit with status 0. */
wait_for_child(FALSE);
-
+
/* Read what remains of the capture file, and finish the capture.
XXX - do something if this fails? */
switch (finish_tail_cap_file(cf, &err)) {
@@ -835,7 +835,7 @@ cap_file_input_cb(gpointer data, gint source _U_,
q++;
nread--;
break;
- }
+ }
}
/* Read from the capture file the number of records the child told us
@@ -970,7 +970,7 @@ signame(int sig)
sigmsg = "Segmentation violation";
break;
- /* http://metalab.unc.edu/pub/Linux/docs/HOWTO/GCC-HOWTO
+ /* http://metalab.unc.edu/pub/Linux/docs/HOWTO/GCC-HOWTO
Linux is POSIX compliant. These are not POSIX-defined signals ---
ISO/IEC 9945-1:1990 (IEEE Std 1003.1-1990), paragraph B.3.3.1.1 sez:
@@ -1052,7 +1052,7 @@ adjust_header(loop_data *ld, struct pcap_hdr *hdr, struct pcaprec_hdr *rechdr)
}
}
-/* Mimic pcap_open_live() for pipe captures
+/* Mimic pcap_open_live() for pipe captures
* We check if "pipename" is "-" (stdin) or a FIFO, open it, and read the
* header.
* N.B. : we can't read the libpcap formats used in RedHat 6.1 or SuSE 6.3
@@ -1306,9 +1306,9 @@ pipe_dispatch(int fd, loop_data *ld, struct pcap_hdr *hdr,
phdr.ts.tv_usec = rechdr->hdr.ts_usec;
phdr.caplen = rechdr->hdr.incl_len;
phdr.len = rechdr->hdr.orig_len;
-
+
capture_pcap_cb((guchar *)ld, &phdr, data);
-
+
ld->pipe_state = STATE_EXPECT_REC_HDR;
return 1;
@@ -1380,9 +1380,9 @@ capture(gboolean *stats_known, struct pcap_stat *stats)
#define N_COUNTS (sizeof counts / sizeof counts[0])
-#ifdef _WIN32
- WORD wVersionRequested;
- WSADATA wsaData;
+#ifdef _WIN32
+ WORD wVersionRequested;
+ WSADATA wsaData;
#else
static const char ppamsg[] = "can't find PPA for ";
char *libpcap_warn;
@@ -1400,18 +1400,18 @@ capture(gboolean *stats_known, struct pcap_stat *stats)
signed/unsigned 64-bit int */
#define DECISIZE 20
- /* Initialize Windows Socket if we are in a WIN32 OS
+ /* Initialize Windows Socket if we are in a WIN32 OS
This needs to be done before querying the interface for network/netmask */
-#ifdef _WIN32
- wVersionRequested = MAKEWORD( 1, 1 );
- err = WSAStartup( wVersionRequested, &wsaData );
- if (err!=0) {
- snprintf(errmsg, sizeof errmsg,
- "Couldn't initialize Windows Sockets.");
- pch=NULL;
- goto error;
- }
-#endif
+#ifdef _WIN32
+ wVersionRequested = MAKEWORD( 1, 1 );
+ err = WSAStartup( wVersionRequested, &wsaData );
+ if (err!=0) {
+ snprintf(errmsg, sizeof errmsg,
+ "Couldn't initialize Windows Sockets.");
+ pch=NULL;
+ goto error;
+ }
+#endif
ld.go = TRUE;
ld.counts.total = 0;
@@ -1574,7 +1574,7 @@ capture(gboolean *stats_known, struct pcap_stat *stats)
goto error;
}
if (capture_opts.ringbuffer_on) {
- ld.pdh = ringbuf_init_wtap_dump_fdopen(WTAP_FILE_PCAP, ld.linktype,
+ ld.pdh = ringbuf_init_wtap_dump_fdopen(WTAP_FILE_PCAP, ld.linktype,
file_snaplen, &err);
} else {
ld.pdh = wtap_dump_fdopen(cfile.save_file_fd, WTAP_FILE_PCAP,
@@ -1705,12 +1705,12 @@ capture(gboolean *stats_known, struct pcap_stat *stats)
if (capture_child)
signal(SIGUSR1, stop_capture);
#endif
- /* initialize capture stop conditions */
+ /* initialize capture stop conditions */
init_capture_stop_conditions();
/* create stop conditions */
if (capture_opts.has_autostop_filesize)
cnd_stop_capturesize =
- cnd_new(CND_CLASS_CAPTURESIZE,(long)capture_opts.autostop_filesize * 1000);
+ cnd_new(CND_CLASS_CAPTURESIZE,(long)capture_opts.autostop_filesize * 1000);
if (capture_opts.has_autostop_duration)
cnd_stop_timeout =
cnd_new(CND_CLASS_TIMEOUT,(gint32)capture_opts.autostop_duration);
@@ -1811,7 +1811,7 @@ capture(gboolean *stats_known, struct pcap_stat *stats)
if (inpkts > 0) {
ld.sync_packets += inpkts;
/* check capture stop conditons */
- if (cnd_stop_capturesize != NULL && cnd_eval(cnd_stop_capturesize,
+ if (cnd_stop_capturesize != NULL && cnd_eval(cnd_stop_capturesize,
(guint32)wtap_get_bytes_dumped(ld.pdh))){
/* Capture file reached its maximum size. */
if (capture_opts.ringbuffer_on) {
@@ -1841,12 +1841,12 @@ capture(gboolean *stats_known, struct pcap_stat *stats)
for (i = 0; i < N_COUNTS; i++) {
snprintf(label_str, sizeof(label_str), "%d",
*counts[i].value_ptr);
-
+
gtk_label_set(GTK_LABEL(counts[i].value), label_str);
-
+
snprintf(label_str, sizeof(label_str), "(%.1f%%)",
pct(*counts[i].value_ptr, ld.counts.total));
-
+
gtk_label_set(GTK_LABEL(counts[i].percent), label_str);
}
@@ -1872,7 +1872,7 @@ capture(gboolean *stats_known, struct pcap_stat *stats)
}
}
} /* while (ld.go) */
-
+
/* delete stop conditions */
if (cnd_stop_capturesize != NULL)
cnd_delete(cnd_stop_capturesize);
@@ -2096,7 +2096,7 @@ capture_delete_cb(GtkWidget *w _U_, GdkEvent *event _U_, gpointer data) {
static void
capture_stop_cb(GtkWidget *w _U_, gpointer data) {
loop_data *ld = (loop_data *) data;
-
+
ld->go = FALSE;
}
@@ -2133,7 +2133,7 @@ capture_pcap_cb(guchar *user, const struct pcap_pkthdr *phdr,
loop_data *ld = (loop_data *) user;
int err;
- if ((++ld->counts.total >= ld->max) && (ld->max > 0))
+ if ((++ld->counts.total >= ld->max) && (ld->max > 0))
{
ld->go = FALSE;
}
diff --git a/capture.h b/capture.h
index 5269b4e..b90e04b 100644
--- a/capture.h
+++ b/capture.h
@@ -1,23 +1,23 @@
/* capture.h
* Definitions for packet capture windows
*
- * $Id: capture.h,v 1.31 2002/02/24 09:25:34 guy Exp $
+ * $Id: capture.h,v 1.32 2002/08/28 21:00:05 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/capture_stop_conditions.c b/capture_stop_conditions.c
index 18e68b0..1b1adff 100644
--- a/capture_stop_conditions.c
+++ b/capture_stop_conditions.c
@@ -1,22 +1,22 @@
/* capture_stop_conditions.c
* Implementation for 'stop condition handler'.
*
- * $Id: capture_stop_conditions.c,v 1.3 2002/05/04 09:20:28 guy Exp $
+ * $Id: capture_stop_conditions.c,v 1.4 2002/08/28 21:00:05 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -25,12 +25,12 @@
#include <time.h>
#include <string.h>
#include <stdlib.h>
-#include <sys/stat.h>
+#include <sys/stat.h>
#include <stdarg.h>
#include "conditions.h"
#include "capture_stop_conditions.h"
-/* predefined classes function prototypes */
+/* predefined classes function prototypes */
static condition* _cnd_constr_timeout(condition*, va_list);
static void _cnd_destr_timeout(condition*);
static gboolean _cnd_eval_timeout(condition*, va_list);
@@ -52,12 +52,12 @@ void init_capture_stop_conditions(void){
_cnd_destr_capturesize,
_cnd_eval_capturesize,
_cnd_reset_capturesize);
-} /* END init_capture_stop_conditions() */
+} /* END init_capture_stop_conditions() */
void cleanup_capture_stop_conditions(void){
cnd_unregister_class(CND_CLASS_TIMEOUT);
cnd_unregister_class(CND_CLASS_CAPTURESIZE);
-} /* END cleanup_capture_stop_conditions() */
+} /* END cleanup_capture_stop_conditions() */
/*****************************************************************************/
/* Predefined condition 'timeout'. */
@@ -65,7 +65,7 @@ void cleanup_capture_stop_conditions(void){
/* class id */
const char* CND_CLASS_TIMEOUT = "cnd_class_timeout";
-/* structure that contains user supplied data for this condition */
+/* structure that contains user supplied data for this condition */
typedef struct _cnd_timeout_dat{
time_t start_time;
gint32 timeout_s;
@@ -76,8 +76,8 @@ typedef struct _cnd_timeout_dat{
* 'cnd_new()' in order to perform class specific initialization.
*
* parameter: cnd - Pointer to condition passed by 'cnd_new()'.
- * ap - Pointer to user supplied arguments list for this
- * constructor.
+ * ap - Pointer to user supplied arguments list for this
+ * constructor.
* returns: Pointer to condition - Construction was successful.
* NULL - Construction failed.
*/
@@ -109,8 +109,8 @@ static void _cnd_destr_timeout(condition* cnd){
* 'cnd_eval()' in order to perform class specific condition checks.
*
* parameter: cnd - The inititalized timeout condition.
- * ap - Pointer to user supplied arguments list for this
- * handler.
+ * ap - Pointer to user supplied arguments list for this
+ * handler.
* returns: TRUE - Condition is true.
* FALSE - Condition is false.
*/
@@ -118,7 +118,7 @@ static gboolean _cnd_eval_timeout(condition* cnd, va_list ap _U_){
cnd_timeout_dat* data = (cnd_timeout_dat*)cnd_get_user_data(cnd);
gint32 elapsed_time;
/* check timeout here */
- if(data->timeout_s == 0) return FALSE; /* 0 == infinite */
+ if(data->timeout_s == 0) return FALSE; /* 0 == infinite */
elapsed_time = time(NULL) - data->start_time;
if(elapsed_time > data->timeout_s) return TRUE;
return FALSE;
@@ -132,16 +132,16 @@ static gboolean _cnd_eval_timeout(condition* cnd, va_list ap _U_){
*/
static void _cnd_reset_timeout(condition *cnd){
((cnd_timeout_dat*)cnd_get_user_data(cnd))->start_time = time(NULL);
-} /* END _cnd_reset_timeout() */
-
+} /* END _cnd_reset_timeout() */
+
/*****************************************************************************/
/* Predefined condition 'max. capturesize'. */
-/* class id */
+/* class id */
const char* CND_CLASS_CAPTURESIZE = "cnd_class_capturesize";
-/* structure that contains user supplied data for this condition */
+/* structure that contains user supplied data for this condition */
typedef struct _cnd_capturesize_dat{
long max_capture_size;
}cnd_capturesize_dat;
@@ -151,8 +151,8 @@ typedef struct _cnd_capturesize_dat{
* 'cnd_new()' in order to perform class specific initialization.
*
* parameter: cnd - Pointer to condition passed by 'cnd_new()'.
- * ap - Pointer to user supplied arguments list for this
- * constructor.
+ * ap - Pointer to user supplied arguments list for this
+ * constructor.
* returns: Pointer to condition - Construction was successful.
* NULL - Construction failed.
*/
@@ -183,15 +183,15 @@ static void _cnd_destr_capturesize(condition* cnd){
* 'cnd_eval()' in order to perform class specific condition checks.
*
* parameter: cnd - The inititalized capturesize condition.
- * ap - Pointer to user supplied arguments list for this
- * handler.
+ * ap - Pointer to user supplied arguments list for this
+ * handler.
* returns: TRUE - Condition is true.
* FALSE - Condition is false.
*/
static gboolean _cnd_eval_capturesize(condition* cnd, va_list ap){
cnd_capturesize_dat* data = (cnd_capturesize_dat*)cnd_get_user_data(cnd);
/* check capturesize here */
- if(data->max_capture_size == 0) return FALSE; /* 0 == infinite */
+ if(data->max_capture_size == 0) return FALSE; /* 0 == infinite */
if(va_arg(ap, long) >= data->max_capture_size){
return TRUE;
}
@@ -205,4 +205,4 @@ static gboolean _cnd_eval_capturesize(condition* cnd, va_list ap){
* parameter: cnd - Pointer to an initialized condition.
*/
static void _cnd_reset_capturesize(condition *cnd _U_){
-} /* END _cnd_reset_capturesize() */
+} /* END _cnd_reset_capturesize() */
diff --git a/capture_stop_conditions.h b/capture_stop_conditions.h
index 4a11636..c5e8dcf 100644
--- a/capture_stop_conditions.h
+++ b/capture_stop_conditions.h
@@ -1,22 +1,22 @@
/* capture_stop_conditions.h
* Implementation for 'stop condition handler'.
*
- * $Id: capture_stop_conditions.h,v 1.1 2001/12/04 07:32:00 guy Exp $
+ * $Id: capture_stop_conditions.h,v 1.2 2002/08/28 21:00:05 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/color.h b/color.h
index 56e0126..a94526d 100644
--- a/color.h
+++ b/color.h
@@ -1,23 +1,23 @@
/* color.h
* Definitions for "toolkit-independent" colors
*
- * $Id: color.h,v 1.1 2000/11/21 23:54:08 guy Exp $
+ * $Id: color.h,v 1.2 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/column.c b/column.c
index 300ff72..6827674 100644
--- a/column.c
+++ b/column.c
@@ -1,22 +1,22 @@
/* column.c
* Routines for handling column preferences
*
- * $Id: column.c,v 1.36 2002/08/02 23:35:46 jmayer Exp $
+ * $Id: column.c,v 1.37 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -53,10 +53,10 @@ col_format_to_string(gint fmt) {
"%rd", "%ud", "%hd", "%rhd", "%uhd", "%nd", "%rnd",
"%und", "%S", "%rS", "%uS", "%D", "%rD", "%uD", "%p",
"%i", "%L" };
-
+
if (fmt < 0 || fmt > NUM_COL_FMTS)
return NULL;
-
+
return(slist[fmt]);
}
@@ -80,10 +80,10 @@ col_format_desc(gint fmt) {
"Src port (unresolved)", "Destination port",
"Dest port (resolved)", "Dest port (unresolved)",
"Protocol", "Information", "Packet length (bytes)" };
-
+
if (fmt < 0 || fmt > NUM_COL_FMTS)
return NULL;
-
+
return(dlist[fmt]);
}
@@ -303,9 +303,9 @@ gint
get_column_format(gint col) {
GList *clp = g_list_nth(prefs.col_list, col);
fmt_data *cfmt;
-
+
cfmt = (fmt_data *) clp->data;
-
+
return(get_column_format_from_str(cfmt->fmt));
}
@@ -378,8 +378,8 @@ gchar *
get_column_title(gint col) {
GList *clp = g_list_nth(prefs.col_list, col);
fmt_data *cfmt;
-
+
cfmt = (fmt_data *) clp->data;
- return(cfmt->title);
+ return(cfmt->title);
}
diff --git a/column.h b/column.h
index 9edf0f1..29cdcfa 100644
--- a/column.h
+++ b/column.h
@@ -1,23 +1,23 @@
/* column.h
* Definitions for column handling routines
*
- * $Id: column.h,v 1.8 2001/07/22 21:56:25 guy Exp $
+ * $Id: column.h,v 1.9 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/conditions.c b/conditions.c
index 6971462..b9ae406 100644
--- a/conditions.c
+++ b/conditions.c
@@ -1,22 +1,22 @@
/* conditions.c
* Implementation for condition handler.
*
- * $Id: conditions.c,v 1.2 2002/05/04 09:19:09 guy Exp $
+ * $Id: conditions.c,v 1.3 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -27,7 +27,7 @@
#include <stdarg.h>
#include "conditions.h"
-/* container for condition classes */
+/* container for condition classes */
static GHashTable* classes = NULL;
/* condition data structure declaration */
@@ -35,7 +35,7 @@ struct condition{
char* class_id;
void* user_data;
_cnd_eval eval_func;
- _cnd_reset reset_func;
+ _cnd_reset reset_func;
};
/* structure used to store class functions in GHashTable */
@@ -51,21 +51,21 @@ static void _cnd_init();
static void _cnd_find_hash_key_for_class_id(gpointer, gpointer, gpointer);
condition* cnd_new(const char* class_id, ...){
- va_list ap;
+ va_list ap;
condition *cnd = NULL, *cnd_ref = NULL;
_cnd_class *cls = NULL;
char* id = NULL;
- /* check if hash table is already initialized */
+ /* check if hash table is already initialized */
_cnd_init();
- /* get class structure for this id */
+ /* get class structure for this id */
if((cls = (_cnd_class*)g_hash_table_lookup(classes, class_id)) == NULL)
return NULL;
- /* initialize the basic structure */
+ /* initialize the basic structure */
if((cnd_ref = (condition*)malloc(sizeof(condition))) == NULL) return NULL;
cnd_ref->user_data = NULL;
cnd_ref->eval_func = cls->eval_func;
cnd_ref->reset_func = cls->reset_func;
- /* copy the class id */
+ /* copy the class id */
if((id = (char*)malloc(strlen(class_id)+1)) == NULL){
free(cnd_ref);
return NULL;
@@ -89,11 +89,11 @@ void cnd_delete(condition *cnd){
const char* class_id = cnd->class_id;
/* check for valid pointer */
if(cnd == NULL) return;
- /* check if hash table is already initialized */
+ /* check if hash table is already initialized */
_cnd_init();
- /* get the condition class */
+ /* get the condition class */
cls = (_cnd_class*)g_hash_table_lookup(classes, class_id);
- /* call class specific destructor */
+ /* call class specific destructor */
if(cls != NULL) (cls->destr_func)(cnd);
/* free memory */
free(cnd->class_id);
@@ -102,11 +102,11 @@ void cnd_delete(condition *cnd){
} /* END cnd_delete() */
gboolean cnd_eval(condition *cnd, ...){
- va_list ap;
+ va_list ap;
gboolean ret_val = FALSE;
/* validate cnd */
if(cnd == NULL) return FALSE;
- /* call specific handler */
+ /* call specific handler */
va_start(ap, cnd);
ret_val = (cnd->eval_func)(cnd, ap);
va_end(ap);
@@ -119,11 +119,11 @@ void cnd_reset(condition *cnd){
void* cnd_get_user_data(condition *cnd){
return cnd->user_data;
-} /* END cnd_get_user_data() */
+} /* END cnd_get_user_data() */
void cnd_set_user_data(condition *cnd, void* user_data){
cnd->user_data = user_data;
-} /* END cnd_set_user_data() */
+} /* END cnd_set_user_data() */
gboolean cnd_register_class(const char* class_id,
_cnd_constr constr_func,
@@ -133,19 +133,19 @@ gboolean cnd_register_class(const char* class_id,
char* key = NULL;
_cnd_class *cls = NULL;
/* check for valid parameters */
- if((constr_func == NULL) || (destr_func == NULL) ||
+ if((constr_func == NULL) || (destr_func == NULL) ||
(eval_func == NULL) || (reset_func == NULL) || (class_id == NULL))
return FALSE;
- /* check if hash table is already initialized */
+ /* check if hash table is already initialized */
_cnd_init();
- /* check for unique class id */
+ /* check for unique class id */
if((cls = (_cnd_class*)g_hash_table_lookup(classes, class_id)) != NULL)
return FALSE;
/* GHashTable keys need to be persistent for the lifetime of the hash
table. Allocate memory and copy the class id which we use as key. */
if((key = (char*)malloc(strlen(class_id)+1)) == NULL) return FALSE;
strcpy(key, class_id);
- /* initialize class structure */
+ /* initialize class structure */
if((cls = (_cnd_class*)malloc(sizeof(_cnd_class))) == NULL){
free(key);
return FALSE;
@@ -163,20 +163,20 @@ static char* pkey = NULL;
void cnd_unregister_class(const char* class_id){
char *key = (char*)class_id;
_cnd_class *cls = NULL;
- /* check if hash table is already initialized */
+ /* check if hash table is already initialized */
_cnd_init();
- /* find the key for this class id and store it in 'pkey' */
+ /* find the key for this class id and store it in 'pkey' */
g_hash_table_foreach(classes,
_cnd_find_hash_key_for_class_id,
key);
/* find the class structure for this class id */
cls = (_cnd_class*)g_hash_table_lookup(classes, class_id);
/* remove constructor from hash table */
- g_hash_table_remove(classes, class_id);
- /* free the key */
+ g_hash_table_remove(classes, class_id);
+ /* free the key */
free(pkey);
pkey = NULL;
- /* free the value */
+ /* free the value */
free(cls);
} /* END cnd_unregister_class() */
@@ -185,13 +185,13 @@ void cnd_unregister_class(const char* class_id){
*/
static void _cnd_init(){
if(classes != NULL) return;
- /* create hash table, we use strings as keys */
+ /* create hash table, we use strings as keys */
classes = g_hash_table_new(g_str_hash, g_str_equal);
} /* END _cnd_init() */
/*
* Callback for function 'g_hash_table_foreach()'.
- * We don't keep references to hash table keys. Keys have memory allocated
+ * We don't keep references to hash table keys. Keys have memory allocated
* which must be freed when they are not used anymore. This function finds
* the reference to a key corresponding to a particular class id. The reference
* to the key is stored in a global variable.
@@ -200,6 +200,6 @@ void _cnd_find_hash_key_for_class_id(gpointer key,
gpointer value _U_,
gpointer user_data){
char* class_id = (char*)user_data;
- char* key_value = (char*)key;
+ char* key_value = (char*)key;
if(strcmp(class_id, key_value) == 0) pkey = key;
-} /* END _cnd_find_hash_key_for_class_id() */
+} /* END _cnd_find_hash_key_for_class_id() */
diff --git a/conditions.h b/conditions.h
index 1aceaf9..7254f4c 100644
--- a/conditions.h
+++ b/conditions.h
@@ -1,22 +1,22 @@
/* conditions.h
* Header for condition handler.
*
- * $Id: conditions.h,v 1.1 2001/12/04 07:32:00 guy Exp $
+ * $Id: conditions.h,v 1.2 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -29,19 +29,19 @@
#include <glib.h>
-/* forward declaration for type 'condition' */
+/* forward declaration for type 'condition' */
typedef struct condition condition;
-/* condition evaluation handler type */
+/* condition evaluation handler type */
typedef gboolean (*_cnd_eval)(condition*, va_list);
-/* condition reset handler type */
+/* condition reset handler type */
typedef void (*_cnd_reset)(condition*);
-/* condition class constructor type */
+/* condition class constructor type */
typedef condition* (*_cnd_constr)(condition*, va_list);
-/* condition class destructor type */
+/* condition class destructor type */
typedef void (*_cnd_destr)(condition*);
/*
@@ -50,7 +50,7 @@ typedef void (*_cnd_destr)(condition*);
*
* parameter: const char* - Identification of a registered condition class.
* ... - Any number of class specific initial values.
- * returns: Pointer to a initialized condition of the particular class on
+ * returns: Pointer to a initialized condition of the particular class on
* success or NULL on failure.
*/
condition* cnd_new(const char*, ...);
@@ -129,6 +129,6 @@ void* cnd_get_user_data(condition*);
* void* - Pointer to user specified data structure.
* returns: -
*/
-void cnd_set_user_data(condition*, void*);
+void cnd_set_user_data(condition*, void*);
#endif /* CONDITIONS_H */
diff --git a/dftest.c b/dftest.c
index 0b877a1..2e45596 100644
--- a/dftest.c
+++ b/dftest.c
@@ -1,6 +1,6 @@
/* dftest.c.c
*
- * $Id: dftest.c,v 1.4 2002/07/17 00:42:39 guy Exp $
+ * $Id: dftest.c,v 1.5 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -12,12 +12,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -108,7 +108,7 @@ main(int argc, char **argv)
text = get_args_as_string(argc, argv, 1);
printf("Filter: \"%s\"\n", text);
-
+
/* Compile it */
if (!dfilter_compile(text, &df)) {
fprintf(stderr, "dftest: %s\n", dfilter_error_msg);
diff --git a/editcap.c b/editcap.c
index e04f57d..c6bd004 100644
--- a/editcap.c
+++ b/editcap.c
@@ -1,7 +1,7 @@
/* Edit capture files. We can delete records, adjust timestamps, or
* simply convert from one format to another format.
*
- * $Id: editcap.c,v 1.25 2002/08/02 23:35:46 jmayer Exp $
+ * $Id: editcap.c,v 1.26 2002/08/28 21:00:06 jmayer Exp $
*
* Originally written by Richard Sharpe.
* Improved by Guy Harris.
@@ -61,7 +61,7 @@ static struct time_adjustment time_adj = {{0, 0}, 0}; /* no adjustment */
/* Add a selection item, a simple parser for now */
-static void add_selection(char *sel)
+static void add_selection(char *sel)
{
char *locn;
char *next;
@@ -134,7 +134,7 @@ typedef struct {
static void
edit_callback(guchar *user, const struct wtap_pkthdr *phdr, long offset _U_,
- union wtap_pseudo_header *pseudo_header, const guchar *buf)
+ union wtap_pseudo_header *pseudo_header, const guchar *buf)
{
callback_arg *argp = (callback_arg *)user;
int err;
@@ -187,7 +187,7 @@ edit_callback(guchar *user, const struct wtap_pkthdr *phdr, long offset _U_,
}
phdr = &snap_phdr;
}
-
+
if (!wtap_dump(argp->pdh, phdr, pseudo_header, buf, &err)) {
fprintf(stderr, "editcap: Error writing to %s: %s\n", argp->filename,
@@ -328,7 +328,7 @@ int main(int argc, char *argv[])
exit(1);
}
break;
-
+
case 'F':
out_file_type = wtap_short_string_to_file_type(optarg);
if (out_file_type < 0) {
@@ -443,4 +443,4 @@ int main(int argc, char *argv[])
return 0;
}
-
+
diff --git a/etypes.h b/etypes.h
index fa2fd9f..30b9ff1 100644
--- a/etypes.h
+++ b/etypes.h
@@ -1,22 +1,22 @@
/* etypes.h
* Defines ethernet packet types, similar to tcpdump's ethertype.h
*
- * $Id: etypes.h,v 1.25 2002/06/13 07:18:47 guy Exp $
+ * $Id: etypes.h,v 1.26 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/file.c b/file.c
index 9b3db60..6c098b1 100644
--- a/file.c
+++ b/file.c
@@ -1,22 +1,22 @@
/* file.c
* File I/O routines
*
- * $Id: file.c,v 1.286 2002/08/28 10:07:26 guy Exp $
+ * $Id: file.c,v 1.287 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -178,7 +178,7 @@ open_cap_file(char *fname, gboolean is_tempfile, capture_file *cf)
cf->progbar_nextstep = 0;
firstsec = 0, firstusec = 0;
prevsec = 0, prevusec = 0;
-
+
cf->plist_chunk = g_mem_chunk_new("frame_data_chunk",
sizeof(frame_data),
FRAME_DATA_CHUNK_SIZE * sizeof(frame_data),
@@ -377,7 +377,7 @@ read_cap_file(capture_file *cf, int *err)
g_free(load_msg);
}
if (progbar != NULL) {
- g_snprintf(status_str, sizeof(status_str),
+ g_snprintf(status_str, sizeof(status_str),
"%luKB of %luKB", file_pos / 1024, cf->f_len / 1024);
update_progress_dlg(progbar, prog_val, status_str);
}
@@ -532,7 +532,7 @@ continue_tail_cap_file(capture_file *cf, int to_read, int *err)
/* XXX - this cheats and looks inside the packet list to find the final
row number. */
if (auto_scroll_live && cf->plist_end != NULL)
- gtk_clist_moveto(GTK_CLIST(packet_list),
+ gtk_clist_moveto(GTK_CLIST(packet_list),
GTK_CLIST(packet_list)->rows - 1, -1, 1.0, 1.0);
if (cf->state == FILE_READ_ABORTED) {
@@ -581,7 +581,7 @@ finish_tail_cap_file(capture_file *cf, int *err)
if (auto_scroll_live && cf->plist_end != NULL)
/* XXX - this cheats and looks inside the packet list to find the final
row number. */
- gtk_clist_moveto(GTK_CLIST(packet_list),
+ gtk_clist_moveto(GTK_CLIST(packet_list),
GTK_CLIST(packet_list)->rows - 1, -1, 1.0, 1.0);
/* We're done reading sequentially through the file. */
@@ -740,7 +740,7 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
cf->esec = fdata->rel_secs;
cf->eusec = fdata->rel_usecs;
}
-
+
/* Get the time elapsed between the previous displayed packet and
this packet. */
compute_timestamp_diff(&fdata->del_secs, &fdata->del_usecs,
@@ -827,7 +827,7 @@ read_packet(capture_file *cf, long offset)
epan_dissect_run(edt, pseudo_header, buf, fdata, NULL);
passed = dfilter_apply_edt(cf->rfcode, edt);
epan_dissect_free(edt);
- }
+ }
if (passed) {
plist_end = cf->plist_end;
fdata->prev = plist_end;
@@ -1057,7 +1057,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item,
if (fdata == selected_frame)
selected_row = row;
}
-
+
if (redissect) {
/* Clear out what remains of the visited flags and per-frame data
pointers.
@@ -1227,7 +1227,7 @@ print_packets(capture_file *cf, print_args_t *print_args)
}
count++;
- /* Check to see if we are suppressing unmarked packets, if so,
+ /* Check to see if we are suppressing unmarked packets, if so,
* suppress them and then proceed to check for visibility.
*/
if (((print_args->suppress_unmarked && fdata->flags.marked ) ||
@@ -1306,7 +1306,7 @@ print_packets(capture_file *cf, print_args_t *print_args)
print_finale(cf->print_fh, print_args->format);
close_print_dest(print_args->to_file, cf->print_fh);
-
+
cf->print_fh = NULL;
return TRUE;
@@ -1489,7 +1489,7 @@ find_packet(capture_file *cf, dfilter_t *sfcode)
if (progbar == NULL)
progbar = delayed_create_progress_dlg("Searching", cf->sfilter, "Cancel",
&stop_flag, &start_time, prog_val);
-
+
if (progbar != NULL) {
g_snprintf(status_str, sizeof(status_str),
"%4u of %u frames", count, cf->count);
@@ -1794,8 +1794,8 @@ save_cap_file(char *fname, capture_file *cf, gboolean save_filtered,
statusbar_push_file_msg(save_msg);
g_free(save_msg);
- /*
- * Check that the from file is not the same as to file
+ /*
+ * Check that the from file is not the same as to file
* We do it here so we catch all cases ...
* Unfortunately, the file requester gives us an absolute file
* name and the read file name may be relative (if supplied on
@@ -1806,7 +1806,7 @@ save_cap_file(char *fname, capture_file *cf, gboolean save_filtered,
stat(cf->filename, &infile);
stat(fname, &outfile);
if (infile.st_ino == outfile.st_ino) {
- simple_dialog(ESD_TYPE_CRIT, NULL,
+ simple_dialog(ESD_TYPE_CRIT, NULL,
"Can't save over current capture file: %s!",
cf->filename);
goto fail;
diff --git a/file.h b/file.h
index 9c7443b..647c76b 100644
--- a/file.h
+++ b/file.h
@@ -1,22 +1,22 @@
/* file.h
* Definitions for file structures and routines
*
- * $Id: file.h,v 1.96 2002/08/02 23:35:46 jmayer Exp $
+ * $Id: file.h,v 1.97 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -63,9 +63,9 @@ typedef struct _capture_file {
gchar *save_file; /* File that user saved capture to */
int save_file_fd; /* File descriptor for saved file */
wtap *wth; /* Wiretap session */
- dfilter_t *rfcode; /* Compiled read filter program */
+ dfilter_t *rfcode; /* Compiled read filter program */
gchar *dfilter; /* Display filter string */
- dfilter_t *dfcode; /* Compiled display filter program */
+ dfilter_t *dfcode; /* Compiled display filter program */
#ifdef HAVE_LIBPCAP
gchar *cfilter; /* Capture filter string */
#endif
diff --git a/filters.c b/filters.c
index 5aaaeb0..07d72b0 100644
--- a/filters.c
+++ b/filters.c
@@ -1,22 +1,22 @@
/* filters.c
* Code for reading and writing the filters file.
*
- * $Id: filters.c,v 1.14 2002/01/21 07:36:31 guy Exp $
+ * $Id: filters.c,v 1.15 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -247,7 +247,7 @@ read_filter_list(filter_list_type_t list, char **pref_path_return,
line);
continue;
}
-
+
/* Skip over separating white space, if any. */
while ((c = getc(ff)) != EOF && isspace(c)) {
if (c == '\n')
@@ -354,7 +354,7 @@ GList *
get_filter_list_first(filter_list_type_t list)
{
GList **flp;
-
+
flp = get_filter_list(list);
return g_list_first(*flp);
}
@@ -368,7 +368,7 @@ add_to_filter_list(filter_list_type_t list, char *name, char *expression)
{
GList **flp;
filter_def *filt;
-
+
flp = get_filter_list(list);
filt = (filter_def *) g_malloc(sizeof(filter_def));
filt->name = g_strdup(name);
@@ -385,7 +385,7 @@ remove_from_filter_list(filter_list_type_t list, GList *fl_entry)
{
GList **flp;
filter_def *filt;
-
+
flp = get_filter_list(list);
filt = (filter_def *) fl_entry->data;
g_free(filt->name);
@@ -412,7 +412,7 @@ save_filter_list(filter_list_type_t list, char **pref_path_return,
filter_def *filt;
FILE *ff;
guchar *p, c;
-
+
*pref_path_return = NULL; /* assume no error */
switch (list) {
diff --git a/filters.h b/filters.h
index bf0a000..5569d62 100644
--- a/filters.h
+++ b/filters.h
@@ -1,23 +1,23 @@
/* filters.c
* Declarations of routines for reading and writing the filters file.
*
- * $Id: filters.h,v 1.2 2001/01/28 09:13:07 guy Exp $
+ * $Id: filters.h,v 1.3 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/follow.c b/follow.c
index fc385bd..6e1e7e4 100644
--- a/follow.c
+++ b/follow.c
@@ -1,23 +1,23 @@
/* follow.c
*
- * $Id: follow.c,v 1.30 2002/08/02 23:35:46 jmayer Exp $
+ * $Id: follow.c,v 1.31 2002/08/28 21:00:06 jmayer Exp $
*
* Copyright 1998 Mike Hall <mlh@io.com>
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -64,21 +64,21 @@ follow_tcp_stats(follow_tcp_stats_t* stats)
}
}
-/* this will build libpcap filter text that will only
- pass the packets related to the stream. There is a
- chance that two streams could intersect, but not a
+/* this will build libpcap filter text that will only
+ pass the packets related to the stream. There is a
+ chance that two streams could intersect, but not a
very good one */
-char*
+char*
build_follow_filter( packet_info *pi ) {
char* buf = g_malloc(1024);
int len;
if( pi->net_src.type == AT_IPv4 && pi->net_dst.type == AT_IPv4
&& pi->ipproto == 6 ) {
/* TCP over IPv4 */
- sprintf( buf,
+ sprintf( buf,
"(ip.addr eq %s and ip.addr eq %s) and (tcp.port eq %d and tcp.port eq %d)",
- ip_to_str( pi->net_src.data),
- ip_to_str( pi->net_dst.data),
+ ip_to_str( pi->net_src.data),
+ ip_to_str( pi->net_dst.data),
pi->srcport, pi->destport );
len = 4;
is_ipv6 = FALSE;
@@ -86,15 +86,15 @@ build_follow_filter( packet_info *pi ) {
else if( pi->net_src.type == AT_IPv6 && pi->net_dst.type == AT_IPv6
&& pi->ipproto == 6 ) {
/* TCP over IPv6 */
- sprintf( buf,
+ sprintf( buf,
"(ipv6.addr eq %s and ipv6.addr eq %s) and (tcp.port eq %d and tcp.port eq %d)",
- ip6_to_str((struct e_in6_addr *)pi->net_src.data),
- ip6_to_str((struct e_in6_addr *)pi->net_dst.data),
+ ip6_to_str((struct e_in6_addr *)pi->net_src.data),
+ ip6_to_str((struct e_in6_addr *)pi->net_dst.data),
pi->srcport, pi->destport );
len = 16;
is_ipv6 = TRUE;
}
- else {
+ else {
g_free( buf );
return NULL;
}
@@ -106,7 +106,7 @@ build_follow_filter( packet_info *pi ) {
}
/* here we are going to try and reconstruct the data portion of a TCP
- session. We will try and handle duplicates, TCP fragments, and out
+ session. We will try and handle duplicates, TCP fragments, and out
of order packets in a smart way. */
static tcp_frag *frags[2] = { 0, 0 };
@@ -114,7 +114,7 @@ static gulong seq[2];
static guint8 src_addr[2][MAX_IPADDR_LEN];
static guint src_port[2] = { 0, 0 };
-void
+void
reassemble_tcp( gulong sequence, gulong length, const char* data,
gulong data_length, int synflag, address *net_src,
address *net_dst, guint srcport, guint dstport) {
@@ -123,9 +123,9 @@ reassemble_tcp( gulong sequence, gulong length, const char* data,
gulong newseq;
tcp_frag *tmp_frag;
tcp_stream_chunk sc;
-
+
src_index = -1;
-
+
/* First, check if this packet should be processed. */
if ((net_src->type != AT_IPv4 && net_src->type != AT_IPv6) ||
@@ -140,7 +140,7 @@ reassemble_tcp( gulong sequence, gulong length, const char* data,
/* Now check if the packet is for this connection. */
memcpy(srcx, net_src->data, len);
memcpy(dstx, net_dst->data, len);
- if ((memcmp(srcx, ip_address[0], len) != 0 &&
+ if ((memcmp(srcx, ip_address[0], len) != 0 &&
memcmp(srcx, ip_address[1], len) != 0) ||
(memcmp(dstx, ip_address[0], len) != 0 &&
memcmp(dstx, ip_address[1], len) != 0) ||
@@ -183,7 +183,7 @@ reassemble_tcp( gulong sequence, gulong length, const char* data,
incomplete_tcp_stream = TRUE;
}
- /* now that we have filed away the srcs, lets get the sequence number stuff
+ /* now that we have filed away the srcs, lets get the sequence number stuff
figured out */
if( first ) {
/* this is the first time we have seen this src's sequence number */
@@ -198,14 +198,14 @@ reassemble_tcp( gulong sequence, gulong length, const char* data,
/* if we are here, we have already seen this src, let's
try and figure out if this packet is in the right place */
if( sequence < seq[src_index] ) {
- /* this sequence number seems dated, but
+ /* this sequence number seems dated, but
check the end to make sure it has no more
info than we have already seen */
newseq = sequence + length;
if( newseq > seq[src_index] ) {
gulong new_len;
- /* this one has more than we have seen. let's get the
+ /* this one has more than we have seen. let's get the
payload that we have not seen. */
new_len = seq[src_index] - sequence;
@@ -221,7 +221,7 @@ reassemble_tcp( gulong sequence, gulong length, const char* data,
sc.dlen = data_length;
sequence = seq[src_index];
length = newseq - seq[src_index];
-
+
/* this will now appear to be right on time :) */
}
}
@@ -257,7 +257,7 @@ reassemble_tcp( gulong sequence, gulong length, const char* data,
/* here we search through all the frag we have collected to see if
one fits */
-static int
+static int
check_fragments( int index, tcp_stream_chunk *sc ) {
tcp_frag *prev = NULL;
tcp_frag *current;
@@ -286,7 +286,7 @@ check_fragments( int index, tcp_stream_chunk *sc ) {
}
/* this should always be called before we start to reassemble a stream */
-void
+void
reset_tcp_reassembly() {
tcp_frag *current, *next;
int i;
@@ -301,7 +301,7 @@ reset_tcp_reassembly() {
current = frags[i];
while( current ) {
next = current->next;
- free( current->data );
+ free( current->data );
free( current );
current = next;
}
@@ -309,7 +309,7 @@ reset_tcp_reassembly() {
}
}
-static void
+static void
write_packet_data( int index, tcp_stream_chunk *sc, const char *data )
{
fwrite( sc, 1, sizeof(tcp_stream_chunk), data_out_file );
diff --git a/follow.h b/follow.h
index 9d2fc5e..0def348 100644
--- a/follow.h
+++ b/follow.h
@@ -1,23 +1,23 @@
/* follow.h
*
- * $Id: follow.h,v 1.12 2002/08/02 23:35:46 jmayer Exp $
+ * $Id: follow.h,v 1.13 2002/08/28 21:00:06 jmayer Exp $
*
* Copyright 1998 Mike Hall <mlh@io.com>
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -48,7 +48,7 @@ typedef struct _tcp_stream_chunk {
} tcp_stream_chunk;
char* build_follow_filter( packet_info * );
-void reassemble_tcp( gulong, gulong, const char*, gulong, int,
+void reassemble_tcp( gulong, gulong, const char*, gulong, int,
address *, address *, guint, guint );
void reset_tcp_reassembly( void );
diff --git a/format-oid.h b/format-oid.h
index de6093f..86f6c36 100644
--- a/format-oid.h
+++ b/format-oid.h
@@ -1,22 +1,22 @@
/* format-oid.h
* Declare routine for formatting OIDs
*
- * $Id: format-oid.h,v 1.1 2002/03/11 01:48:08 guy Exp $
+ * $Id: format-oid.h,v 1.2 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Didier Jorand
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/getopt.c b/getopt.c
index 1285616..241ed13 100644
--- a/getopt.c
+++ b/getopt.c
@@ -1,6 +1,6 @@
/* Getopt for GNU.
- $Id: getopt.c,v 1.3 2000/11/08 19:57:39 guy Exp $
+ $Id: getopt.c,v 1.4 2002/08/28 21:00:06 jmayer Exp $
NOTE: getopt is now part of the C library, so if you don't know what
"Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
@@ -159,7 +159,7 @@ static enum
{
REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
} ordering;
-
+
#ifdef __GNU_LIBRARY__
/* We want to avoid inclusion of string.h with non-GNU libraries
because there are many ways it can cause trouble.
@@ -202,7 +202,7 @@ extern size_t strlen (const char *);
#endif
#endif /* GNU C library. */
-
+
/* Handle permutation of arguments. */
/* Describe the part of ARGV that contains non-options that have
@@ -276,7 +276,7 @@ exchange (argv)
first_nonopt += (optind - last_nonopt);
last_nonopt = optind;
}
-
+
/* Scan elements of ARGV (whose length is ARGC) for option characters
given in OPTSTRING.
@@ -680,7 +680,7 @@ getopt (argc, argv, optstring)
}
#endif /* _LIBC or not __GNU_LIBRARY__. */
-
+
#ifdef TEST
/* Compile with -DTEST to make an executable for use in testing
diff --git a/globals.h b/globals.h
index cff4aea..ad16963 100644
--- a/globals.h
+++ b/globals.h
@@ -1,22 +1,22 @@
/* globals.h
* Global defines, etc.
*
- * $Id: globals.h,v 1.28 2002/01/21 07:36:31 guy Exp $
+ * $Id: globals.h,v 1.29 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/greproto.h b/greproto.h
index 1451752..01150ae 100644
--- a/greproto.h
+++ b/greproto.h
@@ -10,22 +10,22 @@
* definition for them; when this file is empty, get rid of all includes
* of it, and get rid of it.
*
- * $Id: greproto.h,v 1.2 2002/01/21 07:36:31 guy Exp $
+ * $Id: greproto.h,v 1.3 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 743eae4..a6b5573 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -1,22 +1,22 @@
/* capture_dlg.c
* Routines for packet capture windows
*
- * $Id: capture_dlg.c,v 1.70 2002/07/17 00:42:56 guy Exp $
+ * $Id: capture_dlg.c,v 1.71 2002/08/28 21:03:45 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -185,7 +185,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
simple_dialog(ESD_TYPE_WARN, NULL, "Can't get list of interfaces: %s",
err_str);
}
-
+
cap_open_w = dlg_window_new("Ethereal: Capture Options");
gtk_signal_connect(GTK_OBJECT(cap_open_w), "destroy",
GTK_SIGNAL_FUNC(capture_prep_destroy_cb), NULL);
@@ -195,12 +195,12 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
Ctrl+<key> is an accelerator). */
accel_group = gtk_accel_group_new();
gtk_window_add_accel_group(GTK_WINDOW(cap_open_w), accel_group);
-
+
main_vb = gtk_vbox_new(FALSE, 0);
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
gtk_container_add(GTK_CONTAINER(cap_open_w), main_vb);
gtk_widget_show(main_vb);
-
+
/* Capture-related options frame */
capture_fr = gtk_frame_new("Capture");
gtk_container_add(GTK_CONTAINER(main_vb), capture_fr);
@@ -218,7 +218,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
if_lb = gtk_label_new("Interface:");
gtk_box_pack_start(GTK_BOX(if_hb), if_lb, FALSE, FALSE, 6);
gtk_widget_show(if_lb);
-
+
if_cb = gtk_combo_new();
if (if_list != NULL)
gtk_combo_set_popdown_strings(GTK_COMBO(if_cb), if_list);
@@ -234,7 +234,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry), if_list->data);
gtk_box_pack_start(GTK_BOX(if_hb), if_cb, TRUE, TRUE, 6);
gtk_widget_show(if_cb);
-
+
free_interface_list(if_list);
/* Capture length row */
@@ -256,9 +256,9 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
snap_sb = gtk_spin_button_new (snap_adj, 0, 0);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (snap_sb), TRUE);
gtk_widget_set_usize (snap_sb, 80, 0);
- gtk_box_pack_start (GTK_BOX(snap_hb), snap_sb, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(snap_hb), snap_sb, FALSE, FALSE, 0);
gtk_widget_show(snap_sb);
-
+
snap_lb = gtk_label_new("bytes");
gtk_misc_set_alignment(GTK_MISC(snap_lb), 0, 0.5);
gtk_box_pack_start(GTK_BOX(snap_hb), snap_lb, FALSE, FALSE, 0);
@@ -280,15 +280,15 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
filter_bt = gtk_button_new_with_label("Filter:");
gtk_signal_connect(GTK_OBJECT(filter_bt), "clicked",
GTK_SIGNAL_FUNC(capture_filter_construct_cb), NULL);
- gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, FALSE, 3);
gtk_widget_show(filter_bt);
-
+
filter_te = gtk_entry_new();
if (cfile.cfilter) gtk_entry_set_text(GTK_ENTRY(filter_te), cfile.cfilter);
gtk_object_set_data(GTK_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te);
- gtk_box_pack_start(GTK_BOX(filter_hb), filter_te, TRUE, TRUE, 3);
+ gtk_box_pack_start(GTK_BOX(filter_hb), filter_te, TRUE, TRUE, 3);
gtk_widget_show(filter_te);
-
+
/* Capture file-related options frame */
file_fr = gtk_frame_new("Capture file(s)");
gtk_container_add(GTK_CONTAINER(main_vb), file_fr);
@@ -304,11 +304,11 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_widget_show(file_hb);
file_bt = gtk_button_new_with_label("File:");
- gtk_box_pack_start(GTK_BOX(file_hb), file_bt, FALSE, FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(file_hb), file_bt, FALSE, FALSE, 3);
gtk_widget_show(file_bt);
-
+
file_te = gtk_entry_new();
- gtk_box_pack_start(GTK_BOX(file_hb), file_te, TRUE, TRUE, 3);
+ gtk_box_pack_start(GTK_BOX(file_hb), file_te, TRUE, TRUE, 3);
gtk_widget_show(file_te);
gtk_signal_connect(GTK_OBJECT(file_bt), "clicked",
@@ -332,7 +332,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
GTK_SIGNAL_FUNC(capture_prep_adjust_sensitivity), GTK_OBJECT(cap_open_w));
gtk_box_pack_start(GTK_BOX(ringbuffer_hb), ringbuffer_on_tb, FALSE, FALSE, 0);
gtk_widget_show(ringbuffer_on_tb);
-
+
ringbuffer_nbf_lb = gtk_label_new("Number of files");
gtk_misc_set_alignment(GTK_MISC(ringbuffer_nbf_lb), 1, 0.5);
gtk_box_pack_start(GTK_BOX(ringbuffer_hb), ringbuffer_nbf_lb, FALSE, FALSE, 6);
@@ -343,9 +343,9 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
ringbuffer_nbf_sb = gtk_spin_button_new (ringbuffer_nbf_adj, 0, 0);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (ringbuffer_nbf_sb), TRUE);
gtk_widget_set_usize (ringbuffer_nbf_sb, 40, 0);
- gtk_box_pack_start (GTK_BOX(ringbuffer_hb), ringbuffer_nbf_sb, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX(ringbuffer_hb), ringbuffer_nbf_sb, TRUE, TRUE, 0);
gtk_widget_show(ringbuffer_nbf_sb);
-
+
/* Display-related options frame */
display_fr = gtk_frame_new("Display options");
gtk_container_add(GTK_CONTAINER(main_vb), display_fr);
@@ -399,14 +399,14 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
count_sb = gtk_spin_button_new (count_adj, 0, 0);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (count_sb), TRUE);
gtk_widget_set_usize (count_sb, 80, 0);
- gtk_box_pack_start (GTK_BOX(count_hb), count_sb, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(count_hb), count_sb, FALSE, FALSE, 0);
gtk_widget_show(count_sb);
-
+
count_lb = gtk_label_new("packet(s) captured");
gtk_misc_set_alignment(GTK_MISC(count_lb), 0, 0.5);
gtk_box_pack_start(GTK_BOX(count_hb), count_lb, FALSE, FALSE, 0);
gtk_widget_show(count_lb);
-
+
/* Filesize row */
filesize_hb = gtk_hbox_new(FALSE, 3);
gtk_container_add(GTK_CONTAINER(limit_vb), filesize_hb);
@@ -425,14 +425,14 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
filesize_sb = gtk_spin_button_new (filesize_adj, 0, 0);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (filesize_sb), TRUE);
gtk_widget_set_usize (filesize_sb, 80, 0);
- gtk_box_pack_start (GTK_BOX(filesize_hb), filesize_sb, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(filesize_hb), filesize_sb, FALSE, FALSE, 0);
gtk_widget_show(filesize_sb);
-
+
filesize_lb = gtk_label_new("");
gtk_misc_set_alignment(GTK_MISC(filesize_lb), 0, 0.5);
gtk_box_pack_start(GTK_BOX(filesize_hb), filesize_lb, FALSE, FALSE, 0);
gtk_widget_show(filesize_lb);
-
+
/* Duration row */
duration_hb = gtk_hbox_new(FALSE, 3);
gtk_container_add(GTK_CONTAINER(limit_vb), duration_hb);
@@ -451,14 +451,14 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
duration_sb = gtk_spin_button_new (duration_adj, 0, 0);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (duration_sb), TRUE);
gtk_widget_set_usize (duration_sb, 80, 0);
- gtk_box_pack_start (GTK_BOX(duration_hb), duration_sb, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(duration_hb), duration_sb, FALSE, FALSE, 0);
gtk_widget_show(duration_sb);
-
+
duration_lb = gtk_label_new("second(s)");
gtk_misc_set_alignment(GTK_MISC(duration_lb), 0, 0.5);
gtk_box_pack_start(GTK_BOX(duration_hb), duration_lb, FALSE, FALSE, 0);
gtk_widget_show(duration_lb);
-
+
/* Resolution options frame */
resolv_fr = gtk_frame_new("Name resolution");
gtk_container_add(GTK_CONTAINER(main_vb), resolv_fr);
@@ -488,7 +488,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
g_resolv_flags & RESOLV_TRANSPORT);
gtk_container_add(GTK_CONTAINER(resolv_vb), t_resolv_cb);
gtk_widget_show(t_resolv_cb);
-
+
/* Button row: OK and cancel buttons */
bbox = gtk_hbutton_box_new();
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
@@ -618,7 +618,7 @@ capture_prep_file_cb(GtkWidget *w, gpointer file_te)
the ESC key being pressed and act as if the "Cancel" button had
been selected. */
dlg_set_cancel(fs, GTK_FILE_SELECTION(fs)->cancel_button);
-
+
gtk_widget_show(fs);
}
@@ -635,7 +635,7 @@ static void
cap_prep_fs_cancel_cb(GtkWidget *w _U_, gpointer data)
{
gtk_widget_destroy(GTK_WIDGET(data));
-}
+}
static void
cap_prep_fs_destroy_cb(GtkWidget *win, gpointer data _U_)
@@ -735,7 +735,7 @@ capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) {
if (cfile.cfilter)
g_free(cfile.cfilter);
g_assert(filter_text != NULL);
- cfile.cfilter = g_strdup(filter_text);
+ cfile.cfilter = g_strdup(filter_text);
save_file = gtk_entry_get_text(GTK_ENTRY(file_te));
if (save_file && save_file[0]) {
@@ -899,7 +899,7 @@ capture_prep_adjust_sensitivity(GtkWidget *tb _U_, gpointer parent_w)
in real time" captures, so make its toggle button insensitive. */
gtk_widget_set_sensitive(GTK_WIDGET(auto_scroll_cb), FALSE);
}
-
+
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_on_tb))) {
/* Ring buffer mode enabled. Make the spin button for the number
of ring buffer files, and its label, sensitive. */
diff --git a/gtk/capture_dlg.h b/gtk/capture_dlg.h
index 6e35eb0..5a24ea6 100644
--- a/gtk/capture_dlg.h
+++ b/gtk/capture_dlg.h
@@ -1,23 +1,23 @@
/* capture_dlg.h
* Definitions for packet capture windows
*
- * $Id: capture_dlg.h,v 1.2 2000/10/11 06:01:16 guy Exp $
+ * $Id: capture_dlg.h,v 1.3 2002/08/28 21:03:46 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c
index 18d25c5..c44640e 100644
--- a/gtk/capture_prefs.c
+++ b/gtk/capture_prefs.c
@@ -1,22 +1,22 @@
/* capture_prefs.c
* Dialog box for capture preferences
*
- * $Id: capture_prefs.c,v 1.13 2002/07/17 00:22:30 guy Exp $
+ * $Id: capture_prefs.c,v 1.14 2002/08/28 21:03:46 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -76,7 +76,7 @@ capture_prefs_show(void)
gtk_table_attach_defaults(GTK_TABLE(main_tb), if_lb, 0, 1, 0, 1);
gtk_misc_set_alignment(GTK_MISC(if_lb), 1.0, 0.5);
gtk_widget_show(if_lb);
-
+
if_cb = gtk_combo_new();
/*
* XXX - what if we can't get the list?
@@ -90,7 +90,7 @@ capture_prefs_show(void)
gtk_table_attach_defaults(GTK_TABLE(main_tb), if_cb, 1, 2, 0, 1);
gtk_widget_show(if_cb);
gtk_object_set_data(GTK_OBJECT(main_vb), DEVICE_KEY, if_cb);
-
+
free_interface_list(if_list);
/* Promiscuous mode */
diff --git a/gtk/capture_prefs.h b/gtk/capture_prefs.h
index ba52a85..b6f7a70 100644
--- a/gtk/capture_prefs.h
+++ b/gtk/capture_prefs.h
@@ -1,22 +1,22 @@
/* capture_prefs.h
* Definitions for capture preferences window
*
- * $Id: capture_prefs.h,v 1.1 2002/01/10 07:43:39 guy Exp $
+ * $Id: capture_prefs.h,v 1.2 2002/08/28 21:03:46 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index e9c103e..693d0b3 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -1,22 +1,22 @@
/* color_dlg.c
* Definitions for dialog boxes for color filters
*
- * $Id: color_dlg.c,v 1.15 2002/08/02 22:34:53 jmayer Exp $
+ * $Id: color_dlg.c,v 1.16 2002/08/28 21:03:46 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -1141,14 +1141,14 @@ color_sel_ok_cb (GtkButton *button _U_,
color_sel_win_destroy(color_dialog);
/* now apply the change to the fore/background */
-
+
style = gtk_style_copy(gtk_widget_get_style(filt_name_entry));
if (is_bg)
style->base[GTK_STATE_NORMAL] = new_color;
else
style->fg[GTK_STATE_NORMAL] = new_color;
gtk_widget_set_style(filt_name_entry, style);
- gtk_widget_set_style(filt_text_entry, style);
+ gtk_widget_set_style(filt_text_entry, style);
}
}
diff --git a/gtk/color_dlg.h b/gtk/color_dlg.h
index 78d5799..483237f 100644
--- a/gtk/color_dlg.h
+++ b/gtk/color_dlg.h
@@ -1,23 +1,23 @@
/* color_dlg.h
* Definitions for dialog boxes for color filters
*
- * $Id: color_dlg.h,v 1.1 2000/02/12 08:31:47 guy Exp $
+ * $Id: color_dlg.h,v 1.2 2002/08/28 21:03:46 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/color_utils.c b/gtk/color_utils.c
index 055a935..39e4bbc 100644
--- a/gtk/color_utils.c
+++ b/gtk/color_utils.c
@@ -2,23 +2,23 @@
* Utilities for converting between "toolkit-independent" and GDK
* notions of color
*
- * $Id: color_utils.c,v 1.1 2000/11/21 23:54:09 guy Exp $
+ * $Id: color_utils.c,v 1.2 2002/08/28 21:03:46 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/color_utils.h b/gtk/color_utils.h
index e25fbc5..7d4ed44 100644
--- a/gtk/color_utils.h
+++ b/gtk/color_utils.h
@@ -2,23 +2,23 @@
* Declarations of utilities for converting between "toolkit-independent"
* and GDK notions of color
*
- * $Id: color_utils.h,v 1.1 2000/11/21 23:54:09 guy Exp $
+ * $Id: color_utils.h,v 1.2 2002/08/28 21:03:46 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/colors.c b/gtk/colors.c
index cad1300..0aa4b5e 100644
--- a/gtk/colors.c
+++ b/gtk/colors.c
@@ -1,22 +1,22 @@
/* colors.c
* Definitions for color structures and routines
*
- * $Id: colors.c,v 1.22 2002/08/02 22:34:53 jmayer Exp $
+ * $Id: colors.c,v 1.23 2002/08/28 21:03:46 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -126,7 +126,7 @@ prime_edt(gpointer data, gpointer user_data)
if (colorf->c_colorfilter != NULL)
epan_dissect_prime_dfilter(edt, colorf->c_colorfilter);
-}
+}
/* Prime the epan_dissect_t with all the compiler
* color filters in 'filter_list'. */
@@ -171,7 +171,7 @@ read_filters(void)
do {
if (fgets(buf,sizeof buf, f) == NULL)
break;
-
+
if (strspn(buf," \t") == (size_t)((strchr(buf,'*') - buf))) {
/* leading # comment */
continue;
diff --git a/gtk/colors.h b/gtk/colors.h
index 986c493..d259c80 100644
--- a/gtk/colors.h
+++ b/gtk/colors.h
@@ -1,22 +1,22 @@
/* colors.h
* Definitions for color structures and routines
*
- * $Id: colors.h,v 1.7 2002/05/27 22:00:37 guy Exp $
+ * $Id: colors.h,v 1.8 2002/08/28 21:03:46 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c
index 6edf938..0c0780f 100644
--- a/gtk/column_prefs.c
+++ b/gtk/column_prefs.c
@@ -1,22 +1,22 @@
/* column_prefs.c
* Dialog box for column preferences
*
- * $Id: column_prefs.c,v 1.11 2002/04/23 06:25:37 guy Exp $
+ * $Id: column_prefs.c,v 1.12 2002/08/28 21:03:46 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -68,12 +68,12 @@ column_prefs_show() {
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
gtk_widget_show(main_vb);
gtk_object_set_data(GTK_OBJECT(main_vb), E_COL_CM_KEY, (gpointer)FALSE);
-
+
/* Top row: Column list and buttons */
top_hb = gtk_hbox_new(FALSE, 5);
gtk_container_add(GTK_CONTAINER(main_vb), top_hb);
gtk_widget_show(top_hb);
-
+
list_bb = gtk_vbutton_box_new();
gtk_button_box_set_layout (GTK_BUTTON_BOX (list_bb), GTK_BUTTONBOX_START);
gtk_container_add(GTK_CONTAINER(top_hb), list_bb);
@@ -84,32 +84,32 @@ column_prefs_show() {
GTK_SIGNAL_FUNC(column_list_new_cb), NULL);
gtk_container_add(GTK_CONTAINER(list_bb), new_bt);
gtk_widget_show(new_bt);
-
+
del_bt = gtk_button_new_with_label ("Delete");
gtk_widget_set_sensitive(del_bt, FALSE);
gtk_signal_connect(GTK_OBJECT(del_bt), "clicked",
GTK_SIGNAL_FUNC(column_list_delete_cb), NULL);
gtk_container_add(GTK_CONTAINER(list_bb), del_bt);
gtk_widget_show(del_bt);
-
+
arrow_hb = gtk_hbox_new(TRUE, 3);
gtk_container_add(GTK_CONTAINER(list_bb), arrow_hb);
gtk_widget_show(arrow_hb);
-
+
up_bt = gtk_button_new_with_label("Up");
gtk_widget_set_sensitive(up_bt, FALSE);
gtk_signal_connect(GTK_OBJECT(up_bt), "clicked",
GTK_SIGNAL_FUNC(column_arrow_cb), NULL);
gtk_box_pack_start(GTK_BOX(arrow_hb), up_bt, TRUE, TRUE, 0);
gtk_widget_show(up_bt);
-
+
dn_bt = gtk_button_new_with_label("Down");
gtk_widget_set_sensitive(dn_bt, FALSE);
gtk_signal_connect(GTK_OBJECT(dn_bt), "clicked",
GTK_SIGNAL_FUNC(column_arrow_cb), NULL);
gtk_box_pack_start(GTK_BOX(arrow_hb), dn_bt, TRUE, TRUE, 0);
gtk_widget_show(dn_bt);
-
+
column_sc = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(column_sc),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -136,24 +136,24 @@ column_prefs_show() {
while (clp) {
cfmt = (fmt_data *) clp->data;
col_ent[0] = cfmt->title;
- col_ent[1] = col_format_desc(get_column_format_from_str(cfmt->fmt));
+ col_ent[1] = col_format_desc(get_column_format_from_str(cfmt->fmt));
row = gtk_clist_append(GTK_CLIST(column_l), col_ent);
gtk_clist_set_row_data(GTK_CLIST(column_l), row, clp);
clp = clp->next;
}
-
+
/* Colunm name entry and format selection */
tb = gtk_table_new(2, 2, FALSE);
gtk_container_add(GTK_CONTAINER(main_vb), tb);
gtk_table_set_row_spacings(GTK_TABLE(tb), 10);
gtk_table_set_col_spacings(GTK_TABLE(tb), 15);
gtk_widget_show(tb);
-
+
lb = gtk_label_new("Column title:");
gtk_misc_set_alignment(GTK_MISC(lb), 1.0, 0.5);
gtk_table_attach_defaults(GTK_TABLE(tb), lb, 0, 1, 0, 1);
gtk_widget_show(lb);
-
+
title_te = gtk_entry_new();
gtk_table_attach_defaults(GTK_TABLE(tb), title_te, 1, 2, 0, 1);
gtk_signal_connect(GTK_OBJECT(title_te), "changed",
@@ -184,12 +184,12 @@ column_prefs_show() {
gtk_option_menu_set_history(GTK_OPTION_MENU(fmt_m), cur_fmt);
gtk_widget_set_sensitive(fmt_m, FALSE);
gtk_box_pack_start(GTK_BOX(top_hb), fmt_m, FALSE, FALSE, 0);
- gtk_widget_show(fmt_m);
-
+ gtk_widget_show(fmt_m);
+
return(main_vb);
}
-/* For each selection, set the entry and option menu widgets to match
+/* For each selection, set the entry and option menu widgets to match
the currently selected item. Set the up/down button sensitivity.
Draw focus to the entry widget. */
static void
@@ -200,7 +200,7 @@ column_list_select_cb(GtkCList *clist,
gpointer user_data _U_) {
fmt_data *cfmt;
GList *clp;
-
+
clp = gtk_clist_get_row_data(clist, row);
g_assert(clp != NULL);
cfmt = (fmt_data *) clp->data;
@@ -211,7 +211,7 @@ column_list_select_cb(GtkCList *clist,
gtk_entry_set_text(GTK_ENTRY(title_te), cfmt->title);
gtk_editable_select_region(GTK_EDITABLE(title_te), 0, -1);
gtk_widget_grab_focus(title_te);
-
+
gtk_option_menu_set_history(GTK_OPTION_MENU(fmt_m), cur_fmt);
gtk_widget_set_sensitive(del_bt, TRUE);
@@ -227,10 +227,10 @@ column_list_unselect_cb(GtkCList *clist _U_,
gint column _U_,
GdkEvent *event _U_,
gpointer user_data _U_) {
-
+
cur_row = -1;
gtk_editable_delete_text(GTK_EDITABLE(title_te), 0, -1);
-
+
gtk_widget_set_sensitive(del_bt, FALSE);
gtk_widget_set_sensitive(title_te, FALSE);
gtk_widget_set_sensitive(fmt_m, FALSE);
@@ -239,12 +239,12 @@ column_list_unselect_cb(GtkCList *clist _U_,
}
/* To do: add input checking to each of these callbacks */
-
+
static void
column_list_new_cb(GtkWidget *w _U_, gpointer data _U_) {
fmt_data *cfmt;
gchar *title = "New Column", *col_ent[2];
-
+
cur_fmt = 0;
cfmt = (fmt_data *) g_malloc(sizeof(fmt_data));
cfmt->title = g_strdup(title);
@@ -281,9 +281,9 @@ static void
column_entry_changed_cb(GtkEditable *te, gpointer data) {
fmt_data *cfmt;
GList *clp;
- GtkCList *cl = data;
+ GtkCList *cl = data;
gchar *title;
-
+
if (cur_row >= 0) {
title = gtk_editable_get_chars(te, 0, -1);
clp = gtk_clist_get_row_data(cl, cur_row);
@@ -300,7 +300,7 @@ static void
column_menu_changed_cb(GtkWidget *w _U_, gpointer data) {
fmt_data *cfmt;
GList *clp;
-
+
if (cur_row >= 0) {
cur_fmt = (gint) data;
clp = gtk_clist_get_row_data(GTK_CLIST(column_l), cur_row);
@@ -317,15 +317,15 @@ column_arrow_cb(GtkWidget *w, gpointer data _U_) {
GList *clp;
fmt_data *cfmt;
gint inc = 1;
-
- g_assert(cur_row >= 0);
+
+ g_assert(cur_row >= 0);
if (w == up_bt)
inc = -1;
-
+
/* This would end up appending to the list. We shouldn't have to check for
appending past the end of the list. */
- g_assert((cur_row + inc) >= 0);
+ g_assert((cur_row + inc) >= 0);
clp = gtk_clist_get_row_data(GTK_CLIST(column_l), cur_row);
cfmt = (fmt_data *) clp->data;
@@ -363,9 +363,9 @@ column_prefs_apply(GtkWidget *w _U_) {
void
column_prefs_destroy(GtkWidget *w) {
-
+
/* Let the list cb know we're about to destroy the widget tree, so it */
- /* doesn't operate on widgets that don't exist. */
+ /* doesn't operate on widgets that don't exist. */
gtk_object_set_data(GTK_OBJECT(w), E_COL_CM_KEY, (gpointer)TRUE);
gtk_widget_destroy(GTK_WIDGET(w));
-}
+}
diff --git a/gtk/column_prefs.h b/gtk/column_prefs.h
index 9671f11..c3022e9 100644
--- a/gtk/column_prefs.h
+++ b/gtk/column_prefs.h
@@ -1,23 +1,23 @@
/* gui_prefs.h
* Definitions for column preferences window
*
- * $Id: column_prefs.h,v 1.2 2000/08/21 08:09:10 guy Exp $
+ * $Id: column_prefs.h,v 1.3 2002/08/28 21:03:46 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index 5be198e..ce40e32 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -1,6 +1,6 @@
/* decode_as_dlg.c
*
- * $Id: decode_as_dlg.c,v 1.24 2002/08/02 22:34:53 jmayer Exp $
+ * $Id: decode_as_dlg.c,v 1.25 2002/08/28 21:03:46 jmayer Exp $
*
* Routines to modify dissector tables on the fly.
*
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -326,7 +326,7 @@ decode_show_reset_cb (GtkWidget *reset_bt _U_, gpointer parent_w)
{
dissector_delete_item_t *item;
GSList *tmp;
-
+
dissector_all_tables_foreach_changed(decode_build_reset_list, NULL);
for (tmp = dissector_reset_list; tmp; tmp = g_slist_next(tmp)) {
@@ -405,7 +405,7 @@ decode_show_cb (GtkWidget * w _U_, gpointer data _U_)
GTK_SIGNAL_FUNC(decode_show_delete_cb), NULL);
gtk_signal_connect(GTK_OBJECT(decode_show_w), "destroy",
GTK_SIGNAL_FUNC(decode_show_destroy_cb), NULL);
-
+
/* Container for each row of widgets */
main_vb = gtk_vbox_new(FALSE, 2);
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
@@ -1223,7 +1223,7 @@ decode_as_cb (GtkWidget * w _U_, gpointer data _U_)
GTK_SIGNAL_FUNC(decode_delete_cb), NULL);
gtk_signal_connect(GTK_OBJECT(decode_w), "destroy",
GTK_SIGNAL_FUNC(decode_destroy_cb), NULL);
-
+
/* Container for each row of widgets */
main_vb = gtk_vbox_new(FALSE, 2);
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
diff --git a/gtk/decode_as_dlg.h b/gtk/decode_as_dlg.h
index b230c92..aa289b9 100644
--- a/gtk/decode_as_dlg.h
+++ b/gtk/decode_as_dlg.h
@@ -1,6 +1,6 @@
/* decode_as_dlg.c
*
- * $Id: decode_as_dlg.h,v 1.2 2001/02/11 23:02:05 guy Exp $
+ * $Id: decode_as_dlg.h,v 1.3 2002/08/28 21:03:46 jmayer Exp $
*
* Routines to modify dissector tables on the fly.
*
@@ -11,12 +11,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index ab0727f..b661b2a 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -7,7 +7,7 @@
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: dfilter_expr_dlg.c,v 1.26 2002/08/02 22:34:53 jmayer Exp $
+ * $Id: dfilter_expr_dlg.c,v 1.27 2002/08/28 21:03:46 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -17,22 +17,22 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/* Todo -
+/* Todo -
* may want to check the enable field to decide if protocol should be in tree
* improve speed of dialog box creation
* - I believe this is slow because of tree widget creation.
- * 1) could improve the widget
+ * 1) could improve the widget
* 2) keep a copy in memory after the first time.
* user can pop multiple tree dialogs by pressing the "Tree" button multiple
* time. not a good thing.
@@ -788,7 +788,7 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg)
g_free(value_str);
return;
}
-
+
/*
* Make sure the value is valid.
*
@@ -1004,7 +1004,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
range_entry = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(col2_vb), range_entry, FALSE, FALSE, 0);
-
+
/*
* OK, show the relation label and range stuff as it would be
* with everything turned on, so it'll request as much space
@@ -1036,7 +1036,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
value_entry = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(value_vb), value_entry, FALSE, FALSE, 0);
gtk_widget_show(value_entry);
-
+
value_list_scrolled_win = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(value_list_scrolled_win),
GTK_POLICY_AUTOMATIC,
diff --git a/gtk/dfilter_expr_dlg.h b/gtk/dfilter_expr_dlg.h
index 21ea418..047e816 100644
--- a/gtk/dfilter_expr_dlg.h
+++ b/gtk/dfilter_expr_dlg.h
@@ -1,23 +1,23 @@
/* dfilter_expr_dlg.h
* Definitions for dialog boxes for display filter expression construction
*
- * $Id: dfilter_expr_dlg.h,v 1.1 2001/01/02 01:32:21 guy Exp $
+ * $Id: dfilter_expr_dlg.h,v 1.2 2002/08/28 21:03:46 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/display_opts.c b/gtk/display_opts.c
index 7e6b1f6..3772d59 100644
--- a/gtk/display_opts.c
+++ b/gtk/display_opts.c
@@ -1,22 +1,22 @@
/* display_opts.c
* Routines for packet display windows
*
- * $Id: display_opts.c,v 1.28 2002/08/02 22:34:53 jmayer Exp $
+ * $Id: display_opts.c,v 1.29 2002/08/28 21:03:46 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -99,9 +99,9 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) {
initial_timestamp_type = timestamp_type;
/* Save the current timestamp type so that we know whether it has changed;
- we don't want to redisplay the time fields unless we've changed the way
- they should be displayed (as redisplaying the time fields could be
- expensive - we have to scan through all the packets and rebuild the
+ we don't want to redisplay the time fields unless we've changed the way
+ they should be displayed (as redisplaying the time fields could be
+ expensive - we have to scan through all the packets and rebuild the
packet list).*/
current_timestamp_type = timestamp_type;
@@ -120,7 +120,7 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) {
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
gtk_container_add(GTK_CONTAINER(display_opt_w), main_vb);
gtk_widget_show(main_vb);
-
+
button = dlg_radio_button_new_with_label_with_mnemonic(NULL, "_Time of day",
accel_group);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button),
@@ -128,7 +128,7 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) {
gtk_object_set_data(GTK_OBJECT(display_opt_w), E_DISPLAY_TIME_ABS_KEY,
button);
gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0);
-
+
gtk_widget_show(button);
button = dlg_radio_button_new_with_label_with_mnemonic(
@@ -179,7 +179,7 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) {
button);
gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0);
gtk_widget_show(button);
-
+
button = dlg_check_button_new_with_label_with_mnemonic(
"Enable _network name resolution", accel_group);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button),
@@ -188,7 +188,7 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) {
button);
gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0);
gtk_widget_show(button);
-
+
button = dlg_check_button_new_with_label_with_mnemonic(
"Enable _transport name resolution", accel_group);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button),
@@ -197,7 +197,7 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) {
button);
gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0);
gtk_widget_show(button);
-
+
/* Button row: OK, Apply, and Cancel buttons */
bbox = gtk_hbutton_box_new();
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
diff --git a/gtk/display_opts.h b/gtk/display_opts.h
index 3529ad7..67a6d1d 100644
--- a/gtk/display_opts.h
+++ b/gtk/display_opts.h
@@ -1,23 +1,23 @@
/* display_opts.h
* Definitions for display option window
*
- * $Id: display_opts.h,v 1.1 1999/10/18 12:48:13 gram Exp $
+ * $Id: display_opts.h,v 1.2 2002/08/28 21:03:47 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c
index 773e2db..1151814 100644
--- a/gtk/dlg_utils.c
+++ b/gtk/dlg_utils.c
@@ -1,23 +1,23 @@
/* dlg_utils.c
* Utilities to use when constructing dialogs
*
- * $Id: dlg_utils.c,v 1.7 2002/03/05 11:55:58 guy Exp $
+ * $Id: dlg_utils.c,v 1.8 2002/08/28 21:03:47 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -160,7 +160,7 @@ dlg_check_button_new_with_label_with_mnemonic(const gchar *label,
GtkAccelGroup *accel_group)
{
GtkWidget *check_button;
-
+
check_button = gtk_check_button_new_with_label (label);
dlg_fix_button_label(check_button, accel_group);
return check_button;
diff --git a/gtk/dlg_utils.h b/gtk/dlg_utils.h
index 84a695a..ab8372e 100644
--- a/gtk/dlg_utils.h
+++ b/gtk/dlg_utils.h
@@ -1,23 +1,23 @@
/* dlg_utils.h
* Declarations of utilities to use when constructing dialogs
*
- * $Id: dlg_utils.h,v 1.5 2000/08/23 06:55:39 guy Exp $
+ * $Id: dlg_utils.h,v 1.6 2002/08/28 21:03:47 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index c2ace79..3a268c0 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -1,22 +1,22 @@
/* file_dlg.c
* Dialog boxes for handling files
*
- * $Id: file_dlg.c,v 1.49 2002/03/05 11:55:58 guy Exp $
+ * $Id: file_dlg.c,v 1.50 2002/08/28 21:03:47 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -123,7 +123,7 @@ file_open_cmd_cb(GtkWidget *w, gpointer data _U_)
GTK_SIGNAL_FUNC(display_filter_construct_cb), &args);
gtk_box_pack_start(GTK_BOX(filter_hbox), filter_bt, FALSE, TRUE, 0);
gtk_widget_show(filter_bt);
-
+
filter_te = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te);
gtk_box_pack_start(GTK_BOX(filter_hbox), filter_te, TRUE, TRUE, 3);
@@ -158,7 +158,7 @@ file_open_cmd_cb(GtkWidget *w, gpointer data _U_)
gtk_widget_show(t_resolv_cb);
gtk_object_set_data(GTK_OBJECT(GTK_FILE_SELECTION(file_open_w)->ok_button),
E_FILE_T_RESOLVE_KEY, t_resolv_cb);
-
+
/* Connect the ok_button to file_open_ok_cb function and pass along a
pointer to the file selection box widget */
gtk_signal_connect(GTK_OBJECT (GTK_FILE_SELECTION(file_open_w)->ok_button),
@@ -252,7 +252,7 @@ file_open_ok_cb(GtkWidget *w, GtkFileSelection *fs) {
g_free(cf_name);
return;
}
-
+
/* Save the name of the containing directory specified in the path name,
if any; we can write over cf_name, which is a good thing, given that
"get_dirname()" does write over its argument. */
@@ -323,7 +323,7 @@ can_save_with_wiretap(int ft)
"filtered" is TRUE if we're to save only the packets that passed
the display filter (in which case we have to save it using Wiretap)
and FALSE if we're to save the entire file (in which case, if we're
- saving it in the type it has already, we can just copy it).
+ saving it in the type it has already, we can just copy it).
"marked" is TRUE if we have to save only the marked packets,
the same remark as "filtered" applies.
@@ -455,7 +455,7 @@ file_save_as_cmd_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(file_save_as_w)->action_area),
main_vb, FALSE, FALSE, 0);
gtk_widget_show(main_vb);
-
+
/*
* XXX - should this be sensitive only if the current display filter
* has rejected some packets, so that not all packets are currently
@@ -495,7 +495,7 @@ file_save_as_cmd_cb(GtkWidget *w _U_, gpointer data _U_)
ft_hb = gtk_hbox_new(FALSE, 3);
gtk_container_add(GTK_CONTAINER(main_vb), ft_hb);
gtk_widget_show(ft_hb);
-
+
ft_lb = gtk_label_new("File type:");
gtk_box_pack_start(GTK_BOX(ft_hb), ft_lb, FALSE, FALSE, 0);
gtk_widget_show(ft_lb);
diff --git a/gtk/file_dlg.h b/gtk/file_dlg.h
index b7e5a70..8084dbf 100644
--- a/gtk/file_dlg.h
+++ b/gtk/file_dlg.h
@@ -1,22 +1,22 @@
/* file_dlg.h
* Definitions for dialog boxes for handling files
*
- * $Id: file_dlg.h,v 1.2 2001/12/06 02:21:26 guy Exp $
+ * $Id: file_dlg.h,v 1.3 2002/08/28 21:03:47 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/filter_prefs.c b/gtk/filter_prefs.c
index 9ef6b49..f6de5d8 100644
--- a/gtk/filter_prefs.c
+++ b/gtk/filter_prefs.c
@@ -3,22 +3,22 @@
* (This used to be a notebook page under "Preferences", hence the
* "prefs" in the file name.)
*
- * $Id: filter_prefs.c,v 1.37 2002/06/22 20:00:26 guy Exp $
+ * $Id: filter_prefs.c,v 1.38 2002/08/28 21:03:47 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -317,7 +317,7 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
*ok_bt, /* "OK" button */
*apply_bt, /* "Apply" button */
*save_bt, /* "Save" button */
- *close_bt; /* "Cancel" button */
+ *close_bt; /* "Cancel" button */
GtkWidget *filter_pg = NULL; /* filter settings box */
GtkWidget *top_hb,
*list_bb,
@@ -381,7 +381,7 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
gtk_container_add(GTK_CONTAINER(main_w), main_vb);
gtk_widget_show(main_vb);
- /* Make sure everything is set up */
+ /* Make sure everything is set up */
if (parent_filter_te)
filter_te_str = gtk_entry_get_text(GTK_ENTRY(parent_filter_te));
@@ -501,11 +501,11 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
middle_hb = gtk_hbox_new(FALSE, 5);
gtk_container_add(GTK_CONTAINER(filter_pg), middle_hb);
gtk_widget_show(middle_hb);
-
+
name_lb = gtk_label_new("Filter name:");
gtk_box_pack_start(GTK_BOX(middle_hb), name_lb, FALSE, FALSE, 3);
gtk_widget_show(name_lb);
-
+
name_te = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(middle_hb), name_te, TRUE, TRUE, 3);
gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_NAME_TE_KEY, name_te);
@@ -517,11 +517,11 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
bottom_hb = gtk_hbox_new(FALSE, 5);
gtk_container_add(GTK_CONTAINER(filter_pg), bottom_hb);
gtk_widget_show(bottom_hb);
-
+
filter_lb = gtk_label_new("Filter string:");
gtk_box_pack_start(GTK_BOX(bottom_hb), filter_lb, FALSE, FALSE, 3);
gtk_widget_show(filter_lb);
-
+
filter_te = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(bottom_hb), filter_te, TRUE, TRUE, 3);
gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_FILTER_TE_KEY, filter_te);
@@ -681,7 +681,7 @@ filter_apply(GtkWidget *main_w, gboolean destroy)
gtk_object_get_data(GTK_OBJECT(main_w), E_FILT_PARENT_FILTER_TE_KEY);
GtkWidget *filter_te;
gchar *filter_string;
-
+
if (parent_filter_te != NULL) {
/*
* We have a text entry widget associated with this dialog
@@ -865,7 +865,7 @@ filter_sel_list_cb(GtkWidget *l, gpointer data _U_)
sl = GTK_LIST(l)->selection;
else
sl = NULL;
-
+
if (sl) { /* Something was selected */
l_item = GTK_OBJECT(sl->data);
flp = (GList *) gtk_object_get_data(l_item, E_FILT_LIST_ITEM_MODEL_KEY);
@@ -916,7 +916,7 @@ filter_list_destroy_cb(GtkWidget *l, gpointer data _U_)
}
/* To do: add input checking to each of these callbacks */
-
+
/* Structure containing arguments to be passed to "new_filter_cb()".
"active_filter_l" is the list in the dialog box in which "New" or
@@ -966,10 +966,10 @@ filter_new_bt_clicked_cb(GtkWidget *w, gpointer data)
GList *fl_entry;
gchar *name, *strval;
new_filter_cb_args_t args;
-
+
name = gtk_entry_get_text(GTK_ENTRY(name_te));
strval = gtk_entry_get_text(GTK_ENTRY(filter_te));
-
+
if (strlen(name) > 0 && strlen(strval) > 0) {
/* Add a new entry to the filter list. */
fl_entry = add_to_filter_list(list, name, strval);
@@ -1040,7 +1040,7 @@ filter_chg_bt_clicked_cb(GtkWidget *w, gpointer data)
nl_lb = (GtkLabel *) gtk_object_get_data(l_item, E_FILT_LBL_KEY);
if (fl_entry != NULL && nl_lb != NULL) {
filt = (filter_def *) fl_entry->data;
-
+
if (strlen(name) > 0 && strlen(strval) > 0 && filt) {
g_free(filt->name);
g_free(filt->strval);
@@ -1137,7 +1137,7 @@ filter_del_bt_clicked_cb(GtkWidget *w, gpointer data)
/* Update all the filter list widgets, not just the one in
the dialog box in which we clicked on "Delete". */
g_list_foreach(get_filter_dialog_list(list), delete_filter_cb, &pos);
- }
+ }
}
}
diff --git a/gtk/filter_prefs.h b/gtk/filter_prefs.h
index b6b478c..3fad8e2 100644
--- a/gtk/filter_prefs.h
+++ b/gtk/filter_prefs.h
@@ -3,23 +3,23 @@
* (This used to be a notebook page under "Preferences", hence the
* "prefs" in the file name.)
*
- * $Id: filter_prefs.h,v 1.11 2001/02/23 05:54:27 guy Exp $
+ * $Id: filter_prefs.h,v 1.12 2002/08/28 21:03:47 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index 8404d7e..00de5fc 100644
--- a/gtk/find_dlg.c
+++ b/gtk/find_dlg.c
@@ -1,22 +1,22 @@
/* find_dlg.c
* Routines for "find frame" window
*
- * $Id: find_dlg.c,v 1.22 2002/05/03 21:55:14 guy Exp $
+ * $Id: find_dlg.c,v 1.23 2002/08/28 21:03:47 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -96,30 +96,30 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
Ctrl+<key> is an accelerator). */
accel_group = gtk_accel_group_new();
gtk_window_add_accel_group(GTK_WINDOW(find_frame_w), accel_group);
-
+
/* Container for each row of widgets */
main_vb = gtk_vbox_new(FALSE, 3);
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
gtk_container_add(GTK_CONTAINER(find_frame_w), main_vb);
gtk_widget_show(main_vb);
-
+
/* Filter row */
filter_hb = gtk_hbox_new(FALSE, 3);
gtk_container_add(GTK_CONTAINER(main_vb), filter_hb);
gtk_widget_show(filter_hb);
-
+
filter_bt = gtk_button_new_with_label("Filter:");
gtk_signal_connect(GTK_OBJECT(filter_bt), "clicked",
GTK_SIGNAL_FUNC(display_filter_construct_cb), &args);
gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, TRUE, 0);
gtk_widget_show(filter_bt);
-
+
filter_te = gtk_entry_new();
if (cfile.sfilter) gtk_entry_set_text(GTK_ENTRY(filter_te), cfile.sfilter);
gtk_object_set_data(GTK_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te);
gtk_box_pack_start(GTK_BOX(filter_hb), filter_te, TRUE, TRUE, 0);
gtk_widget_show(filter_te);
-
+
/* Misc row: Forward and reverse radio buttons */
direction_hb = gtk_hbox_new(FALSE, 3);
gtk_container_add(GTK_CONTAINER(main_vb), direction_hb);
@@ -259,9 +259,9 @@ find_previous_next(GtkWidget *w, gpointer d, gboolean sens)
dfilter_t *sfcode;
if (cfile.sfilter) {
- if (!dfilter_compile(cfile.sfilter, &sfcode))
+ if (!dfilter_compile(cfile.sfilter, &sfcode))
return;
- if (sfcode == NULL)
+ if (sfcode == NULL)
return;
cfile.sbackward = sens;
find_packet(&cfile, sfcode);
diff --git a/gtk/find_dlg.h b/gtk/find_dlg.h
index b2bfc5b..240d4af 100644
--- a/gtk/find_dlg.h
+++ b/gtk/find_dlg.h
@@ -1,23 +1,23 @@
/* find_dlg.h
* Definitions for "find frame" window
*
- * $Id: find_dlg.h,v 1.2 2002/05/03 21:55:15 guy Exp $
+ * $Id: find_dlg.h,v 1.3 2002/08/28 21:03:47 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c
index 1db5c57..4c9f8f5 100644
--- a/gtk/follow_dlg.c
+++ b/gtk/follow_dlg.c
@@ -1,6 +1,6 @@
/* follow_dlg.c
*
- * $Id: follow_dlg.c,v 1.24 2002/08/02 22:34:53 jmayer Exp $
+ * $Id: follow_dlg.c,v 1.25 2002/08/28 21:03:47 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -10,12 +10,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -470,7 +470,7 @@ follow_read_stream(follow_info_t *follow_info,
gboolean skip;
iplen = (follow_info->is_ipv6) ? 16 : 4;
-
+
data_out_file = fopen(follow_info->data_out_filename, "rb");
if (data_out_file) {
char buffer[FLT_BUF_SIZE];
@@ -524,7 +524,7 @@ follow_read_stream(follow_info_t *follow_info,
int i, cur;
/* is_server indentation : put 63 spaces at the begenning
* of the string */
- sprintf(hexbuf, (is_server &&
+ sprintf(hexbuf, (is_server &&
follow_info->show_stream == BOTH_HOSTS) ?
" "
" %08X " :
@@ -546,7 +546,7 @@ follow_read_stream(follow_info_t *follow_info,
/* Fill it up if column isn't complete */
if (i < 16) {
int j;
-
+
for (j = i; j < 16; j++) {
if (j == 7)
hexbuf[cur++] = ' ';
@@ -565,7 +565,7 @@ follow_read_stream(follow_info_t *follow_info,
buffer[current_pos + i] : '.' );
if (i == 7) {
hexbuf[cur++] = ' ';
- }
+ }
}
current_pos += i;
(*global_pos) += i;
diff --git a/gtk/follow_dlg.h b/gtk/follow_dlg.h
index 7c203b2..c955592 100644
--- a/gtk/follow_dlg.h
+++ b/gtk/follow_dlg.h
@@ -1,6 +1,6 @@
/* follow_dlg.c
*
- * $Id: follow_dlg.h,v 1.3 2000/09/08 10:59:12 guy Exp $
+ * $Id: follow_dlg.h,v 1.4 2002/08/28 21:03:47 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -10,12 +10,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c
index ba23ad7..fb7ea75 100644
--- a/gtk/goto_dlg.c
+++ b/gtk/goto_dlg.c
@@ -1,22 +1,22 @@
/* goto_dlg.c
* Routines for "go to frame" window
*
- * $Id: goto_dlg.c,v 1.15 2002/03/05 11:55:59 guy Exp $
+ * $Id: goto_dlg.c,v 1.16 2002/08/28 21:03:47 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -60,22 +60,22 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_)
*bbox, *ok_bt, *cancel_bt;
goto_frame_w = dlg_window_new("Ethereal: Go To Frame");
-
+
/* Container for each row of widgets */
main_vb = gtk_vbox_new(FALSE, 3);
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
gtk_container_add(GTK_CONTAINER(goto_frame_w), main_vb);
gtk_widget_show(main_vb);
-
+
/* Frame number row */
fnumber_hb = gtk_hbox_new(FALSE, 3);
gtk_container_add(GTK_CONTAINER(main_vb), fnumber_hb);
gtk_widget_show(fnumber_hb);
-
+
fnumber_lb = gtk_label_new("Frame number:");
gtk_box_pack_start(GTK_BOX(fnumber_hb), fnumber_lb, FALSE, FALSE, 0);
gtk_widget_show(fnumber_lb);
-
+
fnumber_te = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(fnumber_hb), fnumber_te, FALSE, FALSE, 0);
gtk_widget_show(fnumber_te);
diff --git a/gtk/goto_dlg.h b/gtk/goto_dlg.h
index fa5e6c5..c44c690 100644
--- a/gtk/goto_dlg.h
+++ b/gtk/goto_dlg.h
@@ -1,23 +1,23 @@
/* goto_dlg.h
* Definitions for "go to frame" window
*
- * $Id: goto_dlg.h,v 1.1 1999/11/08 01:03:40 guy Exp $
+ * $Id: goto_dlg.h,v 1.2 2002/08/28 21:03:47 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index c3c76a7..5ff86b7 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -1,6 +1,6 @@
/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald,
- * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org>
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald,
+ * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -22,7 +22,7 @@
* Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "config.h"
@@ -68,7 +68,7 @@
(((row) + 1) * CELL_SPACING) + \
(clist)->voffset)
-/* returns the row index from a y pixel location in the
+/* returns the row index from a y pixel location in the
* context of the clist's voffset */
#define ROW_FROM_YPIXEL(clist, y) (((y) - (clist)->voffset) / \
((clist)->row_height + CELL_SPACING))
@@ -78,7 +78,7 @@
#define COLUMN_LEFT_XPIXEL(clist, colnum) ((clist)->column[(colnum)].area.x + \
(clist)->hoffset)
-/* returns the column index from a x pixel location in the
+/* returns the column index from a x pixel location in the
* context of the clist's hoffset */
static inline gint
COLUMN_FROM_XPIXEL (GtkCList * clist,
@@ -115,7 +115,7 @@ COLUMN_FROM_XPIXEL (GtkCList * clist,
/* returns the total width of the list */
static inline gint
-LIST_WIDTH (GtkCList * clist)
+LIST_WIDTH (GtkCList * clist)
{
gint last_column;
@@ -215,7 +215,7 @@ static gint gtk_clist_button_press (GtkWidget *widget,
GdkEventButton *event);
static gint gtk_clist_button_release (GtkWidget *widget,
GdkEventButton *event);
-static gint gtk_clist_motion (GtkWidget *widget,
+static gint gtk_clist_motion (GtkWidget *widget,
GdkEventMotion *event);
static void gtk_clist_size_request (GtkWidget *widget,
GtkRequisition *requisition);
@@ -406,7 +406,7 @@ static void draw_drag_highlight (GtkCList *clist,
GtkCListRow *dest_row,
gint dest_row_number,
GtkCListDragPos drag_pos);
-
+
/* Size Allocation / Requisition */
static void size_allocate_title_buttons (GtkCList *clist);
static void size_allocate_columns (GtkCList *clist,
@@ -454,7 +454,7 @@ static gboolean title_focus (GtkCList *clist,
static void real_row_move (GtkCList *clist,
gint source_row,
gint dest_row);
-static gint column_title_passive_func (GtkWidget *widget,
+static gint column_title_passive_func (GtkWidget *widget,
GdkEvent *event,
gpointer data);
static void drag_dest_cell (GtkCList *clist,
@@ -539,7 +539,7 @@ gtk_clist_class_init (GtkCListClass *klass)
gtk_object_add_arg_type ("GtkCList::sort_type",
GTK_TYPE_SORT_TYPE,
GTK_ARG_READWRITE,
- ARG_SORT_TYPE);
+ ARG_SORT_TYPE);
object_class->set_arg = gtk_clist_set_arg;
object_class->get_arg = gtk_clist_get_arg;
object_class->destroy = gtk_clist_destroy;
@@ -1021,21 +1021,21 @@ gtk_clist_construct (GtkCList *clist,
clist->row_mem_chunk = g_mem_chunk_new ("clist row mem chunk",
sizeof (GtkCListRow),
sizeof (GtkCListRow) *
- CLIST_OPTIMUM_SIZE,
+ CLIST_OPTIMUM_SIZE,
G_ALLOC_AND_FREE);
if (!clist->cell_mem_chunk)
clist->cell_mem_chunk = g_mem_chunk_new ("clist cell mem chunk",
sizeof (GtkCell) * columns,
sizeof (GtkCell) * columns *
- CLIST_OPTIMUM_SIZE,
+ CLIST_OPTIMUM_SIZE,
G_ALLOC_AND_FREE);
/* set number of columns, allocate memory */
clist->columns = columns;
clist->column = columns_new (clist);
- /* there needs to be at least one column button
+ /* there needs to be at least one column button
* because there is alot of code that will break if it
* isn't there*/
column_button_create (clist, 0);
@@ -1043,7 +1043,7 @@ gtk_clist_construct (GtkCList *clist,
if (titles)
{
gint i;
-
+
GTK_CLIST_SET_FLAG (clist, CLIST_SHOW_TITLES);
for (i = 0; i < columns; i++)
gtk_clist_set_column_title (clist, i, titles[i]);
@@ -1071,7 +1071,7 @@ gtk_clist_new (gint columns)
{
return gtk_clist_new_with_titles (columns, NULL);
}
-
+
GtkWidget*
gtk_clist_new_with_titles (gint columns,
gchar *titles[])
@@ -1094,10 +1094,10 @@ gtk_clist_set_hadjustment (GtkCList *clist,
g_return_if_fail (GTK_IS_CLIST (clist));
if (adjustment)
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-
+
if (clist->hadjustment == adjustment)
return;
-
+
old_adjustment = clist->hadjustment;
if (clist->hadjustment)
@@ -1147,7 +1147,7 @@ gtk_clist_set_vadjustment (GtkCList *clist,
if (clist->vadjustment == adjustment)
return;
-
+
old_adjustment = clist->vadjustment;
if (clist->vadjustment)
@@ -1297,7 +1297,7 @@ gtk_clist_column_titles_show (GtkCList *clist)
}
}
-void
+void
gtk_clist_column_titles_hide (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
@@ -1617,7 +1617,7 @@ gtk_clist_set_column_visibility (GtkCList *clist,
else
gtk_widget_hide (clist->column[column].button);
}
-
+
gtk_widget_queue_resize (GTK_WIDGET(clist));
}
@@ -1784,7 +1784,7 @@ gtk_clist_set_column_max_width (GtkCList *clist,
clist->column[column].max_width = clist->column[column].min_width;
else
clist->column[column].max_width = max_width;
-
+
if (clist->column[column].area.width > clist->column[column].max_width)
gtk_clist_set_column_width (clist, column,clist->column[column].max_width);
}
@@ -1860,7 +1860,7 @@ real_resize_column (GtkCList *clist,
if (column < 0 || column >= clist->columns)
return;
-
+
if (width < MAX (COLUMN_MIN_WIDTH, clist->column[column].min_width))
width = MAX (COLUMN_MIN_WIDTH, clist->column[column].min_width);
if (clist->column[column].max_width >= 0 &&
@@ -1952,7 +1952,7 @@ size_allocate_title_buttons (GtkCList *clist)
{
gdk_window_show (clist->column[last_button].window);
gdk_window_move_resize (clist->column[last_button].window,
- button_allocation.x - (DRAG_WIDTH / 2),
+ button_allocation.x - (DRAG_WIDTH / 2),
0, DRAG_WIDTH,
clist->column_title_area.height);
}
@@ -1973,7 +1973,7 @@ size_allocate_title_buttons (GtkCList *clist)
gdk_window_show (clist->column[last_button].window);
gdk_window_move_resize (clist->column[last_button].window,
- button_allocation.x - (DRAG_WIDTH / 2),
+ button_allocation.x - (DRAG_WIDTH / 2),
0, DRAG_WIDTH, clist->column_title_area.height);
}
else
@@ -2031,7 +2031,7 @@ size_allocate_columns (GtkCList *clist,
}
static gint
-list_requisition_width (GtkCList *clist)
+list_requisition_width (GtkCList *clist)
{
gint width = CELL_SPACING;
gint i;
@@ -2089,7 +2089,7 @@ new_column_width (GtkCList *clist,
width = clist->column[column].max_width;
cx = dx + clist->column[column].max_width;
*x = cx + xthickness;
- }
+ }
if (cx < 0 || cx > clist->clist_window_width)
*x = -1;
@@ -2139,12 +2139,12 @@ column_button_clicked (GtkWidget *widget,
}
static gint
-column_title_passive_func (GtkWidget *widget _U_,
+column_title_passive_func (GtkWidget *widget _U_,
GdkEvent *event,
gpointer data _U_)
{
g_return_val_if_fail (event != NULL, FALSE);
-
+
switch (event->type)
{
case GDK_MOTION_NOTIFY:
@@ -2172,7 +2172,7 @@ column_title_passive_func (GtkWidget *widget _U_,
* gtk_clist_get_pixtext
* gtk_clist_set_shift
*/
-GtkCellType
+GtkCellType
gtk_clist_get_cell_type (GtkCList *clist,
gint row,
gint column)
@@ -2267,11 +2267,11 @@ gtk_clist_set_pixmap (GtkCList *clist,
return;
clist_row = ROW_ELEMENT (clist, row)->data;
-
+
gdk_pixmap_ref (pixmap);
-
+
if (mask) gdk_pixmap_ref (mask);
-
+
GTK_CLIST_CLASS_FW (clist)->set_cell_contents
(clist, clist_row, column, GTK_CELL_PIXMAP, NULL, 0, pixmap, mask);
@@ -2335,7 +2335,7 @@ gtk_clist_set_pixtext (GtkCList *clist,
return;
clist_row = ROW_ELEMENT (clist, row)->data;
-
+
gdk_pixmap_ref (pixmap);
if (mask) gdk_pixmap_ref (mask);
GTK_CLIST_CLASS_FW (clist)->set_cell_contents
@@ -2617,7 +2617,7 @@ gtk_clist_clear (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
-
+
GTK_CLIST_CLASS_FW (clist)->clear (clist);
}
@@ -2662,10 +2662,10 @@ real_insert_row (GtkCList *clist,
if (GTK_CLIST_AUTO_SORT(clist)) /* override insertion pos */
{
GList *work;
-
+
row = 0;
work = clist->row_list;
-
+
if (clist->sort_type == GTK_SORT_ASCENDING)
{
while (row < clist->rows &&
@@ -2687,7 +2687,7 @@ real_insert_row (GtkCList *clist,
}
}
}
-
+
/* reset the row end pointer if we're inserting at the end of the list */
if (row == clist->rows)
clist->row_list_end = (g_list_append (clist->row_list_end,
@@ -2903,7 +2903,7 @@ real_row_move (GtkCList *clist,
last >= GPOINTER_TO_INT (list->data))
list->data = GINT_TO_POINTER (GPOINTER_TO_INT (list->data) + d);
}
-
+
if (clist->focus_row == source_row)
clist->focus_row = dest_row;
else if (clist->focus_row > first)
@@ -2954,7 +2954,7 @@ gtk_clist_moveto (GtkCList *clist,
if (x < 0)
gtk_adjustment_set_value (clist->hadjustment, 0.0);
else if (x > LIST_WIDTH (clist) - clist->clist_window_width)
- gtk_adjustment_set_value
+ gtk_adjustment_set_value
(clist->hadjustment, LIST_WIDTH (clist) - clist->clist_window_width);
else
gtk_adjustment_set_value (clist->hadjustment, x);
@@ -3000,7 +3000,7 @@ gtk_clist_set_row_height (GtkCList *clist,
widget->style->font->ascent -
widget->style->font->descent - 1) / 2;
}
-
+
CLIST_REFRESH (clist);
}
@@ -3030,7 +3030,7 @@ gtk_clist_set_row_data_full (GtkCList *clist,
if (clist_row->destroy)
clist_row->destroy (clist_row->data);
-
+
clist_row->data = data;
clist_row->destroy = destroy;
}
@@ -3068,9 +3068,9 @@ gtk_clist_find_row_from_data (GtkCList *clist,
return -1;
}
-void
+void
gtk_clist_swap_rows (GtkCList *clist,
- gint row1,
+ gint row1,
gint row2)
{
gint first, last;
@@ -3089,7 +3089,7 @@ gtk_clist_swap_rows (GtkCList *clist,
gtk_clist_row_move (clist, last, first);
gtk_clist_row_move (clist, first + 1, last);
-
+
gtk_clist_thaw (clist);
}
@@ -3249,7 +3249,7 @@ gtk_clist_set_cell_style (GtkCList *clist,
if (clist_row->cell[column].style)
{
gtk_style_ref (clist_row->cell[column].style);
-
+
if (GTK_WIDGET_REALIZED (clist))
clist_row->cell[column].style =
gtk_style_attach (clist_row->cell[column].style,
@@ -3330,7 +3330,7 @@ gtk_clist_set_row_style (GtkCList *clist,
if (clist_row->style)
{
gtk_style_ref (clist_row->style);
-
+
if (GTK_WIDGET_REALIZED (clist))
clist_row->style = gtk_style_attach (clist_row->style,
clist->clist_window);
@@ -3407,7 +3407,7 @@ gtk_clist_set_selectable (GtkCList *clist,
}
gtk_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW],
row, -1, NULL);
- }
+ }
}
gboolean
@@ -3555,12 +3555,12 @@ fake_toggle_row (GtkCList *clist,
if (!work || !GTK_CLIST_ROW (work)->selectable)
return;
-
+
if (GTK_CLIST_ROW (work)->state == GTK_STATE_NORMAL)
clist->anchor_state = GTK_CLIST_ROW (work)->state = GTK_STATE_SELECTED;
else
clist->anchor_state = GTK_CLIST_ROW (work)->state = GTK_STATE_NORMAL;
-
+
if (CLIST_UNFROZEN (clist) &&
gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE)
GTK_CLIST_CLASS_FW (clist)->draw_row (clist, NULL, row,
@@ -3592,7 +3592,7 @@ toggle_focus_row (GtkCList *clist)
clist->anchor = clist->focus_row;
clist->drag_pos = clist->focus_row;
clist->undo_anchor = clist->focus_row;
-
+
if (GTK_CLIST_ADD_MODE(clist))
fake_toggle_row (clist, clist->focus_row);
else
@@ -3610,7 +3610,7 @@ toggle_add_mode (GtkCList *clist)
{
g_return_if_fail (clist != 0);
g_return_if_fail (GTK_IS_CLIST (clist));
-
+
if ((gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (clist)) ||
clist->selection_mode != GTK_SELECTION_EXTENDED)
return;
@@ -3665,13 +3665,13 @@ real_select_row (GtkCList *clist,
if (row == sel_row)
row_selected = TRUE;
else
- gtk_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW],
+ gtk_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW],
sel_row, column, event);
}
if (row_selected)
return;
-
+
default:
break;
}
@@ -3689,9 +3689,9 @@ real_select_row (GtkCList *clist,
clist->selection_end = clist->selection;
}
else
- clist->selection_end =
+ clist->selection_end =
g_list_append (clist->selection_end, GINT_TO_POINTER (row))->next;
-
+
if (CLIST_UNFROZEN (clist)
&& (gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE))
GTK_CLIST_CLASS_FW (clist)->draw_row (clist, NULL, row, clist_row);
@@ -3717,13 +3717,13 @@ real_unselect_row (GtkCList *clist,
{
clist_row->state = GTK_STATE_NORMAL;
- if (clist->selection_end &&
+ if (clist->selection_end &&
clist->selection_end->data == GINT_TO_POINTER (row))
clist->selection_end = clist->selection_end->prev;
clist->selection = g_list_remove (clist->selection,
GINT_TO_POINTER (row));
-
+
if (CLIST_UNFROZEN (clist)
&& (gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE))
GTK_CLIST_CLASS_FW (clist)->draw_row (clist, NULL, row, clist_row);
@@ -3735,7 +3735,7 @@ real_select_all (GtkCList *clist)
{
GList *list;
gint i;
-
+
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
@@ -3753,7 +3753,7 @@ real_select_all (GtkCList *clist)
g_list_free (clist->undo_unselection);
clist->undo_selection = NULL;
clist->undo_unselection = NULL;
-
+
if (clist->rows &&
((GtkCListRow *) (clist->row_list->data))->state !=
GTK_STATE_SELECTED)
@@ -3783,7 +3783,7 @@ real_unselect_all (GtkCList *clist)
{
GList *list;
gint i;
-
+
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
@@ -3839,12 +3839,12 @@ fake_unselect_all (GtkCList *clist,
GTK_CLIST_ROW (work)->selectable)
{
GTK_CLIST_ROW (work)->state = GTK_STATE_SELECTED;
-
+
if (CLIST_UNFROZEN (clist) &&
gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE)
GTK_CLIST_CLASS_FW (clist)->draw_row (clist, NULL, row,
GTK_CLIST_ROW (work));
- }
+ }
}
clist->undo_selection = clist->selection;
@@ -3892,7 +3892,7 @@ real_undo_selection (GtkCList *clist)
for (work = clist->undo_unselection; work; work = work->next)
{
/* g_print ("unselect %d\n",GPOINTER_TO_INT (work->data)); */
- gtk_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW],
+ gtk_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW],
GPOINTER_TO_INT (work->data), -1, NULL);
}
@@ -3904,9 +3904,9 @@ real_undo_selection (GtkCList *clist)
}
else
clist->focus_row = clist->undo_anchor;
-
+
clist->undo_anchor = -1;
-
+
g_list_free (clist->undo_selection);
g_list_free (clist->undo_unselection);
clist->undo_selection = NULL;
@@ -3927,7 +3927,7 @@ set_anchor (GtkCList *clist,
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
-
+
if (clist->selection_mode != GTK_SELECTION_EXTENDED || clist->anchor >= 0)
return;
@@ -3995,7 +3995,7 @@ resync_selection (GtkCList *clist,
}
}
}
- }
+ }
if (clist->anchor < clist->drag_pos)
{
@@ -4053,7 +4053,7 @@ resync_selection (GtkCList *clist,
}
}
}
-
+
clist->undo_unselection = g_list_reverse (clist->undo_unselection);
for (list = clist->undo_unselection; list; list = list->next)
gtk_signal_emit (GTK_OBJECT (clist), clist_signals[SELECT_ROW],
@@ -4288,7 +4288,7 @@ sync_selection (GtkCList *clist,
d = 1;
else
d = -1;
-
+
if (clist->focus_row >= row)
{
if (d > 0 || clist->focus_row > row)
@@ -4431,7 +4431,7 @@ gtk_clist_realize (GtkWidget *widget)
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
border_width = GTK_CONTAINER (widget)->border_width;
-
+
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x + border_width;
attributes.y = widget->allocation.y + border_width;
@@ -4463,7 +4463,7 @@ gtk_clist_realize (GtkWidget *widget)
attributes.y = clist->column_title_area.y;
attributes.width = clist->column_title_area.width;
attributes.height = clist->column_title_area.height;
-
+
clist->title_window = gdk_window_new (widget->window, &attributes,
attributes_mask);
gdk_window_set_user_data (clist->title_window, clist);
@@ -4486,7 +4486,7 @@ gtk_clist_realize (GtkWidget *widget)
clist->column_title_area.height);
attributes.width = clist->clist_window_width;
attributes.height = clist->clist_window_height;
-
+
clist->clist_window = gdk_window_new (widget->window, &attributes,
attributes_mask);
gdk_window_set_user_data (clist->clist_window, clist);
@@ -4528,7 +4528,7 @@ gtk_clist_realize (GtkWidget *widget)
/* GCs */
clist->fg_gc = gdk_gc_new (widget->window);
clist->bg_gc = gdk_gc_new (widget->window);
-
+
/* We'll use this gc to do scrolling as well */
gdk_gc_set_exposures (clist->fg_gc, TRUE);
@@ -4563,7 +4563,7 @@ gtk_clist_realize (GtkWidget *widget)
if (clist_row->bg_set)
gdk_color_alloc (colormap, &clist_row->background);
}
-
+
for (j = 0; j < clist->columns; j++)
if (clist_row->cell[j].style)
clist_row->cell[j].style =
@@ -4668,7 +4668,7 @@ gtk_clist_map (GtkWidget *widget)
!GTK_WIDGET_MAPPED (clist->column[i].button))
gtk_widget_map (clist->column[i].button);
}
-
+
for (i = 0; i < clist->columns; i++)
if (clist->column[i].window && clist->column[i].button)
{
@@ -4761,14 +4761,14 @@ gtk_clist_draw (GtkWidget *widget,
border_width = GTK_CONTAINER (widget)->border_width;
gdk_window_clear_area (widget->window,
- area->x - border_width,
+ area->x - border_width,
area->y - border_width,
area->width, area->height);
/* draw list shadow/border */
gtk_draw_shadow (widget->style, widget->window,
GTK_STATE_NORMAL, clist->shadow_type,
- 0, 0,
+ 0, 0,
clist->clist_window_width +
(2 * widget->style->klass->xthickness),
clist->clist_window_height +
@@ -5032,7 +5032,7 @@ gtk_clist_button_press (GtkWidget *widget,
row, column, event);
break;
}
-
+
if (event->state & GDK_CONTROL_MASK)
{
if (event->state & GDK_SHIFT_MASK)
@@ -5237,7 +5237,7 @@ gtk_clist_motion (GtkWidget *widget,
gtk_widget_get_pointer (widget, &x, NULL);
else
x = event->x;
-
+
new_width = new_column_width (clist, clist->drag_pos, &x);
if (x != clist->x_drag)
{
@@ -5285,7 +5285,7 @@ gtk_clist_motion (GtkWidget *widget,
y >= (ROW_TOP_YPIXEL (clist, clist->click_cell.row) +
clist->row_height) ||
x < COLUMN_LEFT_XPIXEL (clist, clist->click_cell.column) ||
- x >= (COLUMN_LEFT_XPIXEL(clist, clist->click_cell.column) +
+ x >= (COLUMN_LEFT_XPIXEL(clist, clist->click_cell.column) +
clist->column[clist->click_cell.column].area.width)))
{
GtkTargetList *target_list;
@@ -5372,7 +5372,7 @@ gtk_clist_motion (GtkWidget *widget,
break;
}
}
-
+
if (ROW_TOP_YPIXEL(clist, row) < 0)
move_vertical (clist, row, 0);
else if (ROW_TOP_YPIXEL(clist, row) + clist->row_height >
@@ -5405,7 +5405,7 @@ gtk_clist_size_request (GtkWidget *widget,
if (clist->column[i].button)
{
GtkRequisition child_requisition;
-
+
gtk_widget_size_request (clist->column[i].button,
&child_requisition);
clist->column_title_area.height =
@@ -5459,22 +5459,22 @@ gtk_clist_size_allocate (GtkWidget *widget,
border_width * 2);
clist->internal_allocation.height = MAX (1, (gint)allocation->height -
border_width * 2);
-
+
/* allocate clist window assuming no scrollbars */
clist_allocation.x = (clist->internal_allocation.x +
widget->style->klass->xthickness);
clist_allocation.y = (clist->internal_allocation.y +
widget->style->klass->ythickness +
clist->column_title_area.height);
- clist_allocation.width = MAX (1, (gint)clist->internal_allocation.width -
+ clist_allocation.width = MAX (1, (gint)clist->internal_allocation.width -
(2 * (gint)widget->style->klass->xthickness));
clist_allocation.height = MAX (1, (gint)clist->internal_allocation.height -
(2 * (gint)widget->style->klass->ythickness) -
(gint)clist->column_title_area.height);
-
+
clist->clist_window_width = clist_allocation.width;
clist->clist_window_height = clist_allocation.height;
-
+
if (GTK_WIDGET_REALIZED (widget))
{
gdk_window_move_resize (clist->clist_window,
@@ -5483,12 +5483,12 @@ gtk_clist_size_allocate (GtkWidget *widget,
clist_allocation.width,
clist_allocation.height);
}
-
+
/* position the window which holds the column title buttons */
clist->column_title_area.x = widget->style->klass->xthickness;
clist->column_title_area.y = widget->style->klass->ythickness;
clist->column_title_area.width = clist_allocation.width;
-
+
if (GTK_WIDGET_REALIZED (widget))
{
gdk_window_move_resize (clist->title_window,
@@ -5497,7 +5497,7 @@ gtk_clist_size_allocate (GtkWidget *widget,
clist->column_title_area.width,
clist->column_title_area.height);
}
-
+
/* column button allocation */
size_allocate_columns (clist, FALSE);
size_allocate_title_buttons (clist);
@@ -5525,7 +5525,7 @@ gtk_clist_forall (GtkContainer *container,
return;
clist = GTK_CLIST (container);
-
+
/* callback for the column buttons */
for (i = 0; i < clist->columns; i++)
if (clist->column[i].button)
@@ -5694,7 +5694,7 @@ draw_row (GtkCList *clist,
cell_rectangle.height = CELL_SPACING;
/* rectangle used to clip drawing operations, its y and height
- * positions only need to be set once, so we set them once here.
+ * positions only need to be set once, so we set them once here.
* the x and width are set withing the drawing loop below once per
* column */
clip_rectangle.y = row_rectangle.y;
@@ -5766,10 +5766,10 @@ draw_row (GtkCList *clist,
cell_rectangle.x,
cell_rectangle.y,
cell_rectangle.width,
- cell_rectangle.height);
- }
+ cell_rectangle.height);
+ }
}
-
+
for (last_column = clist->columns - 1;
last_column >= 0 && !clist->column[last_column].visible; last_column--)
;
@@ -5799,7 +5799,7 @@ draw_row (GtkCList *clist,
clip_rectangle.x -= COLUMN_INSET + CELL_SPACING;
clip_rectangle.width += (2 * COLUMN_INSET + CELL_SPACING +
(i == last_column) * CELL_SPACING);
-
+
if (area && !gdk_rectangle_intersect (area, &clip_rectangle,
&intersect_rectangle))
continue;
@@ -5888,7 +5888,7 @@ draw_row (GtkCList *clist,
gdk_gc_set_clip_rectangle (fg_gc, &clip_rectangle);
gdk_draw_string (clist->clist_window, style->font, fg_gc,
offset,
- row_rectangle.y + row_center_offset +
+ row_rectangle.y + row_center_offset +
clist_row->cell[i].vertical,
(clist_row->cell[i].type == GTK_CELL_PIXTEXT) ?
GTK_CELL_PIXTEXT (clist_row->cell[i])->text :
@@ -5975,7 +5975,7 @@ draw_rows (GtkCList *clist,
ROW_TOP_YPIXEL (clist, i), 0, 0);
}
-static void
+static void
draw_xor_line (GtkCList *clist)
{
GtkWidget *widget;
@@ -5997,9 +5997,9 @@ clist_refresh (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
-
+
if (CLIST_UNFROZEN (clist))
- {
+ {
adjust_adjustments (clist, FALSE);
draw_rows (clist, NULL);
}
@@ -6021,7 +6021,7 @@ get_selection_info (GtkCList *clist,
g_return_val_if_fail (clist != NULL, 0);
g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
- /* bounds checking, return false if the user clicked
+ /* bounds checking, return false if the user clicked
* on a blank area */
trow = ROW_FROM_YPIXEL (clist, y);
if (trow >= clist->rows)
@@ -6041,10 +6041,10 @@ get_selection_info (GtkCList *clist,
}
gint
-gtk_clist_get_selection_info (GtkCList *clist,
- gint x,
- gint y,
- gint *row,
+gtk_clist_get_selection_info (GtkCList *clist,
+ gint x,
+ gint y,
+ gint *row,
gint *column)
{
g_return_val_if_fail (clist != NULL, 0);
@@ -6057,7 +6057,7 @@ gtk_clist_get_selection_info (GtkCList *clist,
* vadjustment_changed
* hadjustment_changed
* vadjustment_value_changed
- * hadjustment_value_changed
+ * hadjustment_value_changed
* check_exposures
*/
static void
@@ -6245,18 +6245,18 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
if (clist->column[i].button)
{
clist->column[i].button->allocation.x -= value + clist->hoffset;
-
+
if (clist->column[i].button->window)
{
gdk_window_move (clist->column[i].button->window,
clist->column[i].button->allocation.x,
clist->column[i].button->allocation.y);
-
+
if (clist->column[i].window)
gdk_window_move (clist->column[i].window,
clist->column[i].button->allocation.x +
- clist->column[i].button->allocation.width -
- (DRAG_WIDTH / 2), 0);
+ clist->column[i].button->allocation.width -
+ (DRAG_WIDTH / 2), 0);
}
}
}
@@ -6265,9 +6265,9 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
{
/* scroll right */
diff = value + clist->hoffset;
-
+
clist->hoffset = -value;
-
+
/* we have to re-draw the whole screen here... */
if (diff >= clist->clist_window_width)
{
@@ -6279,7 +6279,7 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
!GTK_CLIST_CHILD_HAS_FOCUS(clist) && GTK_CLIST_ADD_MODE(clist))
{
y = ROW_TOP_YPIXEL (clist, clist->focus_row);
-
+
gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE, 0, y,
clist->clist_window_width - 1,
clist->row_height - 1);
@@ -6302,19 +6302,19 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
return;
clist->hoffset = -value;
-
+
/* we have to re-draw the whole screen here... */
if (diff >= clist->clist_window_width)
{
draw_rows (clist, NULL);
return;
}
-
+
if (GTK_WIDGET_CAN_FOCUS(clist) && GTK_WIDGET_HAS_FOCUS(clist) &&
!GTK_CLIST_CHILD_HAS_FOCUS(clist) && GTK_CLIST_ADD_MODE(clist))
{
y = ROW_TOP_YPIXEL (clist, clist->focus_row);
-
+
gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE, 0, y,
clist->clist_window_width - 1,
clist->row_height - 1);
@@ -6328,7 +6328,7 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
0,
clist->clist_window_width - diff,
clist->clist_window_height);
-
+
area.x = 0;
}
@@ -6344,12 +6344,12 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
if (GTK_CLIST_ADD_MODE(clist))
{
gint focus_row;
-
+
focus_row = clist->focus_row;
clist->focus_row = -1;
draw_rows (clist, &area);
clist->focus_row = focus_row;
-
+
gdk_draw_rectangle (clist->clist_window, clist->xor_gc,
FALSE, 0, y, clist->clist_window_width - 1,
clist->row_height - 1);
@@ -6359,7 +6359,7 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
{
gint x0;
gint x1;
-
+
if (area.x == 0)
{
x0 = clist->clist_window_width - 1;
@@ -6370,13 +6370,13 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
x0 = 0;
x1 = area.x - 1;
}
-
+
y = ROW_TOP_YPIXEL (clist, clist->focus_row);
gdk_draw_line (clist->clist_window, clist->xor_gc,
x0, y + 1, x0, y + clist->row_height - 2);
gdk_draw_line (clist->clist_window, clist->xor_gc,
x1, y + 1, x1, y + clist->row_height - 2);
-
+
}
}
draw_rows (clist, &area);
@@ -6404,7 +6404,7 @@ check_exposures (GtkCList *clist)
}
}
-/* PRIVATE
+/* PRIVATE
* Memory Allocation/Distruction Routines for GtkCList stuctures
*
* functions:
@@ -6464,7 +6464,7 @@ columns_delete (GtkCList *clist)
for (i = 0; i < clist->columns; i++)
if (clist->column[i].title)
g_free (clist->column[i].title);
-
+
g_free (clist->column);
}
@@ -6549,7 +6549,7 @@ gtk_clist_focus (GtkContainer *container,
if (!GTK_WIDGET_IS_SENSITIVE (container))
return FALSE;
-
+
clist = GTK_CLIST (container);
focus_child = container->focus_child;
old_row = clist->focus_row;
@@ -6595,7 +6595,7 @@ gtk_clist_focus (GtkContainer *container,
if (tf)
return TRUE;
}
-
+
GTK_CLIST_SET_FLAG (clist, CLIST_CHILD_HAS_FOCUS);
break;
case GTK_DIR_UP:
@@ -6697,7 +6697,7 @@ gtk_clist_focus_out (GtkWidget *widget,
GTK_CLIST_SET_FLAG (widget, CLIST_CHILD_HAS_FOCUS);
gtk_widget_draw_focus (widget);
-
+
clist = GTK_CLIST (widget);
GTK_CLIST_CLASS_FW (widget)->resync_selection (clist, (GdkEvent *) event);
@@ -6740,7 +6740,7 @@ title_focus (GtkCList *clist,
for (last_column = clist->columns - 1;
last_column >= 0 && !clist->column[last_column].visible; last_column--)
;
-
+
switch (dir)
{
case GTK_DIR_TAB_BACKWARD:
@@ -6779,11 +6779,11 @@ title_focus (GtkCList *clist,
{
if (clist->column[i].button == focus_child)
{
- if (clist->column[i].button &&
+ if (clist->column[i].button &&
GTK_WIDGET_VISIBLE (clist->column[i].button) &&
GTK_IS_CONTAINER (clist->column[i].button) &&
!GTK_WIDGET_HAS_FOCUS(clist->column[i].button))
- if (gtk_container_focus
+ if (gtk_container_focus
(GTK_CONTAINER (clist->column[i].button), dir))
{
return_val = TRUE;
@@ -6806,7 +6806,7 @@ title_focus (GtkCList *clist,
GTK_WIDGET_VISIBLE (clist->column[j].button))
{
if (GTK_IS_CONTAINER (clist->column[j].button) &&
- gtk_container_focus
+ gtk_container_focus
(GTK_CONTAINER (clist->column[j].button), dir))
{
return_val = TRUE;
@@ -6821,7 +6821,7 @@ title_focus (GtkCList *clist,
}
j += d;
}
-
+
if (return_val)
{
if (COLUMN_LEFT_XPIXEL (clist, j) < CELL_SPACING + COLUMN_INSET)
@@ -6882,7 +6882,7 @@ move_focus_row (GtkCList *clist,
gtk_clist_draw_focus (widget);
clist->focus_row = MAX (0, clist->focus_row -
(2 * clist->clist_window_height -
- clist->row_height - CELL_SPACING) /
+ clist->row_height - CELL_SPACING) /
(2 * (clist->row_height + CELL_SPACING)));
gtk_clist_draw_focus (widget);
break;
@@ -6890,9 +6890,9 @@ move_focus_row (GtkCList *clist,
if (clist->focus_row >= clist->rows - 1)
return;
gtk_clist_draw_focus (widget);
- clist->focus_row = MIN (clist->rows - 1, clist->focus_row +
+ clist->focus_row = MIN (clist->rows - 1, clist->focus_row +
(2 * clist->clist_window_height -
- clist->row_height - CELL_SPACING) /
+ clist->row_height - CELL_SPACING) /
(2 * (clist->row_height + CELL_SPACING)));
gtk_clist_draw_focus (widget);
break;
@@ -7132,7 +7132,7 @@ horizontal_timeout (GtkCList *clist)
gtk_clist_motion (GTK_WIDGET (clist), &event);
GDK_THREADS_LEAVE ();
-
+
return FALSE;
}
@@ -7204,13 +7204,13 @@ gtk_clist_set_compare_func (GtkCList *clist,
clist->compare = (cmp_func) ? cmp_func : default_compare;
}
-void
+void
gtk_clist_set_auto_sort (GtkCList *clist,
gboolean auto_sort)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
-
+
if (GTK_CLIST_AUTO_SORT(clist) && !auto_sort)
GTK_CLIST_UNSET_FLAG (clist, CLIST_AUTO_SORT);
else if (!GTK_CLIST_AUTO_SORT(clist) && auto_sort)
@@ -7220,13 +7220,13 @@ gtk_clist_set_auto_sort (GtkCList *clist,
}
}
-void
+void
gtk_clist_set_sort_type (GtkCList *clist,
GtkSortType sort_type)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
-
+
clist->sort_type = sort_type;
}
@@ -7271,7 +7271,7 @@ default_compare (GtkCList *clist,
default:
break;
}
-
+
switch (row2->cell[clist->sort_column].type)
{
case GTK_CELL_TEXT:
@@ -7319,7 +7319,7 @@ real_sort_list (GtkCList *clist)
clist->undo_selection = NULL;
clist->undo_unselection = NULL;
}
-
+
clist->row_list = gtk_clist_mergesort (clist, clist->row_list, clist->rows);
work = clist->selection;
@@ -7331,7 +7331,7 @@ real_sort_list (GtkCList *clist)
work->data = GINT_TO_POINTER (i);
work = work->next;
}
-
+
if (i == clist->rows - 1)
clist->row_list_end = list;
}
@@ -7475,7 +7475,7 @@ drag_dest_cell (GtkCList *clist,
gint h = 0;
y_delta = y - ROW_TOP_YPIXEL (clist, dest_info->cell.row);
-
+
if (GTK_CLIST_DRAW_DRAG_RECT(clist))
{
dest_info->insert_pos = GTK_CLIST_DRAG_INTO;
@@ -7578,7 +7578,7 @@ gtk_clist_drag_leave (GtkWidget *widget,
clist = GTK_CLIST (widget);
dest_info = g_dataset_get_data (context, "gtk-clist-drag-dest");
-
+
if (dest_info)
{
if (dest_info->cell.row >= 0 &&
@@ -7668,7 +7668,7 @@ gtk_clist_drag_motion (GtkWidget *widget,
}
return TRUE;
}
-
+
if (new_info.cell.row != dest_info->cell.row ||
(new_info.cell.row == dest_info->cell.row &&
dest_info->insert_pos != new_info.insert_pos))
@@ -7682,7 +7682,7 @@ gtk_clist_drag_motion (GtkWidget *widget,
dest_info->insert_pos = new_info.insert_pos;
dest_info->cell.row = new_info.cell.row;
dest_info->cell.column = new_info.cell.column;
-
+
GTK_CLIST_CLASS_FW (clist)->draw_drag_highlight
(clist, g_list_nth (clist->row_list,
dest_info->cell.row)->data,
@@ -7774,7 +7774,7 @@ gtk_clist_drag_data_received (GtkWidget *widget,
}
}
-static void
+static void
gtk_clist_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
@@ -7838,7 +7838,7 @@ draw_drag_highlight (GtkCList *clist,
}
void
-gtk_clist_set_reorderable (GtkCList *clist,
+gtk_clist_set_reorderable (GtkCList *clist,
gboolean reorderable)
{
GtkWidget *widget;
@@ -7885,7 +7885,7 @@ gtk_clist_set_button_actions (GtkCList *clist,
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
-
+
if (button < MAX_BUTTON)
{
if (gdk_pointer_is_grabbed () || GTK_WIDGET_HAS_GRAB (clist))
diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index a6446ec..06c724f 100644
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -22,7 +22,7 @@
* Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_CLIST_H__
@@ -54,7 +54,7 @@ enum {
GTK_CLIST_USE_DRAG_ICONS = 1 << 8,
GTK_CLIST_DRAW_DRAG_LINE = 1 << 9,
GTK_CLIST_DRAW_DRAG_RECT = 1 << 10
-};
+};
/* cell types */
typedef enum
@@ -145,58 +145,58 @@ struct _GtkCListDestInfo
struct _GtkCList
{
GtkContainer container;
-
+
guint16 flags;
-
+
/* mem chunks */
GMemChunk *row_mem_chunk;
GMemChunk *cell_mem_chunk;
guint freeze_count;
-
+
/* allocation rectangle after the conatiner_border_width
* and the width of the shadow border */
GdkRectangle internal_allocation;
-
+
/* rows */
gint rows;
gint row_center_offset;
gint row_height;
GList *row_list;
GList *row_list_end;
-
+
/* columns */
gint columns;
GdkRectangle column_title_area;
GdkWindow *title_window;
-
+
/* dynamicly allocated array of column structures */
GtkCListColumn *column;
-
+
/* the scrolling window and its height and width to
* make things a little speedier */
GdkWindow *clist_window;
gint clist_window_width;
gint clist_window_height;
-
+
/* offsets for scrolling */
gint hoffset;
gint voffset;
-
+
/* border shadow style */
GtkShadowType shadow_type;
-
+
/* the list's selection mode (gtkenums.h) */
GtkSelectionMode selection_mode;
-
+
/* list of selected rows */
GList *selection;
GList *selection_end;
-
+
GList *undo_selection;
GList *undo_unselection;
gint undo_anchor;
-
+
/* mouse buttons */
guint8 button_actions[5];
@@ -208,30 +208,30 @@ struct _GtkCList
/* scroll adjustments */
GtkAdjustment *hadjustment;
GtkAdjustment *vadjustment;
-
+
/* xor GC for the vertical drag line */
GdkGC *xor_gc;
-
+
/* gc for drawing unselected cells */
GdkGC *fg_gc;
GdkGC *bg_gc;
-
+
/* cursor used to indicate dragging */
GdkCursor *cursor_drag;
-
+
/* the current x-pixel location of the xor-drag line */
gint x_drag;
-
+
/* focus handling */
gint focus_row;
-
+
/* dragging the selection */
gint anchor;
GtkStateType anchor_state;
gint drag_pos;
gint htimer;
gint vtimer;
-
+
GtkSortType sort_type;
GtkCListCompareFunc compare;
gint sort_column;
@@ -240,7 +240,7 @@ struct _GtkCList
struct _GtkCListClass
{
GtkContainerClass parent_class;
-
+
void (*set_scroll_adjustments) (GtkCList *clist,
GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment);
@@ -320,16 +320,16 @@ struct _GtkCListColumn
{
gchar *title;
GdkRectangle area;
-
+
GtkWidget *button;
GdkWindow *window;
-
+
gint width;
gint min_width;
gint max_width;
GtkJustification justification;
-
- guint visible : 1;
+
+ guint visible : 1;
guint width_set : 1;
guint resizeable : 1;
guint auto_resize : 1;
@@ -340,15 +340,15 @@ struct _GtkCListRow
{
GtkCell *cell;
GtkStateType state;
-
+
GdkColor foreground;
GdkColor background;
-
+
GtkStyle *style;
gpointer data;
GtkDestroyNotify destroy;
-
+
guint fg_set : 1;
guint bg_set : 1;
guint selectable : 1;
@@ -358,10 +358,10 @@ struct _GtkCListRow
struct _GtkCellText
{
GtkCellType type;
-
+
gint16 vertical;
gint16 horizontal;
-
+
GtkStyle *style;
gchar *text;
@@ -370,10 +370,10 @@ struct _GtkCellText
struct _GtkCellPixmap
{
GtkCellType type;
-
+
gint16 vertical;
gint16 horizontal;
-
+
GtkStyle *style;
GdkPixmap *pixmap;
@@ -383,10 +383,10 @@ struct _GtkCellPixmap
struct _GtkCellPixText
{
GtkCellType type;
-
+
gint16 vertical;
gint16 horizontal;
-
+
GtkStyle *style;
gchar *text;
@@ -398,10 +398,10 @@ struct _GtkCellPixText
struct _GtkCellWidget
{
GtkCellType type;
-
+
gint16 vertical;
gint16 horizontal;
-
+
GtkStyle *style;
GtkWidget *widget;
@@ -410,27 +410,27 @@ struct _GtkCellWidget
struct _GtkCell
{
GtkCellType type;
-
+
gint16 vertical;
gint16 horizontal;
-
+
GtkStyle *style;
union {
gchar *text;
-
+
struct {
GdkPixmap *pixmap;
GdkBitmap *mask;
} pm;
-
+
struct {
gchar *text;
guint8 spacing;
GdkPixmap *pixmap;
GdkBitmap *mask;
} pt;
-
+
GtkWidget *widget;
} u;
};
@@ -485,7 +485,7 @@ void gtk_clist_thaw (GtkCList *clist);
void gtk_clist_column_titles_show (GtkCList *clist);
void gtk_clist_column_titles_hide (GtkCList *clist);
-/* set the column title to be a active title (responds to button presses,
+/* set the column title to be a active title (responds to button presses,
* prelights, and grabs keyboard focus), or passive where it acts as just
* a title
*/
diff --git a/gtk/gtkglobals.h b/gtk/gtkglobals.h
index 9693cd9..a8f6aa9 100644
--- a/gtk/gtkglobals.h
+++ b/gtk/gtkglobals.h
@@ -1,22 +1,22 @@
/* gtkglobals.h
* GTK-related Global defines, etc.
*
- * $Id: gtkglobals.h,v 1.17 2002/01/11 06:43:17 guy Exp $
+ * $Id: gtkglobals.h,v 1.18 2002/08/28 21:03:48 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c
index 58fe1d1..b61c634 100644
--- a/gtk/gui_prefs.c
+++ b/gtk/gui_prefs.c
@@ -1,22 +1,22 @@
/* gui_prefs.c
* Dialog box for GUI preferences
*
- * $Id: gui_prefs.c,v 1.34 2002/03/05 11:55:59 guy Exp $
+ * $Id: gui_prefs.c,v 1.35 2002/08/28 21:03:48 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -194,13 +194,13 @@ gui_prefs_show(void)
prefs.gui_hex_dump_highlight_style);
gtk_object_set_data(GTK_OBJECT(main_vb), HEX_DUMP_HIGHLIGHT_STYLE_KEY,
highlight_style_om);
-
+
/* Geometry prefs */
save_position_cb = create_preference_check_button(main_tb,
6, "Save window position:", NULL, prefs.gui_geometry_save_position);
gtk_object_set_data(GTK_OBJECT(main_vb), GEOMETRY_POSITION_KEY,
save_position_cb);
-
+
save_size_cb = create_preference_check_button(main_tb,
7, "Save window size:", NULL, prefs.gui_geometry_save_size);
gtk_object_set_data(GTK_OBJECT(main_vb), GEOMETRY_SIZE_KEY,
@@ -282,7 +282,7 @@ font_browse_cb(GtkWidget *w, gpointer data _U_)
/* Set the FONT_DIALOG_PTR_KEY for the caller to point to us */
gtk_object_set_data(GTK_OBJECT(caller), FONT_DIALOG_PTR_KEY,
font_browse_w);
-
+
/* Connect the ok_button to font_browse_ok_cb function and pass along a
pointer to the font selection box widget */
gtk_signal_connect(
@@ -407,10 +407,10 @@ gui_prefs_fetch(GtkWidget *w)
prefs.gui_hex_dump_highlight_style = fetch_enum_value(
gtk_object_get_data(GTK_OBJECT(w), HEX_DUMP_HIGHLIGHT_STYLE_KEY),
highlight_style_vals);
- prefs.gui_geometry_save_position =
+ prefs.gui_geometry_save_position =
gtk_toggle_button_get_active(gtk_object_get_data(GTK_OBJECT(w),
GEOMETRY_POSITION_KEY));
- prefs.gui_geometry_save_size =
+ prefs.gui_geometry_save_size =
gtk_toggle_button_get_active(gtk_object_get_data(GTK_OBJECT(w),
GEOMETRY_SIZE_KEY));
@@ -534,9 +534,9 @@ color_browse_cb(GtkWidget *w, gpointer data _U_)
GtkWidget *main_vb, *main_tb, *label, *optmenu, *menu, *menuitem;
GtkWidget *sample, *colorsel, *bbox, *cancel_bt, *ok_bt, *color_w;
int width, height, i;
- gdouble scolor[4];
+ gdouble scolor[4];
GtkWidget *caller = gtk_widget_get_toplevel(w);
-
+
/* Has a color dialog box already been opened for that top-level
widget? */
color_w = gtk_object_get_data(GTK_OBJECT(caller),
@@ -570,7 +570,7 @@ color_browse_cb(GtkWidget *w, gpointer data _U_)
if any, that we've been destroyed. */
gtk_signal_connect(GTK_OBJECT(color_w), "destroy",
GTK_SIGNAL_FUNC(color_destroy_cb), NULL);
-
+
main_vb = gtk_vbox_new(FALSE, 5);
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
gtk_container_add (GTK_CONTAINER (color_w), main_vb);
@@ -589,7 +589,7 @@ color_browse_cb(GtkWidget *w, gpointer data _U_)
menu = gtk_menu_new();
for (i = 0; i < MAX_HANDLED_COL; i++){
menuitem = gtk_menu_item_new_with_label(color_info[i].label);
- gtk_object_set_data(GTK_OBJECT(menuitem), COLOR_SELECTION_PTR_KEY,
+ gtk_object_set_data(GTK_OBJECT(menuitem), COLOR_SELECTION_PTR_KEY,
(gpointer) colorsel);
gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
GTK_SIGNAL_FUNC(update_current_color),
@@ -606,18 +606,18 @@ color_browse_cb(GtkWidget *w, gpointer data _U_)
width = gdk_string_width(sample->style->font, SAMPLE_MARKED_TEXT);
gtk_widget_set_usize(GTK_WIDGET(sample), width, height);
gtk_text_set_editable(GTK_TEXT(sample), FALSE);
- gtk_text_insert(GTK_TEXT(sample), NULL,
- &color_info[MFG_IDX].color,
+ gtk_text_insert(GTK_TEXT(sample), NULL,
+ &color_info[MFG_IDX].color,
&color_info[MBG_IDX].color,
SAMPLE_MARKED_TEXT, -1);
gtk_table_attach_defaults(GTK_TABLE(main_tb), sample, 2, 3, 0, 2);
gtk_widget_show(sample);
- gtk_color_selection_set_color(GTK_COLOR_SELECTION(colorsel),
+ gtk_color_selection_set_color(GTK_COLOR_SELECTION(colorsel),
&scolor[CS_RED]);
gtk_table_attach_defaults(GTK_TABLE(main_tb), colorsel, 0, 3, 2, 3);
gtk_object_set_data(GTK_OBJECT(colorsel), COLOR_SAMPLE_PTR_KEY,
(gpointer) sample);
- gtk_signal_connect(GTK_OBJECT(colorsel), "color-changed",
+ gtk_signal_connect(GTK_OBJECT(colorsel), "color-changed",
GTK_SIGNAL_FUNC(update_text_color), NULL);
gtk_widget_show(colorsel);
gtk_widget_show(main_vb);
@@ -625,7 +625,7 @@ color_browse_cb(GtkWidget *w, gpointer data _U_)
gtk_object_set_data(GTK_OBJECT(color_w), COLOR_CALLER_PTR_KEY, caller);
gtk_object_set_data(GTK_OBJECT(caller), COLOR_DIALOG_PTR_KEY, color_w);
- /* Ok, Cancel Buttons */
+ /* Ok, Cancel Buttons */
bbox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
@@ -640,7 +640,7 @@ color_browse_cb(GtkWidget *w, gpointer data _U_)
gtk_widget_grab_default(ok_bt);
gtk_widget_show(ok_bt);
cancel_bt = gtk_button_new_with_label ("Cancel");
- gtk_signal_connect_object(GTK_OBJECT(cancel_bt), "clicked",
+ gtk_signal_connect_object(GTK_OBJECT(cancel_bt), "clicked",
(GtkSignalFunc)gtk_widget_destroy,
GTK_OBJECT(color_w));
gtk_box_pack_start(GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
@@ -656,16 +656,16 @@ update_text_color(GtkWidget *w, gpointer data _U_) {
gdouble scolor[4];
gtk_color_selection_get_color(GTK_COLOR_SELECTION(w), &scolor[CS_RED]);
-
+
curcolor->red = (gushort) (scolor[CS_RED] * 65535.0);
curcolor->green = (gushort) (scolor[CS_GREEN] * 65535.0);
curcolor->blue = (gushort) (scolor[CS_BLUE] * 65535.0);
-
+
gtk_text_freeze(sample);
gtk_text_set_point(sample, 0);
gtk_text_forward_delete(sample, gtk_text_get_length(sample));
- gtk_text_insert(GTK_TEXT(sample), NULL,
- &color_info[MFG_IDX].color,
+ gtk_text_insert(GTK_TEXT(sample), NULL,
+ &color_info[MFG_IDX].color,
&color_info[MBG_IDX].color,
SAMPLE_MARKED_TEXT, -1);
gtk_text_thaw(sample);
@@ -674,7 +674,7 @@ update_text_color(GtkWidget *w, gpointer data _U_) {
static void
update_current_color(GtkWidget *w, gpointer data)
{
- GtkColorSelection *colorsel;
+ GtkColorSelection *colorsel;
gdouble scolor[4];
colorsel = GTK_COLOR_SELECTION(gtk_object_get_data(GTK_OBJECT(w),
@@ -684,7 +684,7 @@ update_current_color(GtkWidget *w, gpointer data)
scolor[CS_GREEN] = (gdouble) (curcolor->green) / 65535.0;
scolor[CS_BLUE] = (gdouble) (curcolor->blue) / 65535.0;
scolor[CS_OPACITY] = 1.0;
-
+
gtk_color_selection_set_color(colorsel, &scolor[CS_RED]);
}
@@ -722,7 +722,7 @@ color_delete_cb(GtkWidget *prefs_w _U_, gpointer dummy _U_)
static void
color_destroy_cb(GtkWidget *w, gpointer data _U_)
{
- GtkWidget *caller = gtk_object_get_data(GTK_OBJECT(w),
+ GtkWidget *caller = gtk_object_get_data(GTK_OBJECT(w),
COLOR_CALLER_PTR_KEY);
if (caller != NULL) {
gtk_object_set_data(GTK_OBJECT(caller), COLOR_DIALOG_PTR_KEY, NULL);
diff --git a/gtk/gui_prefs.h b/gtk/gui_prefs.h
index 3d8d70c..a8615cd 100644
--- a/gtk/gui_prefs.h
+++ b/gtk/gui_prefs.h
@@ -1,23 +1,23 @@
/* gui_prefs.h
* Definitions for GUI preferences window
*
- * $Id: gui_prefs.h,v 1.3 2000/08/21 08:09:12 guy Exp $
+ * $Id: gui_prefs.h,v 1.4 2002/08/28 21:03:48 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c
index f44886e..4ac71b4 100644
--- a/gtk/help_dlg.c
+++ b/gtk/help_dlg.c
@@ -1,6 +1,6 @@
/* help_dlg.c
*
- * $Id: help_dlg.c,v 1.23 2002/08/02 22:34:53 jmayer Exp $
+ * $Id: help_dlg.c,v 1.24 2002/08/28 21:03:48 jmayer Exp $
*
* Laurent Deniel <deniel@worldnet.fr>
*
@@ -12,12 +12,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -77,13 +77,13 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_)
*proto_vb,
*dfilter_tb, *dfilter_vsb,
*cfilter_vb;
-
+
if (help_w != NULL) {
/* There's already a "Help" dialog box; reactivate it. */
reactivate_window(help_w);
return;
}
-
+
help_w = gtk_window_new(GTK_WINDOW_DIALOG);
gtk_widget_set_name(help_w, "Ethereal Help window" );
gtk_window_set_title(GTK_WINDOW(help_w), "Ethereal: Help");
@@ -93,7 +93,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_)
GTK_SIGNAL_FUNC (window_icon_realize_cb), NULL);
gtk_widget_set_usize(GTK_WIDGET(help_w), DEF_WIDTH * 2/3, DEF_HEIGHT * 2/3);
gtk_container_border_width(GTK_CONTAINER(help_w), 2);
-
+
/* Container for each row of widgets */
main_vb = gtk_vbox_new(FALSE, 1);
@@ -109,7 +109,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_)
/* Overview panel */
overview_vb = gtk_vbox_new(FALSE, 0);
- gtk_container_border_width(GTK_CONTAINER(overview_vb), 1);
+ gtk_container_border_width(GTK_CONTAINER(overview_vb), 1);
txt_scrollw = scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(overview_vb), txt_scrollw, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw),
@@ -133,7 +133,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_)
proto_vb = gtk_vbox_new(FALSE, 0);
gtk_container_border_width(GTK_CONTAINER(proto_vb), 1);
-
+
txt_scrollw = scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(proto_vb), txt_scrollw, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw),
@@ -144,22 +144,22 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_text_set_line_wrap(GTK_TEXT(proto_text), FALSE);
set_help_text(proto_text, PROTOCOL_HELP);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(txt_scrollw),
- proto_text);
+ proto_text);
gtk_widget_show(txt_scrollw);
gtk_widget_show(proto_text);
gtk_widget_show(proto_vb);
label = gtk_label_new("Protocols");
gtk_notebook_append_page(GTK_NOTEBOOK(help_nb), proto_vb, label);
-
+
/* display filter help */
/* X windows have a maximum size of 32767. Since the height can easily
exceed this, we have to jump through some hoops to have a functional
vertical scroll bar. */
-
+
dfilter_tb = gtk_table_new(2, 2, FALSE);
gtk_table_set_col_spacing (GTK_TABLE (dfilter_tb), 0, 3);
gtk_table_set_row_spacing (GTK_TABLE (dfilter_tb), 0, 3);
- gtk_container_border_width(GTK_CONTAINER(dfilter_tb), 1);
+ gtk_container_border_width(GTK_CONTAINER(dfilter_tb), 1);
txt_scrollw = scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw),
@@ -184,7 +184,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_text_set_line_wrap(GTK_TEXT(dfilter_text), FALSE);
set_help_text(dfilter_text, DFILTER_HELP);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(txt_scrollw),
- dfilter_text);
+ dfilter_text);
gtk_widget_show(txt_scrollw);
gtk_widget_show(dfilter_text);
gtk_widget_show(dfilter_tb);
@@ -195,7 +195,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_)
/* capture filter help (this one has no horizontal scrollbar) */
cfilter_vb = gtk_vbox_new(FALSE, 0);
- gtk_container_border_width(GTK_CONTAINER(cfilter_vb), 1);
+ gtk_container_border_width(GTK_CONTAINER(cfilter_vb), 1);
txt_scrollw = scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(cfilter_vb), txt_scrollw, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw),
@@ -217,7 +217,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_widget_show(help_nb);
- /* Buttons (only one for now) */
+ /* Buttons (only one for now) */
bbox = gtk_hbox_new(FALSE, 1);
gtk_box_pack_end(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
@@ -229,7 +229,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_container_add(GTK_CONTAINER(bbox), close_bt);
gtk_widget_grab_default(close_bt);
gtk_widget_show(close_bt);
-
+
gtk_quit_add_destroy(gtk_main_level(), GTK_OBJECT(help_w));
gtk_widget_show(help_w);
@@ -251,15 +251,15 @@ static void set_text(GtkWidget *w, char *buffer, int nchars)
gtk_text_insert(GTK_TEXT(w), m_r_font, NULL, NULL, buffer, nchars);
}
-static char *proto_help =
+static char *proto_help =
"The protocols (and packet types) currently supported by "
"Ethereal are the following:\n\n";
-static char *dfilter_help =
+static char *dfilter_help =
"The following list shows all per-protocol fields that "
"can be used in a display filter:\n";
-static char *cfilter_help =
+static char *cfilter_help =
"Packet capturing is performed with the pcap library. The capture filter "
"syntax follows the rules of this library.\nSo this syntax is different "
"from the display filter syntax: see manual page of tcpdump.\n"
@@ -269,7 +269,7 @@ static char *cfilter_help =
;
#endif
-static char *overview_help =
+static char *overview_help =
"Ethereal is a GUI network protocol analyzer. It lets you interactively "
"browse packet data from a live network or from a previously saved capture "
"file. Ethereal knows how to read libpcap capture files, including those "
@@ -319,7 +319,7 @@ static void set_help_text(GtkWidget *w, help_type_t type)
set_text(w, overview_help, -1);
break;
- case PROTOCOL_HELP :
+ case PROTOCOL_HELP :
/* first pass to know the maximum length of first field */
for (i = proto_get_first_protocol(&cookie); i != -1;
i = proto_get_next_protocol(&cookie)) {
@@ -333,7 +333,7 @@ static void set_help_text(GtkWidget *w, help_type_t type)
maxlen2 = strlen(proto_help);
width = gdk_string_width(m_r_font, proto_help);
set_text(w, proto_help, maxlen2);
-
+
/* ok, display the correctly aligned strings */
for (i = proto_get_first_protocol(&cookie); i != -1;
i = proto_get_next_protocol(&cookie)) {
@@ -378,7 +378,7 @@ static void set_help_text(GtkWidget *w, help_type_t type)
set_text(w, dfilter_help, maxlen3);
for (i = 0; i < proto_registrar_n() ; i++) {
- hfinfo = proto_registrar_get_nth(i);
+ hfinfo = proto_registrar_get_nth(i);
if (proto_registrar_is_protocol(i)) {
snprintf(buffer, BUFF_LEN, "\n%s:\n", hfinfo->name);
set_text(w, buffer, strlen(buffer));
@@ -387,7 +387,7 @@ static void set_help_text(GtkWidget *w, help_type_t type)
type_name = ftype_pretty_name(hfinfo->type);
snprintf(buffer, BUFF_LEN, "%s%s%s%s(%s)\n",
- hfinfo->abbrev,
+ hfinfo->abbrev,
&blanks[B_LEN - (maxlen - strlen(hfinfo->abbrev)) - 2],
hfinfo->name,
&blanks[B_LEN - (maxlen2 - strlen(hfinfo->name)) - 2],
@@ -423,7 +423,7 @@ static void clear_help_text(GtkWidget *w)
GtkText *txt = GTK_TEXT(w);
gtk_text_set_point(txt, 0);
- /* Keep GTK+ 1.2.3 through 1.2.6 from dumping core - see
+ /* Keep GTK+ 1.2.3 through 1.2.6 from dumping core - see
http://www.ethereal.com/lists/ethereal-dev/199912/msg00312.html and
http://www.gnome.org/mailing-lists/archives/gtk-devel-list/1999-October/0051.shtml
for more information */
diff --git a/gtk/help_dlg.h b/gtk/help_dlg.h
index 88e6950..4c4b36e 100644
--- a/gtk/help_dlg.h
+++ b/gtk/help_dlg.h
@@ -1,6 +1,6 @@
/* help_dlg.h
*
- * $Id: help_dlg.h,v 1.3 2000/09/08 10:59:14 guy Exp $
+ * $Id: help_dlg.h,v 1.4 2002/08/28 21:03:48 jmayer Exp $
*
* Laurent Deniel <deniel@worldnet.fr>
*
@@ -12,12 +12,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/keys.h b/gtk/keys.h
index aaf788a..86d0e6f 100644
--- a/gtk/keys.h
+++ b/gtk/keys.h
@@ -1,22 +1,22 @@
/* keys.h
* Key definitions for various objects
*
- * $Id: keys.h,v 1.13 2002/05/03 03:24:47 guy Exp $
+ * $Id: keys.h,v 1.14 2002/08/28 21:03:48 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/main.c b/gtk/main.c
index 5a1ebf5..5992e66 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
/* main.c
*
- * $Id: main.c,v 1.258 2002/08/24 01:17:08 guy Exp $
+ * $Id: main.c,v 1.259 2002/08/28 21:03:48 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -9,18 +9,18 @@
* Richard Sharpe, 13-Feb-1999, added support for initializing structures
* needed by dissect routines
* Jeff Foster, 2001/03/12, added support tabbed hex display windowss
- *
- *
+ *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -423,7 +423,7 @@ get_text_from_packet_list(gpointer data)
epan_dissect_free(edt);
}
-
+
return buf;
}
@@ -534,10 +534,10 @@ filter_activate_cb(GtkWidget *w, gpointer data)
gboolean add_filter = TRUE;
gboolean free_filter = TRUE;
char *s;
-
+
g_assert(data);
s = g_strdup(gtk_entry_get_text(GTK_ENTRY(data)));
-
+
/* GtkCombos don't let us get at their list contents easily, so we maintain
our own filter list, and feed it to gtk_combo_set_popdown_strings when
a new filter is added. */
@@ -584,9 +584,9 @@ packet_list_compare(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
/* Attempt to convert to numbers */
double num1 = atof(text1);
double num2 = atof(text2);
-
+
gint col_fmt = cfile.cinfo.col_fmt[clist->sort_column];
-
+
if ((col_fmt == COL_NUMBER) || (col_fmt == COL_REL_TIME) || (col_fmt == COL_DELTA_TIME) ||
((col_fmt == COL_CLS_TIME) && (timestamp_type == RELATIVE)) ||
((col_fmt == COL_CLS_TIME) && (timestamp_type == DELTA)) ||
@@ -604,9 +604,9 @@ packet_list_compare(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
else
return 0;
}
-
+
else {
-
+
/* Compare text column */
if (!text2)
return (text1 != NULL);
@@ -619,19 +619,19 @@ packet_list_compare(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
}
/* What to do when a column is clicked */
-static void
+static void
packet_list_click_column_cb(GtkCList *clist, gint column, gpointer data)
{
column_arrows *col_arrows = (column_arrows *) data;
int i;
-
+
gtk_clist_freeze(clist);
-
+
for (i = 0; i < cfile.cinfo.num_cols; i++) {
gtk_widget_hide(col_arrows[i].ascend_pm);
gtk_widget_hide(col_arrows[i].descend_pm);
}
-
+
if (column == clist->sort_column) {
if (clist->sort_type == GTK_SORT_ASCENDING) {
clist->sort_type = GTK_SORT_DESCENDING;
@@ -652,7 +652,7 @@ packet_list_click_column_cb(GtkCList *clist, gint column, gpointer data)
}
/* mark packets */
-static void
+static void
set_frame_mark(gboolean set, frame_data *frame, gint row) {
GdkColor fg, bg;
@@ -674,7 +674,7 @@ set_frame_mark(gboolean set, frame_data *frame, gint row) {
static void
packet_list_button_pressed_cb(GtkWidget *w, GdkEvent *event, gpointer data _U_) {
-
+
GdkEventButton *event_button = (GdkEventButton *)event;
gint row, column;
@@ -693,8 +693,8 @@ void mark_frame_cb(GtkWidget *w _U_, gpointer data _U_) {
if (cfile.current_frame) {
/* XXX hum, should better have a "cfile->current_row" here ... */
set_frame_mark(!cfile.current_frame->flags.marked,
- cfile.current_frame,
- gtk_clist_find_row_from_data(GTK_CLIST(packet_list),
+ cfile.current_frame,
+ gtk_clist_find_row_from_data(GTK_CLIST(packet_list),
cfile.current_frame));
}
}
@@ -704,7 +704,7 @@ static void mark_all_frames(gboolean set) {
for (fdata = cfile.plist; fdata != NULL; fdata = fdata->next) {
set_frame_mark(set,
fdata,
- gtk_clist_find_row_from_data(GTK_CLIST(packet_list), fdata));
+ gtk_clist_find_row_from_data(GTK_CLIST(packet_list), fdata));
}
}
@@ -773,7 +773,7 @@ tree_view_select_row_cb(GtkCTree *ctree, GList *node, gint column _U_, gpointer
set_menus_for_selected_tree_row(TRUE);
if (finfo->hfinfo) {
- if (finfo->hfinfo->blurb != NULL &&
+ if (finfo->hfinfo->blurb != NULL &&
finfo->hfinfo->blurb[0] != '\0') {
has_blurb = TRUE;
length = strlen(finfo->hfinfo->blurb);
@@ -791,7 +791,7 @@ tree_view_select_row_cb(GtkCTree *ctree, GList *node, gint column _U_, gpointer
if (length) {
length += strlen(finfo->hfinfo->abbrev) + strlen(len_str) + 10;
help_str = g_malloc(sizeof(gchar) * length);
- sprintf(help_str, "%s (%s)%s",
+ sprintf(help_str, "%s (%s)%s",
(has_blurb) ? finfo->hfinfo->blurb : finfo->hfinfo->name,
finfo->hfinfo->abbrev, len_str);
statusbar_push_field_msg(help_str);
@@ -829,7 +829,7 @@ tree_view_unselect_row_cb(GtkCTree *ctree _U_, GList *node _U_, gint column _U_,
{
GtkWidget *byte_view;
const guint8 *data;
- guint len;
+ guint len;
/*
* Which byte view is displaying the current protocol tree
@@ -906,7 +906,7 @@ set_plist_sel_browse(gboolean val)
gtk_clist_set_selection_mode(GTK_CLIST(packet_list), GTK_SELECTION_BROWSE);
}
}
-
+
/* Set the font of the packet list window. */
void
set_plist_font(GdkFont *font)
@@ -1066,13 +1066,13 @@ file_quit_cmd_cb (GtkWidget *widget _U_, gpointer data _U_)
do_quit();
}
-static void
+static void
print_usage(gboolean print_ver) {
if (print_ver) {
fprintf(stderr, "This is GNU " PACKAGE " " VERSION ", compiled %s\n",
comp_info_str->str);
- }
+ }
#ifdef HAVE_LIBPCAP
fprintf(stderr, "\n%s [ -vh ] [ -klpQS ] [ -a <capture autostop condition> ] ...\n",
PACKAGE);
@@ -1093,7 +1093,7 @@ print_usage(gboolean print_ver) {
#endif
}
-static void
+static void
show_version(void)
{
#ifdef WIN32
@@ -1199,9 +1199,9 @@ main(int argc, char *argv[])
extern char pcap_version[];
#endif /* HAVE_PCAP_VERSION */
#endif /* HAVE_LIBPCAP */
-
+
#ifdef WIN32
- WSADATA wsaData;
+ WSADATA wsaData;
#endif
char *gpf_path, *cf_path, *df_path;
@@ -1323,7 +1323,7 @@ main(int argc, char *argv[])
exit(0);
}
- /* Set the current locale according to the program environment.
+ /* Set the current locale according to the program environment.
* We haven't localized anything, but some GTK widgets are localized
* (the file selection dialogue, for example).
* This also sets the C-language locale to the native environment. */
@@ -1331,7 +1331,7 @@ main(int argc, char *argv[])
/* Let GTK get its args */
gtk_init (&argc, &argv);
-
+
/* Read the preference files. */
prefs = read_prefs(&gpf_open_errno, &gpf_path, &pf_open_errno, &pf_path);
@@ -1458,7 +1458,7 @@ main(int argc, char *argv[])
#ifdef HAVE_LIBPCAP
if (set_autostop_criterion(optarg) == FALSE) {
fprintf(stderr, "ethereal: Invalid or unknown -a flag \"%s\"\n", optarg);
- exit(1);
+ exit(1);
}
#else
capture_option_specified = TRUE;
@@ -1762,12 +1762,12 @@ main(int argc, char *argv[])
if_list = get_interface_list(&err, err_str);
if (if_list == NULL) {
switch (err) {
-
+
case CANT_GET_INTERFACE_LIST:
fprintf(stderr, "ethereal: Can't get list of interfaces: %s\n",
err_str);
break;
-
+
case NO_INTERFACES_FOUND:
fprintf(stderr, "ethereal: There are no interfaces on which a capture can be done\n");
break;
@@ -1789,7 +1789,7 @@ main(int argc, char *argv[])
}
#endif
- /* Build the column format array */
+ /* Build the column format array */
col_init(&cfile.cinfo, prefs->num_cols);
for (i = 0; i < cfile.cinfo.num_cols; i++) {
cfile.cinfo.col_fmt[i] = get_column_format(i);
@@ -1813,14 +1813,14 @@ main(int argc, char *argv[])
else if (capture_opts.snaplen < MIN_PACKET_SIZE)
capture_opts.snaplen = MIN_PACKET_SIZE;
}
-
+
/* Check the value range of the ringbuffer_num_files parameter */
if (capture_opts.ringbuffer_num_files < RINGBUFFER_MIN_NUM_FILES)
capture_opts.ringbuffer_num_files = RINGBUFFER_MIN_NUM_FILES;
else if (capture_opts.ringbuffer_num_files > RINGBUFFER_MAX_NUM_FILES)
capture_opts.ringbuffer_num_files = RINGBUFFER_MAX_NUM_FILES;
#endif
-
+
rc_file = get_persconffile_path(RC_FILE, FALSE);
gtk_rc_parse(rc_file);
@@ -2001,10 +2001,10 @@ main(int argc, char *argv[])
documentation correctly, gdk_window_get_deskrelative_origin applies
mainly to Enlightenment and gdk_window_get_root_origin applies for
all other WMs.
-
+
The code below tries both routines, and picks the one that returns
the upper-left-most coordinates.
-
+
More info at:
http://mail.gnome.org/archives/gtk-devel-list/2001-March/msg00289.html
@@ -2035,7 +2035,7 @@ main(int argc, char *argv[])
prefs_write_needed = TRUE;
}
}
-
+
if (prefs->gui_geometry_save_size) {
if (top_level->window != NULL) {
/* XXX - Is this the "approved" method? */
@@ -2050,7 +2050,7 @@ main(int argc, char *argv[])
prefs_write_needed = TRUE;
}
}
-
+
if (prefs_write_needed) {
write_prefs(&pf_path);
}
@@ -2058,7 +2058,7 @@ main(int argc, char *argv[])
/* Ignore errors silently */
g_free(pf_path);
}
-
+
epan_cleanup();
g_free(rc_file);
@@ -2190,7 +2190,7 @@ static const struct {
{ "bold", "ultrabold" }
};
#define N_WEIGHTS (sizeof weight_map / sizeof weight_map[0])
-
+
char *
boldify(const char *font_name)
{
@@ -2262,11 +2262,11 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
TRUE,
TRUE
};
-
- /* Main window */
+
+ /* Main window */
top_level = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name(top_level, "main window");
- gtk_signal_connect(GTK_OBJECT(top_level), "delete_event",
+ gtk_signal_connect(GTK_OBJECT(top_level), "delete_event",
GTK_SIGNAL_FUNC(main_window_delete_event_cb), NULL);
gtk_signal_connect (GTK_OBJECT (top_level), "realize",
GTK_SIGNAL_FUNC (window_icon_realize_cb), NULL);
@@ -2317,7 +2317,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
gtk_container_add(GTK_CONTAINER(pkt_scrollw), packet_list);
col_arrows = (column_arrows *) g_malloc(sizeof(column_arrows) * cfile.cinfo.num_cols);
-
+
set_plist_sel_browse(prefs->gui_plist_sel_browse);
set_plist_font(m_r_font);
gtk_widget_set_name(packet_list, "packet list");
@@ -2333,12 +2333,12 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
/* Right-justify the packet number column. */
if (cfile.cinfo.col_fmt[i] == COL_NUMBER)
- gtk_clist_set_column_justification(GTK_CLIST(packet_list), i,
+ gtk_clist_set_column_justification(GTK_CLIST(packet_list), i,
GTK_JUSTIFY_RIGHT);
}
gtk_widget_set_usize(packet_list, -1, pl_size);
gtk_signal_connect(GTK_OBJECT(packet_list), "button_press_event",
- GTK_SIGNAL_FUNC(popup_menu_handler),
+ GTK_SIGNAL_FUNC(popup_menu_handler),
gtk_object_get_data(GTK_OBJECT(popup_menu_object), PM_PACKET_LIST_KEY));
gtk_signal_connect(GTK_OBJECT(packet_list), "button_press_event",
GTK_SIGNAL_FUNC(packet_list_button_pressed_cb), NULL);
@@ -2377,7 +2377,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
GTK_SIGNAL_FUNC(display_filter_construct_cb), &args);
gtk_box_pack_start(GTK_BOX(stat_hbox), filter_bt, FALSE, TRUE, 0);
gtk_widget_show(filter_bt);
-
+
filter_cm = gtk_combo_new();
filter_list = g_list_append (filter_list, "");
gtk_combo_set_popdown_strings(GTK_COMBO(filter_cm), filter_list);
@@ -2453,7 +2453,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
GTK_SHRINK, GTK_SHRINK, 0, 0);
gtk_widget_show(column_lb);
col_arrows[i].ascend_pm = gtk_pixmap_new(ascend_pm, ascend_bm);
- gtk_table_attach(GTK_TABLE(col_arrows[i].table), col_arrows[i].ascend_pm,
+ gtk_table_attach(GTK_TABLE(col_arrows[i].table), col_arrows[i].ascend_pm,
1, 2, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
if (i == 0) {
gtk_widget_show(col_arrows[i].ascend_pm);
diff --git a/gtk/main.h b/gtk/main.h
index f4e3ed6..9eb6a70 100644
--- a/gtk/main.h
+++ b/gtk/main.h
@@ -1,22 +1,22 @@
/* main.h
* Global defines, etc.
*
- * $Id: main.h,v 1.27 2002/08/24 01:17:09 guy Exp $
+ * $Id: main.h,v 1.28 2002/08/28 21:03:48 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/menu.c b/gtk/menu.c
index 3ed5cf6..75efbf8 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,22 +1,22 @@
/* menu.c
* Menu routines
*
- * $Id: menu.c,v 1.65 2002/08/24 01:17:09 guy Exp $
+ * $Id: menu.c,v 1.66 2002/08/28 21:03:48 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -87,7 +87,7 @@ static void set_menu_sensitivity (gchar *, gint);
<path> -> path of a radio item to link against
"<Separator>" -> create a separator
"<Branch>" -> create an item to hold sub items (optional)
- "<LastBranch>" -> create a right justified branch
+ "<LastBranch>" -> create a right justified branch
*/
/* main menu */
@@ -207,7 +207,7 @@ static GtkItemFactoryEntry packet_list_menu_items[] =
{"/Colorize Display...", NULL, GTK_MENU_FUNC(color_display_cb), 0, NULL},
{"/Print...", NULL, GTK_MENU_FUNC(file_print_cmd_cb), 0, NULL},
{"/Print Packet", NULL, GTK_MENU_FUNC(file_print_packet_cmd_cb), 0, NULL},
- {"/Show Packet In New Window", NULL, GTK_MENU_FUNC(new_window_cb), 0, NULL},
+ {"/Show Packet In New Window", NULL, GTK_MENU_FUNC(new_window_cb), 0, NULL},
};
static GtkItemFactoryEntry tree_view_menu_items[] =
@@ -293,7 +293,7 @@ menus_init(void) {
gtk_item_factory_create_items_ac(hexdump_menu_factory, sizeof(hexdump_menu_items)/sizeof(hexdump_menu_items[0]), hexdump_menu_items, popup_menu_object, 2);
gtk_object_set_data(GTK_OBJECT(popup_menu_object), PM_HEXDUMP_KEY, hexdump_menu_factory->widget);
popup_menu_list = g_slist_append((GSList *)popup_menu_list, hexdump_menu_factory);
-
+
factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", grp);
gtk_item_factory_create_items_ac(factory, nmenu_items, menu_items, NULL,2);
set_menus_for_unsaved_capture_file(FALSE);
@@ -314,7 +314,7 @@ menus_init(void) {
void
set_menu_sensitivity_meat(GtkItemFactory *ifactory, gchar *path, gint val) {
GtkWidget *menu = NULL;
-
+
if((menu = gtk_item_factory_get_widget(ifactory, path)) != NULL) {
gtk_widget_set_sensitive(menu,val);
}
@@ -360,7 +360,7 @@ void
set_menu_object_data_meat(GtkItemFactory *ifactory, gchar *path, gchar *key, gpointer data)
{
GtkWidget *menu = NULL;
-
+
if ((menu = gtk_item_factory_get_widget(ifactory, path)) != NULL)
gtk_object_set_data(GTK_OBJECT(menu), key, data);
}
@@ -369,7 +369,7 @@ void
set_menu_object_data (gchar *path, gchar *key, gpointer data) {
GSList *menu_list = popup_menu_list;
gchar *shortpath = strrchr(path, '/');
-
+
set_menu_object_data_meat(factory, path, key, data);
while (menu_list != NULL) {
set_menu_object_data_meat(menu_list->data, shortpath, key, data);
@@ -388,7 +388,7 @@ popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data)
if(widget == NULL || event == NULL || data == NULL) {
return FALSE;
}
-
+
/*
* If we ever want to make the menu differ based on what row
* and/or column we're above, we'd use "gtk_clist_get_selection_info()"
@@ -412,7 +412,7 @@ popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data)
menu = (GtkWidget *)data;
if(event->type == GDK_BUTTON_PRESS) {
event_button = (GdkEventButton *) event;
-
+
if(event_button->button == 3) {
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event_button->button, event_button->time);
gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "button_press_event");
@@ -488,7 +488,7 @@ set_menus_for_selected_packet(gboolean have_selected_packet)
have_selected_packet ? (cfile.edt->pi.ipproto == 6) : FALSE);
set_menu_sensitivity("/Tools/Decode As...",
have_selected_packet && decode_as_ok());
- set_menu_sensitivity("/Resolve Name",
+ set_menu_sensitivity("/Resolve Name",
have_selected_packet && g_resolv_flags == 0);
set_menu_sensitivity("/Tools/TCP Stream Analysis",
have_selected_packet ? (cfile.edt->pi.ipproto == 6) : FALSE);
diff --git a/gtk/menu.h b/gtk/menu.h
index b1e9171..0d97f54 100644
--- a/gtk/menu.h
+++ b/gtk/menu.h
@@ -1,23 +1,23 @@
/* menu.h
* Menu definitions
*
- * $Id: menu.h,v 1.6 2000/08/21 12:33:21 deniel Exp $
+ * $Id: menu.h,v 1.7 2002/08/28 21:03:48 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/nameres_prefs.c b/gtk/nameres_prefs.c
index da8d1f2..8af3f92 100644
--- a/gtk/nameres_prefs.c
+++ b/gtk/nameres_prefs.c
@@ -1,22 +1,22 @@
/* nameres_prefs.c
* Dialog box for name resolution preferences
*
- * $Id: nameres_prefs.c,v 1.4 2002/03/05 11:55:59 guy Exp $
+ * $Id: nameres_prefs.c,v 1.5 2002/08/28 21:03:48 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/nameres_prefs.h b/gtk/nameres_prefs.h
index 22a216e..a988e94 100644
--- a/gtk/nameres_prefs.h
+++ b/gtk/nameres_prefs.h
@@ -1,22 +1,22 @@
/* nameres_prefs.h
* Definitions for name resolution preferences window
*
- * $Id: nameres_prefs.h,v 1.1 2002/01/13 20:35:12 guy Exp $
+ * $Id: nameres_prefs.h,v 1.2 2002/08/28 21:03:48 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/packet_win.c b/gtk/packet_win.c
index e4c6c3e..5a8e3ce 100644
--- a/gtk/packet_win.c
+++ b/gtk/packet_win.c
@@ -3,22 +3,22 @@
*
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet_win.c,v 1.38 2002/06/04 07:48:57 guy Exp $
+ * $Id: packet_win.c,v 1.39 2002/08/28 21:03:48 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -184,8 +184,8 @@ destroy_new_window(GtkObject *object _U_, gpointer user_data)
g_free(DataPtr);
}
-
-/* called when a tree row is selected in the popup packet window */
+
+/* called when a tree row is selected in the popup packet window */
static void
new_tree_view_select_row_cb(GtkCTree *ctree, GList *node, gint column _U_,
gpointer user_data)
@@ -217,7 +217,7 @@ new_tree_view_select_row_cb(GtkCTree *ctree, GList *node, gint column _U_,
DataPtr->frame, finfo, len);
}
-/* called when a tree row is unselected in the popup packet window */
+/* called when a tree row is unselected in the popup packet window */
static void
new_tree_view_unselect_row_cb(GtkCTree *ctree _U_, GList *node _U_, gint column _U_,
gpointer user_data)
@@ -225,7 +225,7 @@ new_tree_view_unselect_row_cb(GtkCTree *ctree _U_, GList *node _U_, gint column
GtkWidget* byte_view;
const guint8* data;
guint len;
-
+
struct PacketWinData *DataPtr = (struct PacketWinData*)user_data;
DataPtr->finfo_selected = NULL;
diff --git a/gtk/packet_win.h b/gtk/packet_win.h
index 37a63c4..331ba89 100644
--- a/gtk/packet_win.h
+++ b/gtk/packet_win.h
@@ -3,7 +3,7 @@
*
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet_win.h,v 1.7 2001/03/24 02:14:56 guy Exp $
+ * $Id: packet_win.h,v 1.8 2002/08/28 21:03:48 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -13,12 +13,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index b44c8c1..334fe1a 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1,22 +1,22 @@
/* prefs_dlg.c
* Routines for handling preferences
*
- * $Id: prefs_dlg.c,v 1.51 2002/08/02 22:34:54 jmayer Exp $
+ * $Id: prefs_dlg.c,v 1.52 2002/08/28 21:03:49 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -85,8 +85,8 @@ static void prefs_tree_select_cb(GtkCTree *, GtkCTreeNode *, gint, gpointer);
#define FIRST_PROTO_PREFS_PAGE 6
-/*
- * Keep a static pointer to the notebook to be able to choose the
+/*
+ * Keep a static pointer to the notebook to be able to choose the
* displayed page.
*/
static GtkWidget *notebook;
@@ -230,7 +230,7 @@ module_prefs_show(module_t *module, gpointer user_data)
gtk_notebook_append_page(GTK_NOTEBOOK(cts->notebook), frame, NULL);
strcpy(label_str, module->title);
- ct_node = gtk_ctree_insert_node(GTK_CTREE(cts->ctree), cts->node, NULL,
+ ct_node = gtk_ctree_insert_node(GTK_CTREE(cts->ctree), cts->node, NULL,
&label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE);
gtk_ctree_node_set_row_data(GTK_CTREE(cts->ctree), ct_node,
GINT_TO_POINTER(cts->page));
@@ -269,7 +269,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
GTK_SIGNAL_FUNC(prefs_main_delete_cb), NULL);
gtk_signal_connect(GTK_OBJECT(prefs_w), "destroy",
GTK_SIGNAL_FUNC(prefs_main_destroy_cb), NULL);
-
+
/*
* Unfortunately, we can't arrange that a GtkTable widget wrap an event box
* around a table row, so the spacing between the preference item's label
@@ -283,7 +283,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
gtk_container_add(GTK_CONTAINER(prefs_w), main_vb);
gtk_widget_show(main_vb);
-
+
/* Top row: Preferences tree and notebook */
top_hb = gtk_hbox_new(FALSE, 10);
gtk_container_add(GTK_CONTAINER(main_vb), top_hb);
@@ -304,14 +304,14 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
gtk_signal_connect(GTK_OBJECT(cts.ctree), "tree-select-row",
GTK_SIGNAL_FUNC(prefs_tree_select_cb), NULL);
gtk_widget_show(cts.ctree);
-
+
/* A notebook widget sans tabs is used to flip between prefs */
notebook = prefs_nb = gtk_notebook_new();
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE);
gtk_container_add(GTK_CONTAINER(top_hb), prefs_nb);
gtk_widget_show(prefs_nb);
-
+
/* Printing prefs */
frame = gtk_frame_new("Printing");
gtk_widget_show(GTK_WIDGET(frame));
@@ -320,12 +320,12 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
gtk_object_set_data(GTK_OBJECT(prefs_w), E_PRINT_PAGE_KEY, print_pg);
gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
strcpy(label_str, "Printing");
- ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL,
+ ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL,
&label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE);
gtk_ctree_node_set_row_data(GTK_CTREE(cts.ctree), ct_node,
GINT_TO_POINTER(cts.page));
cts.page++;
-
+
/* Column prefs */
frame = gtk_frame_new("Columns");
gtk_widget_show(GTK_WIDGET(frame));
@@ -334,12 +334,12 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
gtk_object_set_data(GTK_OBJECT(prefs_w), E_COLUMN_PAGE_KEY, column_pg);
gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
strcpy(label_str, "Columns");
- ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL,
+ ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL,
&label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE);
gtk_ctree_node_set_row_data(GTK_CTREE(cts.ctree), ct_node,
GINT_TO_POINTER(cts.page));
cts.page++;
-
+
/* TCP Streams prefs */
frame = gtk_frame_new("TCP Streams");
gtk_widget_show(GTK_WIDGET(frame));
@@ -348,7 +348,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
gtk_object_set_data(GTK_OBJECT(prefs_w), E_STREAM_PAGE_KEY, stream_pg);
gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
strcpy(label_str, "TCP Streams");
- ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL,
+ ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL,
&label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE);
gtk_ctree_node_set_row_data(GTK_CTREE(cts.ctree), ct_node,
GINT_TO_POINTER(cts.page));
@@ -362,7 +362,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
gtk_object_set_data(GTK_OBJECT(prefs_w), E_GUI_PAGE_KEY, gui_pg);
gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
strcpy(label_str, "User Interface");
- ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL,
+ ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL,
&label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE);
gtk_ctree_node_set_row_data(GTK_CTREE(cts.ctree), ct_node,
GINT_TO_POINTER(cts.page));
@@ -381,7 +381,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
gtk_object_set_data(GTK_OBJECT(prefs_w), E_CAPTURE_PAGE_KEY, capture_pg);
gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
strcpy(label_str, "Capture");
- ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL,
+ ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL,
&label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE);
gtk_ctree_node_set_row_data(GTK_CTREE(cts.ctree), ct_node,
GINT_TO_POINTER(cts.page));
@@ -399,7 +399,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
gtk_object_set_data(GTK_OBJECT(prefs_w), E_NAMERES_PAGE_KEY, nameres_pg);
gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
strcpy(label_str, "Name resolution");
- ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL,
+ ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL,
&label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE);
gtk_ctree_node_set_row_data(GTK_CTREE(cts.ctree), ct_node,
GINT_TO_POINTER(cts.page));
@@ -423,7 +423,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
gtk_container_add(GTK_CONTAINER(main_vb), bbox);
gtk_widget_show(bbox);
-
+
ok_bt = gtk_button_new_with_label ("OK");
gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked",
GTK_SIGNAL_FUNC(prefs_main_ok_cb), GTK_OBJECT(prefs_w));
@@ -445,7 +445,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
GTK_WIDGET_SET_FLAGS(save_bt, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (bbox), save_bt, TRUE, TRUE, 0);
gtk_widget_show(save_bt);
-
+
cancel_bt = gtk_button_new_with_label ("Cancel");
gtk_signal_connect(GTK_OBJECT(cancel_bt), "clicked",
GTK_SIGNAL_FUNC(prefs_main_cancel_cb), GTK_OBJECT(prefs_w));
@@ -1144,7 +1144,7 @@ module_search_properties(module_t *module, gpointer user_data)
}
void
-properties_cb(GtkWidget *w, gpointer dummy)
+properties_cb(GtkWidget *w, gpointer dummy)
{
gchar *title = NULL;
struct properties_data p;
@@ -1160,9 +1160,9 @@ properties_cb(GtkWidget *w, gpointer dummy)
} else {
return;
}
-
+
if (!title) return;
-
+
if (prefs_w != NULL) {
reactivate_window(prefs_w);
} else {
@@ -1177,13 +1177,13 @@ properties_cb(GtkWidget *w, gpointer dummy)
}
-/* Prefs tree selection callback. The node data has been loaded with
+/* Prefs tree selection callback. The node data has been loaded with
the proper notebook page to load. */
static void
prefs_tree_select_cb(GtkCTree *ct, GtkCTreeNode *node, gint col _U_, gpointer dummy _U_)
{
gint page = GPOINTER_TO_INT(gtk_ctree_node_get_row_data(ct, node));
-
- if (page >= 0)
+
+ if (page >= 0)
gtk_notebook_set_page(GTK_NOTEBOOK(notebook), page);
}
diff --git a/gtk/prefs_dlg.h b/gtk/prefs_dlg.h
index 275dc33..7d058ba 100644
--- a/gtk/prefs_dlg.h
+++ b/gtk/prefs_dlg.h
@@ -1,22 +1,22 @@
/* prefs_dlg.h
* Definitions for preference handling routines
*
- * $Id: prefs_dlg.h,v 1.8 2002/01/20 20:05:18 guy Exp $
+ * $Id: prefs_dlg.h,v 1.9 2002/08/28 21:03:49 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
index 2287247..a7402c6 100644
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.c
@@ -1,22 +1,22 @@
/* print_dlg.c
* Dialog boxes for printing
*
- * $Id: print_dlg.c,v 1.34 2002/07/30 07:04:08 guy Exp $
+ * $Id: print_dlg.c,v 1.35 2002/08/28 21:03:49 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -117,7 +117,7 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
GSList *expand_grp;
GtkWidget *bbox, *ok_bt, *cancel_bt;
-
+
if (print_w != NULL) {
/* There's already a "Print" dialog box; reactivate it. */
reactivate_window(print_w);
@@ -139,7 +139,7 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
gtk_container_add(GTK_CONTAINER(print_w), main_vb);
gtk_widget_show(main_vb);
-
+
main_tb = gtk_table_new(4, 2, FALSE);
gtk_box_pack_start(GTK_BOX(main_vb), main_tb, FALSE, FALSE, 0);
@@ -275,7 +275,7 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
GTK_SIGNAL_FUNC(print_cmd_toggle_detail), NULL);
gtk_container_add(GTK_CONTAINER(print_type_vb), detail_rb);
gtk_widget_show(detail_rb);
-
+
/* "Print hex" check button. */
hex_cb = dlg_check_button_new_with_label_with_mnemonic("Print _hex data",
accel_group);
@@ -475,7 +475,7 @@ print_file_cb(GtkWidget *file_bt, gpointer file_te)
static void
print_fs_ok_cb(GtkWidget *w _U_, gpointer data)
{
-
+
gtk_entry_set_text(GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(data),
PRINT_FILE_TE_KEY)),
gtk_file_selection_get_filename (GTK_FILE_SELECTION(data)));
@@ -519,7 +519,7 @@ void setup_mswin_print( print_args_t *print_args) {
print_args->dest = g_strdup(path1);
print_args->to_file = TRUE;
}
-#endif
+#endif
static void
print_ok_cb(GtkWidget *ok_bt, gpointer parent_w)
@@ -542,7 +542,7 @@ print_ok_cb(GtkWidget *ok_bt, gpointer parent_w)
#ifdef _WIN32
win_printer_flag = TRUE;
setup_mswin_print(&print_args);
-#else
+#else
print_args.dest = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(ok_bt),
PRINT_CMD_TE_KEY))));
#endif
diff --git a/gtk/print_mswin.c b/gtk/print_mswin.c
index 7eff583..6b5f0a8 100644
--- a/gtk/print_mswin.c
+++ b/gtk/print_mswin.c
@@ -6,17 +6,17 @@
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 2002, Jeffrey C. Foster <jfoste@woodward.com>
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -41,7 +41,7 @@ void init_doc_struct( DOCINFO* di, char* docname);
void print_file( char* file_name, HDC hdc);
-
+
void print_mswin(char *file_name)
{
@@ -49,16 +49,16 @@ void print_mswin(char *file_name)
DOCINFO di;
HWND hWndParent = HWND_DESKTOP; /* would be better to be a real window */
-
+
/* Need a printer DC to print to. */
hDC = get_printer_dc();
-
+
/* Did you get a good DC?, Cancel will return NULL also, so what to do? */
if( !hDC)
{
return;
}
-
+
/* You always have to use an AbortProc(). */
if( SetAbortProc( hDC, abort_proc ) == SP_ERROR )
{
@@ -66,43 +66,43 @@ void print_mswin(char *file_name)
"Error", MB_APPLMODAL | MB_OK);
return;
}
-
+
/* Init the DOCINFO and start the document. */
init_doc_struct( &di, "MyDoc");
StartDoc( hDC, &di );
-
+
/* Print one page. */
StartPage( hDC );
print_file(file_name, hDC );
EndPage( hDC );
-
+
/* Indicate end of document. */
EndDoc( hDC );
-
+
/* Clean up */
DeleteDC( hDC );
}
-
+
/*===============================*/
/* Obtain printer device context */
/* ==============================*/
HDC get_printer_dc(void)
{
PRINTDLG pdlg;
-
+
/* Initialize the PRINTDLG structure. */
memset( &pdlg, 0, sizeof( PRINTDLG ) );
pdlg.lStructSize = sizeof( PRINTDLG );
/* Set the flag to return printer DC. */
pdlg.Flags = PD_RETURNDC;
-
+
/* Invoke the printer dialog box. */
PrintDlg( &pdlg );
/* hDC member of the PRINTDLG structure contains the printer DC. */
return pdlg.hDC;
}
-
+
/*===============================*/
/* The Abort Procudure */
/* ==============================*/
@@ -116,7 +116,7 @@ void print_mswin(char *file_name)
}
return TRUE;
}
-
+
/*===============================*/
/* Initialize DOCINFO structure */
/* ==============================*/
@@ -128,7 +128,7 @@ void print_mswin(char *file_name)
di->cbSize = sizeof( DOCINFO );
di->lpszDocName = docname;
}
-
+
/*===============================*/
/* Drawing on the DC */
/* ==============================*/
@@ -143,7 +143,7 @@ void print_file( char *file_name, HDC hdc) {
int results, cnt=0, y_pos = y_offset, y_cnt = 0;
char buf[ max_buf_size];
char ch;
- TEXTMETRIC tm;
+ TEXTMETRIC tm;
GetTextMetrics(hdc, &tm);
SetMapMode (hdc, MM_TEXT);
@@ -161,13 +161,13 @@ void print_file( char *file_name, HDC hdc) {
if ( ch == 0x0a){
buf[ cnt] = 0;
TextOut(hdc, x_offset,y_pos, buf, strlen(buf));
- y_pos += tm.tmHeight;
+ y_pos += tm.tmHeight;
cnt = 0;
if ( ++y_cnt == max_lines){
/* Print one page. */
EndPage( hdc );
StartPage( hdc );
- y_pos = y_offset;
+ y_pos = y_offset;
y_cnt = 0;
}
@@ -175,18 +175,18 @@ void print_file( char *file_name, HDC hdc) {
}else { if ( cnt == ( max_buf_size - 1)) {
buf[ cnt] = 0;
TextOut(hdc, x_offset, y_pos, buf, strlen(buf));
- y_pos += tm.tmHeight;
+ y_pos += tm.tmHeight;
cnt = 0;
if ( ++y_cnt == max_lines){
/* Print one page. */
EndPage( hdc );
StartPage( hdc );
- y_pos = y_offset;
+ y_pos = y_offset;
y_cnt = 0;
}
}
-
+
buf[ cnt++] = ch;
}
}
diff --git a/gtk/print_mswin.h b/gtk/print_mswin.h
index 3c42d97..a7159e4 100644
--- a/gtk/print_mswin.h
+++ b/gtk/print_mswin.h
@@ -6,22 +6,22 @@
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 2002, Jeffrey C. Foster <jfoste@woodward.com>
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
+
void print_mswin(char *file_name);
diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c
index 36f95dd..2984869 100644
--- a/gtk/print_prefs.c
+++ b/gtk/print_prefs.c
@@ -1,22 +1,22 @@
/* print_prefs.c
* Dialog boxes for preferences for printing
*
- * $Id: print_prefs.c,v 1.13 2002/08/13 07:54:37 guy Exp $
+ * $Id: print_prefs.c,v 1.14 2002/08/28 21:03:49 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -171,7 +171,7 @@ printer_opts_file_cb(GtkWidget *file_bt, gpointer file_te) {
static void
printer_opts_fs_ok_cb(GtkWidget *w, gpointer data) {
-
+
gtk_entry_set_text(GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(data),
PRINT_FILE_TE_KEY)),
gtk_file_selection_get_filename (GTK_FILE_SELECTION(data)));
@@ -180,9 +180,9 @@ printer_opts_fs_ok_cb(GtkWidget *w, gpointer data) {
static void
printer_opts_fs_cancel_cb(GtkWidget *w _U_, gpointer data) {
-
+
gtk_widget_destroy(GTK_WIDGET(data));
-}
+}
static void
printer_opts_fs_destroy_cb(GtkWidget *win, gpointer data _U_)
diff --git a/gtk/print_prefs.h b/gtk/print_prefs.h
index e098138..1b9b3b3 100644
--- a/gtk/print_prefs.h
+++ b/gtk/print_prefs.h
@@ -1,23 +1,23 @@
/* print_prefs.h
* Definitions for print preferences window
*
- * $Id: print_prefs.h,v 1.5 2000/08/21 08:09:15 guy Exp $
+ * $Id: print_prefs.h,v 1.6 2002/08/28 21:03:49 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/progress_dlg.c b/gtk/progress_dlg.c
index 8e1ad88..6494356 100644
--- a/gtk/progress_dlg.c
+++ b/gtk/progress_dlg.c
@@ -1,22 +1,22 @@
/* progress_dlg.c
* Routines for progress-bar (modal) dialog
*
- * $Id: progress_dlg.c,v 1.12 2002/08/28 10:07:37 guy Exp $
+ * $Id: progress_dlg.c,v 1.13 2002/08/28 21:03:49 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -191,7 +191,7 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title, const gcha
bbox = gtk_hbutton_box_new();
gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
gtk_container_add(GTK_CONTAINER(main_vb), bbox);
-
+
/*
* Allow user to either click a "stop this operation" button, or
* the close button on the window, to stop an operation in
@@ -218,8 +218,8 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title, const gcha
}
progdlg_t *
-delayed_create_progress_dlg(const gchar *task_title, const gchar *item_title,
- const gchar *stop_title, gboolean *stop_flag,
+delayed_create_progress_dlg(const gchar *task_title, const gchar *item_title,
+ const gchar *stop_title, gboolean *stop_flag,
GTimeVal *start_time, gfloat progress)
{
GTimeVal time_now;
@@ -267,7 +267,7 @@ delayed_create_progress_dlg(const gchar *task_title, const gchar *item_title,
else
min_display = 2 * MIN_DISPLAY_DEFAULT - delta_time;
/* = MIN_DISPLAY_DEFAULT - (delta_time - MIN_DISPLAY_DEFAULT) */
-
+
/* Assuming the progress increases linearly, see if the progress
* dialog would be displayed for at least min_display microseconds if
* we created it now.
@@ -294,7 +294,7 @@ static gint
delete_event_cb(GtkWidget *w _U_, GdkEvent *event _U_, gpointer data)
{
gboolean *stop_flag = (gboolean *) data;
-
+
*stop_flag = TRUE;
return TRUE;
}
@@ -309,7 +309,7 @@ static void
stop_cb(GtkWidget *w _U_, gpointer data)
{
gboolean *stop_flag = (gboolean *) data;
-
+
*stop_flag = TRUE;
}
@@ -349,7 +349,7 @@ update_progress_dlg(progdlg_t *dlg, gfloat percentage, gchar *status)
g_snprintf(tmp, sizeof(tmp), "%02lu:%02lu", ul_elapsed / 60, ul_elapsed % 60);
gtk_label_set_text(dlg->elapsed_lb, tmp);
- /* show "Time Left" only,
+ /* show "Time Left" only,
* if at least 5% and 3 seconds running (to get a useful estimation) */
if (ul_percentage >= 5 && delta_time >= 3 * 1e6) {
ul_left = (delta_time / percentage - delta_time) / 1000 / 1000;
diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c
index 94c2ee9..b66863f 100644
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -1,6 +1,6 @@
/* proto_dlg.c
*
- * $Id: proto_dlg.c,v 1.12 2002/08/02 22:34:54 jmayer Exp $
+ * $Id: proto_dlg.c,v 1.13 2002/08/28 21:03:49 jmayer Exp $
*
* Laurent Deniel <deniel@worldnet.fr>
*
@@ -12,12 +12,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -69,9 +69,9 @@ typedef struct protocol_data {
void proto_cb(GtkWidget *w _U_, gpointer data _U_)
{
- GtkWidget *main_vb, *bbox, *proto_nb, *apply_bt, *cancel_bt, *ok_bt,
+ GtkWidget *main_vb, *bbox, *proto_nb, *apply_bt, *cancel_bt, *ok_bt,
*label, *scrolled_w, *selection_vb, *button;
-
+
if (proto_w != NULL) {
reactivate_window(proto_w);
return;
@@ -92,7 +92,7 @@ void proto_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_widget_show(main_vb);
/* Protocol topics container */
-
+
proto_nb = gtk_notebook_new();
gtk_container_add(GTK_CONTAINER(main_vb), proto_nb);
/* XXX do not know why I need this to fill all space around buttons */
@@ -102,12 +102,12 @@ void proto_cb(GtkWidget *w _U_, gpointer data _U_)
/* Protocol selection panel ("enable/disable" protocols) */
selection_vb = gtk_vbox_new(FALSE, 0);
- gtk_container_border_width(GTK_CONTAINER(selection_vb), 1);
+ gtk_container_border_width(GTK_CONTAINER(selection_vb), 1);
label = gtk_label_new("Button pressed: protocol decoding is enabled");
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(selection_vb), label, FALSE, FALSE, 0);
- scrolled_w = scrolled_window_new(NULL, NULL);
- gtk_container_set_border_width(GTK_CONTAINER(scrolled_w), 1);
+ scrolled_w = scrolled_window_new(NULL, NULL);
+ gtk_container_set_border_width(GTK_CONTAINER(scrolled_w), 1);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_w),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
@@ -155,7 +155,7 @@ void proto_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_widget_show(proto_nb);
- /* Ok, Apply, Cancel Buttons */
+ /* Ok, Apply, Cancel Buttons */
bbox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
@@ -250,14 +250,14 @@ static void proto_destroy_cb(GtkWidget *w _U_, gpointer data _U_)
if (proto_w)
gtk_widget_destroy(proto_w);
proto_w = NULL;
-
+
/* remove protocol list */
if (protocol_list) {
for (entry = protocol_list; entry != NULL; entry = g_slist_next(entry)) {
g_free(entry->data);
}
g_slist_free(protocol_list);
- protocol_list = NULL;
+ protocol_list = NULL;
}
}
@@ -271,7 +271,7 @@ static gboolean proto_delete_cb(GtkWidget *proto_w, gpointer dummy _U_)
return FALSE;
}
-static void proto_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
+static void proto_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
{
gboolean redissect;
@@ -281,13 +281,13 @@ static void proto_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
redissect_packets(&cfile);
}
-static void proto_apply_cb(GtkWidget *apply_bt _U_, gpointer parent_w)
+static void proto_apply_cb(GtkWidget *apply_bt _U_, gpointer parent_w)
{
if (set_proto_selection(GTK_WIDGET(parent_w)))
redissect_packets(&cfile);
}
-static void proto_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w)
+static void proto_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w)
{
gboolean redissect;
@@ -311,7 +311,7 @@ static gboolean set_proto_selection(GtkWidget *parent_w)
if (proto_is_protocol_enabled(p->hfinfo_index) != GTK_TOGGLE_BUTTON (button)->active) {
proto_set_decoding(p->hfinfo_index, GTK_TOGGLE_BUTTON (button)->active);
need_redissect = TRUE;
- }
+ }
}
return need_redissect;
@@ -332,7 +332,7 @@ static gboolean revert_proto_selection(void)
if (proto_is_protocol_enabled(p->hfinfo_index) != p->was_enabled) {
proto_set_decoding(p->hfinfo_index, p->was_enabled);
need_redissect = TRUE;
- }
+ }
}
return need_redissect;
@@ -341,7 +341,7 @@ static gboolean revert_proto_selection(void)
gint protocol_data_compare(gconstpointer a, gconstpointer b)
{
- return strcmp(((protocol_data_t *)a)->abbrev,
+ return strcmp(((protocol_data_t *)a)->abbrev,
((protocol_data_t *)b)->abbrev);
}
@@ -367,8 +367,8 @@ static void show_proto_selection(GtkWidget *main, GtkWidget *container)
p->abbrev = proto_get_protocol_filter_name(i);
p->hfinfo_index = i;
p->was_enabled = proto_is_protocol_enabled(i);
- protocol_list = g_slist_insert_sorted(protocol_list,
- p, protocol_data_compare);
+ protocol_list = g_slist_insert_sorted(protocol_list,
+ p, protocol_data_compare);
nb_proto ++;
}
}
diff --git a/gtk/proto_dlg.h b/gtk/proto_dlg.h
index 187c8c3..a775823 100644
--- a/gtk/proto_dlg.h
+++ b/gtk/proto_dlg.h
@@ -1,6 +1,6 @@
/* proto_dlg.h
*
- * $Id: proto_dlg.h,v 1.1 2000/08/13 14:03:49 deniel Exp $
+ * $Id: proto_dlg.h,v 1.2 2002/08/28 21:03:49 jmayer Exp $
*
* Laurent Deniel <deniel@worldnet.fr>
*
@@ -12,12 +12,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index 7d7ffea..0d06c78 100644
--- a/gtk/proto_draw.c
+++ b/gtk/proto_draw.c
@@ -1,7 +1,7 @@
/* proto_draw.c
* Routines for GTK+ packet display
*
- * $Id: proto_draw.c,v 1.56 2002/08/02 22:34:54 jmayer Exp $
+ * $Id: proto_draw.c,v 1.57 2002/08/28 21:03:49 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -9,17 +9,17 @@
*
* Jeff Foster, 2001/03/12, added support for displaying named
* data sources as tabbed hex windows
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -134,7 +134,7 @@ redraw_hex_dump(GtkWidget *nb, frame_data *fd, field_info *finfo)
GtkWidget *bv;
const guint8 *data;
guint len;
-
+
bv = get_notebook_bv_ptr(nb);
if (bv != NULL) {
data = get_byte_view_data_and_length(bv, &len);
@@ -149,7 +149,7 @@ redraw_hex_dump_all(void)
{
if (cfile.current_frame != NULL)
redraw_hex_dump( byte_nb_ptr, cfile.current_frame, finfo_selected);
-
+
redraw_hex_dump_packet_wins();
}
@@ -413,7 +413,7 @@ byte_view_button_press_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
if(widget == NULL || event == NULL || data == NULL) {
return FALSE;
}
-
+
if(event->type == GDK_BUTTON_PRESS) {
event_button = (GdkEventButton *) event;
@@ -566,7 +566,7 @@ packet_hex_print_common(GtkText *bv, const guint8 *pd, int len, int bstart,
/* Clear out the text */
gtk_text_set_point(bv, 0);
- /* Keep GTK+ 1.2.3 through 1.2.6 from dumping core - see
+ /* Keep GTK+ 1.2.3 through 1.2.6 from dumping core - see
http://www.ethereal.com/lists/ethereal-dev/199912/msg00312.html and
http://www.gnome.org/mailing-lists/archives/gtk-devel-list/1999-October/0051.shtml
for more information */
@@ -605,7 +605,7 @@ packet_hex_print_common(GtkText *bv, const guint8 *pd, int len, int bstart,
line[cur++] = ' ';
line[cur++] = ' ';
line[cur] = '\0';
-
+
/* Display with inverse video ? */
if (prefs.gui_hex_dump_highlight_style) {
gtk_text_insert(bv, m_r_font, &BLACK, &WHITE, line, -1);
@@ -902,7 +902,7 @@ set_ptree_style_cb(gpointer data, gpointer user_data)
{
gtk_widget_set_style((GtkWidget *)data, (GtkStyle *)user_data);
}
-
+
void
set_ptree_font_all(GdkFont *font)
{
@@ -933,7 +933,7 @@ create_tree_view(gint tv_size, e_prefs *prefs, GtkWidget *pane,
gtk_paned_pack1(GTK_PANED(pane), tv_scrollw, TRUE, TRUE);
gtk_widget_set_usize(tv_scrollw, -1, tv_size);
gtk_widget_show(tv_scrollw);
-
+
tree_view = ctree_new(1, 0);
gtk_signal_connect( GTK_OBJECT(tree_view), "key-press-event",
(GtkSignalFunc) toggle_tree, NULL );
@@ -1037,7 +1037,7 @@ proto_tree_draw_node(GNode *node, gpointer data)
is_leaf = TRUE;
is_expanded = FALSE;
}
-
+
info.ctree = parent_info->ctree;
parent = gtk_ctree_insert_node ( info.ctree, parent_info->ctree_node, NULL,
&label_ptr, 5, NULL, NULL, NULL, NULL,
diff --git a/gtk/proto_draw.h b/gtk/proto_draw.h
index 5b400a4..28c8414 100644
--- a/gtk/proto_draw.h
+++ b/gtk/proto_draw.h
@@ -1,22 +1,22 @@
/* proto_draw.h
* Definitions for GTK+ packet display structures and routines
*
- * $Id: proto_draw.h,v 1.18 2002/06/04 07:03:57 guy Exp $
+ * $Id: proto_draw.h,v 1.19 2002/08/28 21:03:49 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c
index e9e53be..4f058c3 100644
--- a/gtk/proto_hier_stats_dlg.c
+++ b/gtk/proto_hier_stats_dlg.c
@@ -1,6 +1,6 @@
/* proto_hier_stats_dlg.c
*
- * $Id: proto_hier_stats_dlg.c,v 1.9 2002/03/05 11:56:00 guy Exp $
+ * $Id: proto_hier_stats_dlg.c,v 1.10 2002/08/28 21:03:49 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -146,7 +146,7 @@ create_tree(GtkWidget *container, ph_stats_t *ps)
for (i = 0; i < NUM_STAT_COLUMNS; i++) {
gtk_clist_set_column_auto_resize(GTK_CLIST(tree), i, TRUE);
}
-
+
/* Right justify numeric columns */
for (i = 1; i <= 5; i++) {
diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c
index 62cd109..5be59e3 100644
--- a/gtk/simple_dialog.c
+++ b/gtk/simple_dialog.c
@@ -1,23 +1,23 @@
/* simple_dialog.c
* Simple message dialog box routines.
*
- * $Id: simple_dialog.c,v 1.10 2002/06/04 11:24:35 guy Exp $
+ * $Id: simple_dialog.c,v 1.11 2002/08/28 21:03:49 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -51,17 +51,17 @@ static const gchar bm_key[] = "button mask";
/* Simple dialog function - Displays a dialog box with the supplied message
* text.
- *
+ *
* Args:
* type : One of ESD_TYPE_*.
* btn_mask : The address of a gint. The value passed in determines if
- * the 'Cancel' button is displayed. The button pressed by the
+ * the 'Cancel' button is displayed. The button pressed by the
* user is passed back.
* msg_format : Sprintf-style format of the text displayed in the dialog.
* ... : Argument list for msg_format
*
*/
-
+
#define ESD_MAX_MSG_LEN 2048
void
simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) {
@@ -109,7 +109,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) {
top_hb = gtk_hbox_new(FALSE, 10);
gtk_container_add(GTK_CONTAINER(main_vb), top_hb);
gtk_widget_show(top_hb);
-
+
style = gtk_widget_get_style(win);
cmap = gdk_colormap_get_system();
pixmap = gdk_pixmap_colormap_create_from_xpm_d(NULL, cmap, &mask,
@@ -128,7 +128,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) {
gtk_label_set_justify(GTK_LABEL(msg_label), GTK_JUSTIFY_FILL);
gtk_container_add(GTK_CONTAINER(top_hb), msg_label);
gtk_widget_show(msg_label);
-
+
/* Button row */
bbox = gtk_hbutton_box_new();
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
@@ -137,7 +137,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) {
ok_btn = gtk_button_new_with_label ("OK");
gtk_signal_connect_object(GTK_OBJECT(ok_btn), "clicked",
- GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT (win));
+ GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT (win));
gtk_container_add(GTK_CONTAINER(bbox), ok_btn);
GTK_WIDGET_SET_FLAGS(ok_btn, GTK_CAN_DEFAULT);
gtk_widget_grab_default(ok_btn);
@@ -171,7 +171,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) {
static void
simple_dialog_cancel_cb(GtkWidget *w _U_, gpointer win) {
gint *btn_mask = (gint *) gtk_object_get_data(win, bm_key);
-
+
if (btn_mask)
*btn_mask = ESD_BTN_CANCEL;
gtk_widget_destroy(GTK_WIDGET(win));
diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c
index d926c10..ffe0902 100644
--- a/gtk/stream_prefs.c
+++ b/gtk/stream_prefs.c
@@ -1,22 +1,22 @@
/* stream_prefs.c
* Dialog boxes for preferences for the stream window
*
- * $Id: stream_prefs.c,v 1.11 2002/03/05 11:56:00 guy Exp $
+ * $Id: stream_prefs.c,v 1.12 2002/08/28 21:03:49 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -70,14 +70,14 @@ stream_prefs_show()
color_t_to_gdkcolor(&tcolors[CBG_IDX], &prefs.st_client_bg);
color_t_to_gdkcolor(&tcolors[SFG_IDX], &prefs.st_server_fg);
color_t_to_gdkcolor(&tcolors[SBG_IDX], &prefs.st_server_bg);
-
+
curcolor = &tcolors[CFG_IDX];
scolor[CS_RED] = (gdouble) (curcolor->red) / 65535.0;
scolor[CS_GREEN] = (gdouble) (curcolor->green) / 65535.0;
scolor[CS_BLUE] = (gdouble) (curcolor->blue) / 65535.0;
scolor[CS_OPACITY] = 1.0;
-
+
/* Enclosing containers for each row of widgets */
main_vb = gtk_vbox_new(FALSE, 5);
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
@@ -100,7 +100,7 @@ stream_prefs_show()
menu = gtk_menu_new ();
for (i = 0; i < mcount; i++){
menuitem = gtk_menu_item_new_with_label (mt[i]);
- gtk_object_set_data(GTK_OBJECT(menuitem), STREAM_CS_KEY,
+ gtk_object_set_data(GTK_OBJECT(menuitem), STREAM_CS_KEY,
(gpointer) colorsel);
gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
GTK_SIGNAL_FUNC(update_current_color), &tcolors[i]);
@@ -129,7 +129,7 @@ stream_prefs_show()
gtk_object_set_data(GTK_OBJECT(colorsel), STREAM_SAMPLE_KEY,
(gpointer) sample);
- gtk_signal_connect(GTK_OBJECT(colorsel), "color-changed",
+ gtk_signal_connect(GTK_OBJECT(colorsel), "color-changed",
GTK_SIGNAL_FUNC(update_text_color), NULL);
gtk_widget_show(colorsel);
@@ -143,11 +143,11 @@ update_text_color(GtkWidget *w, gpointer data _U_) {
gdouble scolor[4];
gtk_color_selection_get_color(GTK_COLOR_SELECTION(w), &scolor[CS_RED]);
-
+
curcolor->red = (gushort) (scolor[CS_RED] * 65535.0);
curcolor->green = (gushort) (scolor[CS_GREEN] * 65535.0);
curcolor->blue = (gushort) (scolor[CS_BLUE] * 65535.0);
-
+
gtk_text_freeze(sample);
gtk_text_set_point(sample, 0);
gtk_text_forward_delete(sample, gtk_text_get_length(sample));
@@ -166,12 +166,12 @@ update_current_color(GtkWidget *w, gpointer data)
gdouble scolor[4];
curcolor = (GdkColor *) data;
-
+
scolor[CS_RED] = (gdouble) (curcolor->red) / 65535.0;
scolor[CS_GREEN] = (gdouble) (curcolor->green) / 65535.0;
scolor[CS_BLUE] = (gdouble) (curcolor->blue) / 65535.0;
scolor[CS_OPACITY] = 1.0;
-
+
gtk_color_selection_set_color(colorsel, &scolor[CS_RED]);
}
diff --git a/gtk/stream_prefs.h b/gtk/stream_prefs.h
index b9ea1f9..00d87bb 100644
--- a/gtk/stream_prefs.h
+++ b/gtk/stream_prefs.h
@@ -1,23 +1,23 @@
/* stream_prefs.h
* Definitions for stream preferences window
*
- * $Id: stream_prefs.h,v 1.3 2000/08/21 08:09:17 guy Exp $
+ * $Id: stream_prefs.h,v 1.4 2002/08/28 21:03:49 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1999 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c
index 1913c29..1f057f9 100644
--- a/gtk/summary_dlg.c
+++ b/gtk/summary_dlg.c
@@ -1,7 +1,7 @@
/* summary_dlg.c
* Routines for capture file summary window
*
- * $Id: summary_dlg.c,v 1.12 2002/03/05 11:56:00 guy Exp $
+ * $Id: summary_dlg.c,v 1.13 2002/08/28 21:03:49 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -62,7 +62,7 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
{
summary_tally summary;
GtkWidget *sum_open_w,
- *main_vb, *file_fr, *data_fr, *capture_fr, *file_box,
+ *main_vb, *file_fr, *data_fr, *capture_fr, *file_box,
*data_box, *capture_box, *bbox, *close_bt;
gchar string_buff[SUM_STR_MAX];
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 2fc7c5a..7c81686 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -3,22 +3,22 @@
* By Pavel Mores <pvl@uh.cz>
* Win32 port: rwh@unifiedtech.com
*
- * $Id: tcp_graph.c,v 1.19 2002/08/02 22:34:54 jmayer Exp $
+ * $Id: tcp_graph.c,v 1.20 2002/08/28 21:03:49 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -773,7 +773,7 @@ static void create_drawing_area (struct graph *g)
* and we don't have the GC's at all. so we just postpone installation
* of configure handler until we're ready to deal with it.
*
- * !!! NEMLO BY TO BT NA KONCI graph_init_sequence()? !!!
+ * !!! NEMLO BY TO BT NA KONCI graph_init_sequence()? !!!
*
*/
gtk_signal_connect (GTK_OBJECT(g->drawing_area),"configure_event",
@@ -978,7 +978,7 @@ static void callback_create_help (GtkWidget *widget _U_, gpointer data)
gtk_box_pack_start (GTK_BOX (box), close, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (close), "clicked",
(GtkSignalFunc )callback_close_help, toplevel);
-
+
gtk_widget_show_all (toplevel);
}
@@ -1166,9 +1166,9 @@ static void callback_zoom_flags (GtkWidget *toggle, gpointer data)
int flag = (int )gtk_object_get_data (GTK_OBJECT (toggle), "flag");
if (GTK_TOGGLE_BUTTON (toggle)->active)
- g->zoom.flags |= flag;
+ g->zoom.flags |= flag;
else
- g->zoom.flags &= ~flag;
+ g->zoom.flags &= ~flag;
}
static void update_zoom_spins (struct graph *g)
@@ -1381,9 +1381,9 @@ static void callback_mag_flags (GtkWidget *toggle, gpointer data)
int flag = (int )gtk_object_get_data (GTK_OBJECT (toggle), "flag");
if (GTK_TOGGLE_BUTTON (toggle)->active)
- g->magnify.flags |= flag;
+ g->magnify.flags |= flag;
else
- g->magnify.flags &= ~flag;
+ g->magnify.flags &= ~flag;
}
static GtkWidget *control_panel_create_zoomlock_group (struct graph *g)
@@ -1419,9 +1419,9 @@ static void callback_zoomlock_h (GtkWidget *toggle, gpointer data)
struct graph *g = (struct graph * )data;
if (GTK_TOGGLE_BUTTON (toggle)->active)
- g->zoom.flags |= ZOOM_HLOCK;
+ g->zoom.flags |= ZOOM_HLOCK;
else
- g->zoom.flags &= ~ZOOM_HLOCK;
+ g->zoom.flags &= ~ZOOM_HLOCK;
}
static void callback_zoomlock_v (GtkWidget *toggle, gpointer data)
@@ -1429,9 +1429,9 @@ static void callback_zoomlock_v (GtkWidget *toggle, gpointer data)
struct graph *g = (struct graph * )data;
if (GTK_TOGGLE_BUTTON (toggle)->active)
- g->zoom.flags |= ZOOM_VLOCK;
+ g->zoom.flags |= ZOOM_VLOCK;
else
- g->zoom.flags &= ~ZOOM_VLOCK;
+ g->zoom.flags &= ~ZOOM_VLOCK;
}
static GtkWidget *control_panel_create_cross_group (struct graph *g)
@@ -1523,9 +1523,9 @@ static GtkWidget *control_panel_create_graph_type_group (struct graph *g)
(gpointer )0);
gtk_object_set_data (GTK_OBJECT (graph_tseqttrace), "new-graph-type",
(gpointer )1);
- gtk_object_set_data (GTK_OBJECT (graph_tput), "new-graph-type",
+ gtk_object_set_data (GTK_OBJECT (graph_tput), "new-graph-type",
(gpointer )2);
- gtk_object_set_data (GTK_OBJECT (graph_rtt), "new-graph-type",
+ gtk_object_set_data (GTK_OBJECT (graph_rtt), "new-graph-type",
(gpointer )3);
gtk_signal_connect (GTK_OBJECT (graph_tseqttrace), "toggled",
@@ -2207,7 +2207,7 @@ static void h_axis_pixmap_draw (struct axis *axis)
gdk_draw_rectangle (axis->pixmap[not_disp], g->bg_gc, TRUE, 0, 0,
axis->p.width, axis->p.height);
/* axis */
- gdk_draw_line (axis->pixmap[not_disp], g->fg_gc, 0, 0,
+ gdk_draw_line (axis->pixmap[not_disp], g->fg_gc, 0, 0,
axis->s.width + (axis->p.width-axis->s.width)/2.0, 0);
offset = g->wp.x - g->geom.x;
@@ -2341,10 +2341,10 @@ static void axis_compute_ticks (struct axis *axis, double x0, double xmax, int d
axis->minor = steps[jj] * pow (10, ii);
check_needed = TRUE;
diminished = TRUE;
-
+
debug(DBS_AXES_TICKS) printf ("axis->minor diminished to %.1f\n",
axis->minor);
-
+
if (axis->minor*zoom < 10) {
debug(DBS_AXES_TICKS) printf ("refusing axis->minor of %f: "
"axis->minor*zoom == %f\n", axis->minor, axis->minor*zoom);
@@ -2892,7 +2892,7 @@ static gint motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
y = event->y;
state = event->state;
}
-
+
/* Testing just (state & GDK_BUTTON1_MASK) is not enough since when button1
* is pressed while pointer is in motion, we will receive one more motion
* notify *before* we get the button press. This last motion notify works
@@ -2929,7 +2929,7 @@ static gint motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
if (g->cross.draw)
cross_draw (g, x, y);
}
-
+
return TRUE;
}
@@ -3583,7 +3583,7 @@ static void rtt_initialize (struct graph *g)
for (tmp=g->segments; tmp; tmp=tmp->next) {
if (compare_headers (g->current, tmp, COMPARE_CURR_DIR)) {
unsigned int seqno = g_ntohl (tmp->tcphdr.seq);
-
+
if (!first)
first= tmp;
diff --git a/gtk/tcp_graph.h b/gtk/tcp_graph.h
index ea302f0..c9e5374 100644
--- a/gtk/tcp_graph.h
+++ b/gtk/tcp_graph.h
@@ -3,22 +3,22 @@
* By Pavel Mores <pvl@uh.cz>
* Win32 port: rwh@unifiedtech.com
*
- * $Id: tcp_graph.h,v 1.1 2001/12/08 09:27:51 guy Exp $
+ * $Id: tcp_graph.h,v 1.2 2002/08/28 21:03:50 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/gtk/ui_util.c b/gtk/ui_util.c
index f1e2d86..6327f24 100644
--- a/gtk/ui_util.c
+++ b/gtk/ui_util.c
@@ -1,22 +1,22 @@
/* ui_util.c
* UI utility routines
*
- * $Id: ui_util.c,v 1.9 2002/03/05 11:56:00 guy Exp $
+ * $Id: ui_util.c,v 1.10 2002/08/28 21:03:50 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -75,8 +75,8 @@ reactivate_window(GtkWidget *win)
/* Set our window icon. The GDK documentation doesn't provide any
actual documentation for gdk_window_set_icon(), so we'll steal
libgimp/gimpdialog.c:gimp_dialog_realize_callback() from the Gimp
- sources and assume it's safe.
-
+ sources and assume it's safe.
+
XXX - The current icon size is fixed at 16x16 pixels, which looks fine
with kwm (KDE 1.x's window manager), Sawfish (the "default" window
manager for GNOME?), and under Windows with Exceed putting X windows
@@ -116,7 +116,7 @@ reactivate_window(GtkWidget *win)
part of the installation of Ethereal.
*/
void
-window_icon_realize_cb (GtkWidget *win, gpointer data _U_)
+window_icon_realize_cb (GtkWidget *win, gpointer data _U_)
{
#ifndef WIN32
static GdkPixmap *icon_pmap = NULL;
diff --git a/gtk/ui_util.h b/gtk/ui_util.h
index 259662e..757e770 100644
--- a/gtk/ui_util.h
+++ b/gtk/ui_util.h
@@ -1,22 +1,22 @@
/* ui_util.h
* Definitions for UI utility routines
*
- * $Id: ui_util.h,v 1.4 2002/01/11 07:40:32 guy Exp $
+ * $Id: ui_util.h,v 1.5 2002/08/28 21:03:50 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/in_cksum.c b/in_cksum.c
index 492ba64..4bf224e 100644
--- a/in_cksum.c
+++ b/in_cksum.c
@@ -2,7 +2,7 @@
* 4.4-Lite-2 Internet checksum routine, modified to take a vector of
* pointers/lengths giving the pieces to be checksummed.
*
- * $Id: in_cksum.c,v 1.8 2002/08/03 20:01:13 guy Exp $
+ * $Id: in_cksum.c,v 1.9 2002/08/28 21:00:06 jmayer Exp $
*/
/*
@@ -81,7 +81,7 @@ in_cksum(const vec_t *vec, int veclen)
* of a word spanning between this chunk and the
* last chunk.
*
- * s_util.c[0] is already saved when scanning previous
+ * s_util.c[0] is already saved when scanning previous
* chunk.
*/
s_util.c[1] = *(const guint8 *)w;
diff --git a/ipproto.c b/ipproto.c
index a6af774..c70a258 100644
--- a/ipproto.c
+++ b/ipproto.c
@@ -1,22 +1,22 @@
/* ipproto.c
* Routines for converting IPv4 protocol/v6 nxthdr field into string
*
- * $Id: ipproto.c,v 1.18 2002/08/02 23:35:46 jmayer Exp $
+ * $Id: ipproto.c,v 1.19 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/ipproto.h b/ipproto.h
index 7553076..591be73 100644
--- a/ipproto.h
+++ b/ipproto.h
@@ -2,22 +2,22 @@
* Declarations of IP protocol numbers, and of routines for converting
* IP protocol numbers into strings.
*
- * $Id: ipproto.h,v 1.5 2002/05/02 08:51:47 guy Exp $
+ * $Id: ipproto.h,v 1.6 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/llcsaps.h b/llcsaps.h
index 4e97618..c52ab93 100644
--- a/llcsaps.h
+++ b/llcsaps.h
@@ -1,23 +1,23 @@
/* llcsaps.h
* Defines LLC SAP values.
*
- * $Id: llcsaps.h,v 1.2 2001/01/05 19:07:37 guy Exp $
+ * $Id: llcsaps.h,v 1.3 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/menu.h b/menu.h
index 83b756c..a676e8d 100644
--- a/menu.h
+++ b/menu.h
@@ -2,22 +2,22 @@
* Definitions for menu routines with toolkit-independent APIs but
* toolkit-dependent implementations.
*
- * $Id: menu.h,v 1.9 2001/06/05 07:38:33 guy Exp $
+ * $Id: menu.h,v 1.10 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/mergecap.c b/mergecap.c
index f8bff1f..a8dc435 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -1,6 +1,6 @@
/* Combine two dump files, either by appending or by merging by timestamp
*
- * $Id: mergecap.c,v 1.10 2002/08/02 23:35:46 jmayer Exp $
+ * $Id: mergecap.c,v 1.11 2002/08/28 21:00:06 jmayer Exp $
*
* Written by Scott Renfro <scott@renfro.org> based on
* editcap by Richard Sharpe and Guy Harris
@@ -36,7 +36,7 @@
*/
static int verbose = 0; /* Not so verbose */
-/*
+/*
* Structures to manage our files
*/
typedef struct in_file_t {
@@ -62,12 +62,12 @@ static out_file_t out_file;
*/
static void
write_frame(guchar *user, const struct wtap_pkthdr *phdr, long offset _U_,
- union wtap_pseudo_header *pseudo_header, const guchar *buf)
+ union wtap_pseudo_header *pseudo_header, const guchar *buf)
{
wtap_dumper *pdh = (wtap_dumper*)user;
int err;
struct wtap_pkthdr snap_phdr;
-
+
if (verbose)
printf("Record: %u\n", out_file.count++);
@@ -110,7 +110,7 @@ append(int count, in_file_t in_files[], out_file_t *out_file)
* returns TRUE if first argument is earlier than second
*/
static gboolean
-is_earlier(struct timeval *l, struct timeval *r) {
+is_earlier(struct timeval *l, struct timeval *r) {
if (l->tv_sec > r->tv_sec) { /* left is later */
return FALSE;
} else if (l->tv_sec < r->tv_sec) { /* left is earlier */
@@ -121,7 +121,7 @@ is_earlier(struct timeval *l, struct timeval *r) {
/* either one < two or one == two
* either way, return one
*/
- return TRUE;
+ return TRUE;
}
@@ -145,7 +145,7 @@ earliest(int count, in_file_t in_files[]) {
}
return ei;
}
-
+
/*
* actually merge the files
*/
@@ -162,7 +162,7 @@ merge(int count, in_file_t in_files[], out_file_t *out_file)
/* now keep writing the earliest frame until we're out of frames */
while ( -1 != (i = earliest(count, in_files))) {
-
+
/* write out earliest frame, and fetch another from its
* input file
*/
@@ -190,9 +190,9 @@ select_frame_type(int count, in_file_t files[])
{
int i;
int selected_frame_type;
-
+
selected_frame_type = wtap_file_encap(files[0].wth);
-
+
for (i = 1; i < count; i++) {
int this_frame_type = wtap_file_encap(files[i].wth);
if (selected_frame_type != this_frame_type) {
@@ -212,7 +212,7 @@ select_frame_type(int count, in_file_t files[])
break;
}
}
-
+
if (verbose) {
fprintf(stderr, "mergecap: selected frame_type %s (%s)\n",
wtap_encap_string(selected_frame_type),
@@ -221,7 +221,7 @@ select_frame_type(int count, in_file_t files[])
return selected_frame_type;
}
-
+
/*
* Close the output file
@@ -310,7 +310,7 @@ open_in_files(int argc, char *argv[], in_file_t *in_files[])
int err;
in_file_t *files;
int files_size = argc * sizeof(in_file_t);
-
+
files = malloc(files_size);
if (!files) {
@@ -347,7 +347,7 @@ open_in_files(int argc, char *argv[], in_file_t *in_files[])
/*
* Show the usage
- */
+ */
static void
usage()
{
@@ -391,9 +391,9 @@ main(int argc, char *argv[])
gboolean do_append = FALSE;
int in_file_count = 0;
in_file_t *in_files = NULL;
-
+
/* initialize out_file */
- out_file.filename = NULL;
+ out_file.filename = NULL;
out_file.pdh = NULL; /* wiretap dumpfile */
out_file.file_type = WTAP_FILE_PCAP; /* default to "libpcap" */
out_file.frame_type = -2; /* leave type alone */
@@ -407,11 +407,11 @@ main(int argc, char *argv[])
case 'w':
out_file.filename = optarg;
break;
-
+
case 'a':
do_append = !do_append;
break;
-
+
case 'T':
out_file.frame_type = wtap_short_string_to_encap(optarg);
if (out_file.frame_type < 0) {
@@ -478,7 +478,7 @@ main(int argc, char *argv[])
/* set the outfile frame type */
if (out_file.frame_type == -2)
out_file.frame_type = select_frame_type(in_file_count, in_files);
-
+
/* open the outfile */
if (!open_outfile(&out_file, max_snapshot_length(in_file_count, in_files))) {
close_in_files(in_file_count, in_files);
diff --git a/mkstemp.c b/mkstemp.c
index 90051bd..07e1b0e 100644
--- a/mkstemp.c
+++ b/mkstemp.c
@@ -34,7 +34,7 @@
#endif
#ifndef __set_errno
-#define __set_errno(x) errno=(x)
+#define __set_errno(x) errno=(x)
#endif
#ifndef O_BINARY
#define O_BINARY 0
diff --git a/nlpid.h b/nlpid.h
index e0c2da7..ed26251 100644
--- a/nlpid.h
+++ b/nlpid.h
@@ -2,7 +2,7 @@
* Definitions of OSI NLPIDs (Network Layer Protocol IDs)
* Laurent Deniel <deniel@worldnet.fr>
*
- * $Id: nlpid.h,v 1.10 2001/12/02 00:07:46 guy Exp $
+ * $Id: nlpid.h,v 1.11 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -12,12 +12,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/oui.h b/oui.h
index 989757d..976682c 100644
--- a/oui.h
+++ b/oui.h
@@ -1,23 +1,23 @@
/* oui.h
* Definitions of OUIs
*
- * $Id: oui.h,v 1.11 2001/11/13 23:55:29 gram Exp $
+ * $Id: oui.h,v 1.12 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 - 2000 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/packet-aarp.c b/packet-aarp.c
index da74bd5..fa0aa22 100644
--- a/packet-aarp.c
+++ b/packet-aarp.c
@@ -1,7 +1,7 @@
/* packet-aarp.c
* Routines for Appletalk ARP packet disassembly
*
- * $Id: packet-aarp.c,v 1.36 2002/08/02 23:35:46 jmayer Exp $
+ * $Id: packet-aarp.c,v 1.37 2002/08/28 21:00:06 jmayer Exp $
*
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
*
@@ -13,12 +13,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -57,7 +57,7 @@ static gint ett_aarp = -1;
#ifndef AARP_REPLY
#define AARP_REPLY 0x0002
#endif
-#ifndef AARP_PROBE
+#ifndef AARP_PROBE
#define AARP_PROBE 0x0003
#endif
@@ -107,15 +107,15 @@ atalkid_to_str(const guint8 *ad) {
gint node;
static gchar str[3][16];
static gchar *cur;
-
+
if (cur == &str[0][0]) {
cur = &str[1][0];
- } else if (cur == &str[1][0]) {
+ } else if (cur == &str[1][0]) {
cur = &str[2][0];
- } else {
+ } else {
cur = &str[0][0];
}
-
+
node=ad[1]<<8|ad[2];
sprintf(cur, "%d.%d",node,ad[3]);
return cur;
@@ -139,7 +139,7 @@ aarpproaddr_to_str(const guint8 *ad, int ad_len, guint16 type) {
}
return bytes_to_str(ad, ad_len);
}
-
+
/* Offsets of fields within an AARP packet. */
#define AR_HRD 0
#define AR_PRO 2
@@ -215,17 +215,17 @@ dissect_aarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
if (tree) {
if ((op_str = match_strval(ar_op, op_vals)))
ti = proto_tree_add_protocol_format(tree, proto_aarp, tvb, 0,
- MIN_AARP_HEADER_SIZE + 2*ar_hln +
+ MIN_AARP_HEADER_SIZE + 2*ar_hln +
2*ar_pln, "AppleTalk Address Resolution Protocol (%s)", op_str);
else
ti = proto_tree_add_protocol_format(tree, proto_aarp, tvb, 0,
- MIN_AARP_HEADER_SIZE + 2*ar_hln +
+ MIN_AARP_HEADER_SIZE + 2*ar_hln +
2*ar_pln,
"AppleTalk Address Resolution Protocol (opcode 0x%04x)", ar_op);
aarp_tree = proto_item_add_subtree(ti, ett_aarp);
proto_tree_add_uint(aarp_tree, hf_aarp_hard_type, tvb, AR_HRD, 2,
ar_hrd);
- proto_tree_add_uint(aarp_tree, hf_aarp_proto_type, tvb, AR_PRO, 2,
+ proto_tree_add_uint(aarp_tree, hf_aarp_proto_type, tvb, AR_PRO, 2,
ar_pro);
proto_tree_add_uint(aarp_tree, hf_aarp_hard_size, tvb, AR_HLN, 1,
ar_hln);
@@ -244,7 +244,7 @@ dissect_aarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
proto_tree_add_bytes_format(aarp_tree, hf_aarp_src_proto_id, tvb, spa_offset, ar_pln,
spa_val,
"Sender ID: %s", spa_str);
- } else {
+ } else {
proto_tree_add_bytes_format(aarp_tree, hf_aarp_src_proto, tvb, spa_offset, ar_pln,
spa_val,
"Sender protocol address: %s", spa_str);
@@ -276,22 +276,22 @@ proto_register_aarp(void)
{
static hf_register_info hf[] = {
{ &hf_aarp_hard_type,
- { "Hardware type", "aarp.hard.type",
+ { "Hardware type", "aarp.hard.type",
FT_UINT16, BASE_HEX, VALS(hrd_vals), 0x0,
"", HFILL }},
{ &hf_aarp_proto_type,
- { "Protocol type", "aarp.proto.type",
+ { "Protocol type", "aarp.proto.type",
FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0,
- "", HFILL }},
+ "", HFILL }},
{ &hf_aarp_hard_size,
- { "Hardware size", "aarp.hard.size",
+ { "Hardware size", "aarp.hard.size",
FT_UINT8, BASE_DEC, NULL, 0x0,
"", HFILL }},
{ &hf_aarp_proto_size,
- { "Protocol size", "aarp.proto.size",
+ { "Protocol size", "aarp.proto.size",
FT_UINT8, BASE_DEC, NULL, 0x0,
"", HFILL }},
diff --git a/packet-afp.c b/packet-afp.c
index 66ffdec..4d8950e 100644
--- a/packet-afp.c
+++ b/packet-afp.c
@@ -2,7 +2,7 @@
* Routines for afp packet dissection
* Copyright 2002, Didier Gautheron <dgautheron@magic.fr>
*
- * $Id: packet-afp.c,v 1.20 2002/08/02 23:35:46 jmayer Exp $
+ * $Id: packet-afp.c,v 1.21 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -15,12 +15,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -48,9 +48,9 @@
AFP 2.1 & 2.2.pdf contained in AppleShare_IP_6.3_SDK
available from http://www.apple.com
-
+
AFP3.0.pdf from http://www.apple.com
-
+
The netatalk source code by Wesley Craig & Adrian Sun
http://netatalk.sf.net
*/
@@ -67,7 +67,7 @@
#define AFPSRVRINFO_SRVMSGS (1<<3) /* supports server messages */
#define AFPSRVRINFO_SRVSIGNATURE (1<<4) /* supports server signature */
#define AFPSRVRINFO_TCPIP (1<<5) /* supports tcpip */
-#define AFPSRVRINFO_SRVNOTIFY (1<<6) /* supports server notifications */
+#define AFPSRVRINFO_SRVNOTIFY (1<<6) /* supports server notifications */
#define AFPSRVRINFO_FASTBOZO (1<<15) /* fast copying */
/* AFP Attention Codes -- 4 bits */
@@ -76,7 +76,7 @@
#define AFPATTN_MESG (1 << 13) /* server has message */
#define AFPATTN_NORECONNECT (1 << 12) /* don't reconnect */
/* server notification */
-#define AFPATTN_NOTIFY (AFPATTN_MESG | AFPATTN_NORECONNECT)
+#define AFPATTN_NOTIFY (AFPATTN_MESG | AFPATTN_NORECONNECT)
/* extended bitmap -- 12 bits. volchanged is only useful w/ a server
* notification, and time is only useful for shutdown. */
@@ -151,10 +151,10 @@ static int proto_afp = -1;
static int hf_afp_reserved = -1;
static int hf_afp_command = -1; /* CommandCode */
-static int hf_afp_AFPVersion = -1;
-static int hf_afp_UAM = -1;
-static int hf_afp_user = -1;
-static int hf_afp_passwd = -1;
+static int hf_afp_AFPVersion = -1;
+static int hf_afp_UAM = -1;
+static int hf_afp_user = -1;
+static int hf_afp_passwd = -1;
static int hf_afp_pad = -1;
static int hf_afp_vol_flag_passwd = -1;
@@ -364,7 +364,7 @@ static const value_string CommandCode_vals[] = {
/* volume bitmap
- from Apple AFP3.0.pdf
+ from Apple AFP3.0.pdf
Table 1-2 p. 20
*/
#define kFPVolAttributeBit (1 << 0)
@@ -505,7 +505,7 @@ static const value_string map_id_type_vals[] = {
{0, NULL } };
/*
- volume attribute from Apple AFP3.0.pdf
+ volume attribute from Apple AFP3.0.pdf
Table 1-3 p. 22
*/
#define kReadOnly (1 << 0)
@@ -517,7 +517,7 @@ static const value_string map_id_type_vals[] = {
#define kSupportsUTF8Names (1 << 6)
/*
- directory bitmap from Apple AFP3.0.pdf
+ directory bitmap from Apple AFP3.0.pdf
Table 1-4 p. 31
*/
#define kFPAttributeBit (1 << 0)
@@ -555,7 +555,7 @@ static const value_string map_id_type_vals[] = {
#define AR_U_SEARCH (1 << 24) /* user has search access */
#define AR_U_READ (1 << 25) /* user has read access */
-#define AR_U_WRITE (1 << 26) /* user has write access */
+#define AR_U_WRITE (1 << 26) /* user has write access */
#define AR_BLANK (1 << 28) /* Blank Access Privileges (use parent dir privileges) */
#define AR_U_OWN (1 << 31) /* user is the owner */
@@ -591,7 +591,7 @@ static const value_string user_flag_vals[] = {
{0, NULL } };
/*
- file bitmap AFP3.0.pdf
+ file bitmap AFP3.0.pdf
Table 1-7 p. 36
same as dir
kFPAttributeBit (bit 0)
@@ -616,7 +616,7 @@ kFPUTF8NameBit (bit 13)
#define kFPUnixPrivsBit_file (1 << 15) /* :( */
/*
- file attribute AFP3.0.pdf
+ file attribute AFP3.0.pdf
Table 1-8 p. 37
*/
#define kFPInvisibleBit (1 << 0)
@@ -641,18 +641,18 @@ kFPUTF8NameBit (bit 13)
/* Hash functions */
static gint afp_equal (gconstpointer v, gconstpointer v2);
static guint afp_hash (gconstpointer v);
-
+
static guint afp_packet_init_count = 200;
typedef struct {
guint32 conversation;
guint16 seq;
} afp_request_key;
-
+
typedef struct {
guint8 command;
} afp_request_val;
-
+
static GHashTable *afp_request_hash = NULL;
static GMemChunk *afp_request_keys = NULL;
static GMemChunk *afp_request_vals = NULL;
@@ -676,7 +676,7 @@ static guint afp_hash (gconstpointer v)
return afp_key->seq;
}
-/* --------------------------
+/* --------------------------
*/
#define PAD(x) { proto_tree_add_item(tree, hf_afp_pad, tvb, offset, x, FALSE); offset += x; }
@@ -692,7 +692,7 @@ decode_vol_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset)
item = proto_tree_add_item(tree, hf_afp_vol_bitmap, tvb, offset, 2,FALSE);
sub_tree = proto_item_add_subtree(item, ett_afp_vol_bitmap);
}
-
+
proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Attributes, tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Signature, tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_CreateDate, tvb, offset, 2,FALSE);
@@ -729,19 +729,19 @@ decode_vol_attribute (proto_tree *tree, tvbuff_t *tvb, gint offset)
proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsBlankAccessPrivs,tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsUnixPrivs ,tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsUTF8Names ,tvb, offset, 2,FALSE);
-
- return bitmap;
-}
-/* --------------------------
+ return bitmap;
+}
+
+/* --------------------------
cf AFP3.0.pdf page 38
date are number of seconds from 12:00am on 01.01.2000 GMT
backup : 0x8000000 not set
- from netatalk adouble.h
+ from netatalk adouble.h
*/
-#define DATE_NOT_SET 0x80000000
-#define AD_DATE_DELTA 946684800
-#define AD_DATE_TO_UNIX(x) (x + AD_DATE_DELTA)
+#define DATE_NOT_SET 0x80000000
+#define AD_DATE_DELTA 946684800
+#define AD_DATE_TO_UNIX(x) (x + AD_DATE_DELTA)
static guint32
print_date(proto_tree *tree,int id, tvbuff_t *tvb, gint offset)
{
@@ -834,7 +834,7 @@ decode_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset)
item = proto_tree_add_item(tree, hf_afp_file_bitmap, tvb, offset, 2,FALSE);
sub_tree = proto_item_add_subtree(item, ett_afp_file_bitmap);
}
- proto_tree_add_item(sub_tree, hf_afp_file_bitmap_Attributes , tvb, offset, 2,FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_file_bitmap_Attributes , tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ParentDirID , tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_file_bitmap_CreateDate , tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ModDate , tvb, offset, 2,FALSE);
@@ -844,7 +844,7 @@ decode_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset)
proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ShortName , tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_file_bitmap_NodeID , tvb, offset, 2,FALSE);
- proto_tree_add_item(sub_tree, hf_afp_file_bitmap_DataForkLen , tvb, offset, 2,FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_file_bitmap_DataForkLen , tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_file_bitmap_RsrcForkLen , tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ExtDataForkLen , tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_file_bitmap_LaunchLimit , tvb, offset, 2,FALSE);
@@ -857,21 +857,21 @@ decode_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset)
}
/* -------------------------- */
-static guint16
+static guint16
decode_file_attribute(proto_tree *tree, tvbuff_t *tvb, gint offset, int shared)
{
proto_tree *sub_tree = NULL;
proto_item *item;
guint16 attribute;
-
+
attribute = tvb_get_ntohs(tvb, offset);
if (tree) {
item = proto_tree_add_text(tree, tvb, offset, 2,
"File Attributes: 0x%04x", attribute);
sub_tree = proto_item_add_subtree(item, ett_afp_file_attribute);
}
- proto_tree_add_item(sub_tree, hf_afp_file_attribute_Invisible , tvb, offset, 2,FALSE);
- if (!shared)
+ proto_tree_add_item(sub_tree, hf_afp_file_attribute_Invisible , tvb, offset, 2,FALSE);
+ if (!shared)
proto_tree_add_item(sub_tree, hf_afp_file_attribute_MultiUser , tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_file_attribute_System , tvb, offset, 2,FALSE);
@@ -886,7 +886,7 @@ decode_file_attribute(proto_tree *tree, tvbuff_t *tvb, gint offset, int shared)
proto_tree_add_item(sub_tree, hf_afp_file_attribute_RenameInhibit, tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_file_attribute_DeleteInhibit, tvb, offset, 2,FALSE);
- if (!shared)
+ if (!shared)
proto_tree_add_item(sub_tree, hf_afp_file_attribute_CopyProtect , tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_file_attribute_SetClear , tvb, offset, 2,FALSE);
@@ -904,26 +904,26 @@ decode_access_rights (proto_tree *tree, tvbuff_t *tvb, int hf, gint offset)
item = proto_tree_add_item(tree, hf, tvb, offset, 4, FALSE);
sub_tree = proto_item_add_subtree(item, ett_afp_dir_ar);
- proto_tree_add_item(sub_tree, hf_afp_dir_ar_o_search, tvb, offset, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_afp_dir_ar_o_read , tvb, offset, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_afp_dir_ar_o_write , tvb, offset, 4, FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_dir_ar_o_search, tvb, offset, 4, FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_dir_ar_o_read , tvb, offset, 4, FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_dir_ar_o_write , tvb, offset, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_afp_dir_ar_g_search, tvb, offset, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_afp_dir_ar_g_read , tvb, offset, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_afp_dir_ar_g_write , tvb, offset, 4, FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_dir_ar_g_search, tvb, offset, 4, FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_dir_ar_g_read , tvb, offset, 4, FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_dir_ar_g_write , tvb, offset, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_afp_dir_ar_e_search, tvb, offset, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_afp_dir_ar_e_read , tvb, offset, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_afp_dir_ar_e_write , tvb, offset, 4, FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_dir_ar_e_search, tvb, offset, 4, FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_dir_ar_e_read , tvb, offset, 4, FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_dir_ar_e_write , tvb, offset, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_search, tvb, offset, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_read , tvb, offset, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_write , tvb, offset, 4, FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_search, tvb, offset, 4, FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_read , tvb, offset, 4, FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_write , tvb, offset, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_afp_dir_ar_blank , tvb, offset, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_own , tvb, offset, 4, FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_dir_ar_blank , tvb, offset, 4, FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_own , tvb, offset, 4, FALSE);
}
-}
+}
static void
decode_unix_privs (proto_tree *tree, tvbuff_t *tvb, gint offset)
@@ -1009,7 +1009,7 @@ parse_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 bitmap,
proto_tree_add_item(tree, hf_afp_file_DataForkLen, tvb, offset, 4,FALSE);
offset += 4;
}
-
+
if ((bitmap & kFPRsrcForkLenBit)) {
proto_tree_add_item(tree, hf_afp_file_RsrcForkLen, tvb, offset, 4,FALSE);
offset += 4;
@@ -1051,20 +1051,20 @@ parse_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 bitmap,
}
/* -------------------------- */
-static guint16
+static guint16
decode_dir_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset)
{
proto_tree *sub_tree = NULL;
proto_item *item;
guint16 bitmap;
-
+
bitmap = tvb_get_ntohs(tvb, offset);
if (tree) {
item = proto_tree_add_item(tree, hf_afp_dir_bitmap, tvb, offset, 2,FALSE);
sub_tree = proto_item_add_subtree(item, ett_afp_dir_bitmap);
}
-
- proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_Attributes , tvb, offset, 2,FALSE);
+
+ proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_Attributes , tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ParentDirID , tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_CreateDate , tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ModDate , tvb, offset, 2,FALSE);
@@ -1084,20 +1084,20 @@ decode_dir_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset)
}
/* -------------------------- */
-static guint16
+static guint16
decode_dir_attribute(proto_tree *tree, tvbuff_t *tvb, gint offset)
{
proto_tree *sub_tree = NULL;
proto_item *item;
guint16 attribute;
-
+
attribute = tvb_get_ntohs(tvb, offset);
if (tree) {
item = proto_tree_add_text(tree, tvb, offset, 2,
"Directory Attributes: 0x%04x", attribute);
sub_tree = proto_item_add_subtree(item, ett_afp_dir_attribute);
}
- proto_tree_add_item(sub_tree, hf_afp_dir_attribute_Invisible , tvb, offset, 2,FALSE);
+ proto_tree_add_item(sub_tree, hf_afp_dir_attribute_Invisible , tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_dir_attribute_IsExpFolder , tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_dir_attribute_System , tvb, offset, 2,FALSE);
proto_tree_add_item(sub_tree, hf_afp_dir_attribute_Mounted , tvb, offset, 2,FALSE);
@@ -1174,11 +1174,11 @@ parse_dir_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 bitmap)
offset += 2; /* error in AFP3.0.pdf */
}
if ((bitmap & kFPOwnerIDBit)) {
- proto_tree_add_item(tree, hf_afp_dir_OwnerID, tvb, offset, 4, FALSE);
+ proto_tree_add_item(tree, hf_afp_dir_OwnerID, tvb, offset, 4, FALSE);
offset += 4;
}
if ((bitmap & kFPGroupIDBit)) {
- proto_tree_add_item(tree, hf_afp_dir_GroupID, tvb, offset, 4, FALSE);
+ proto_tree_add_item(tree, hf_afp_dir_GroupID, tvb, offset, 4, FALSE);
offset += 4;
}
if ((bitmap & kFPAccessRightsBit)) {
@@ -1213,21 +1213,21 @@ name_in_bitmap(tvbuff_t *tvb, gint *offset, guint16 bitmap)
guint16 nameoff;
guint8 len;
gint tp_ofs;
-
+
name = NULL;
- if ((bitmap & kFPAttributeBit))
+ if ((bitmap & kFPAttributeBit))
*offset += 2;
if ((bitmap & kFPParentDirIDBit))
*offset += 4;
- if ((bitmap & kFPCreateDateBit))
+ if ((bitmap & kFPCreateDateBit))
*offset += 4;
if ((bitmap & kFPModDateBit))
*offset += 4;
- if ((bitmap & kFPBackupDateBit))
+ if ((bitmap & kFPBackupDateBit))
*offset += 4;
- if ((bitmap & kFPFinderInfoBit))
+ if ((bitmap & kFPFinderInfoBit))
*offset += 32;
-
+
if ((bitmap & kFPLongNameBit)) {
nameoff = tvb_get_ntohs(tvb, *offset);
if (nameoff) {
@@ -1250,14 +1250,14 @@ static gchar *
name_in_dbitmap(tvbuff_t *tvb, gint offset, guint16 bitmap)
{
gchar *name;
-
+
name = name_in_bitmap(tvb, &offset, bitmap);
if (name != NULL)
return name;
/*
- check UTF8 name
+ check UTF8 name
*/
-
+
return name;
}
@@ -1266,14 +1266,14 @@ static gchar *
name_in_fbitmap(tvbuff_t *tvb, gint offset, guint16 bitmap)
{
gchar *name;
-
+
name = name_in_bitmap(tvb, &offset, bitmap);
if (name != NULL)
return name;
/*
- check UTF8 name
+ check UTF8 name
*/
-
+
return name;
}
@@ -1297,10 +1297,10 @@ decode_vol_did_file_dir_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset)
decode_file_bitmap(tree, tvb, offset);
offset += 2;
-
+
decode_dir_bitmap(tree, tvb, offset);
offset += 2;
-
+
return offset;
}
@@ -1337,7 +1337,7 @@ decode_name_label (proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, gint off
guint8 type;
proto_tree *sub_tree = NULL;
proto_item *item;
-
+
type = tvb_get_guint8(tvb, offset);
len = tvb_get_guint8(tvb, offset +1);
name = get_name(tvb, offset +1, type);
@@ -1355,7 +1355,7 @@ decode_name_label (proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, gint off
offset++;
proto_tree_add_string(sub_tree, hf_afp_path_name, tvb, offset, len,name);
}
- else
+ else
offset += 2;
return offset +len;
@@ -1373,12 +1373,12 @@ static gint
dissect_query_afp_open_vol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset)
{
int len;
-
+
PAD(1);
decode_vol_bitmap(tree, tvb, offset);
offset += 2;
-
+
len = tvb_get_guint8(tvb, offset);
if (check_col(pinfo->cinfo, COL_INFO)) {
@@ -1389,10 +1389,10 @@ dissect_query_afp_open_vol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (!tree)
return offset;
-
+
proto_tree_add_item(tree, hf_afp_vol_name, tvb, offset, 1,FALSE);
offset += len +1;
-
+
len = tvb_reported_length_remaining(tvb,offset);
if (len >= 8) {
/* optionnal password */
@@ -1407,7 +1407,7 @@ static gint
dissect_reply_afp_open_vol(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset)
{
guint16 bitmap;
-
+
if (!tree)
return offset;
bitmap = decode_vol_bitmap(tree, tvb, offset);
@@ -1429,7 +1429,7 @@ dissect_reply_afp_get_server_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
proto_tree *flag_tree;
proto_item *item;
proto_item *ti;
-
+
if (!tree)
return offset;
@@ -1440,10 +1440,10 @@ dissect_reply_afp_get_server_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
item = proto_tree_add_text(tree, tvb, offset, 1, "Volumes : %d", num);
sub_tree = proto_item_add_subtree(item, ett_afp_server_vol);
offset++;
-
+
for (i = 0; i < num; i++) {
const gchar *rep;
-
+
item = proto_tree_add_text(sub_tree, tvb, offset, -1,"Volume");
tree = proto_item_add_subtree(item, ett_afp_vol_list);
@@ -1458,18 +1458,18 @@ dissect_reply_afp_get_server_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
len = tvb_get_guint8(tvb, offset) +1;
rep = get_name(tvb, offset, 2);
proto_item_set_text(item, rep);
- proto_item_set_len(item, len +1);
+ proto_item_set_len(item, len +1);
proto_tree_add_item(tree, hf_afp_vol_name, tvb, offset, 1,FALSE);
offset += len;
- }
+ }
return offset;
}
-/* **************************
+/* **************************
next calls use the same format :
- 1 pad byte
+ 1 pad byte
volume id
AFP_FLUSH
AFP_CLOSEVOL
@@ -1482,7 +1482,7 @@ dissect_query_afp_with_vol_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
if (!tree)
return offset;
PAD(1);
-
+
proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2,FALSE);
offset += 2;
return offset;
@@ -1499,7 +1499,7 @@ dissect_query_afp_open_fork(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
offset++;
offset = decode_vol_did(tree, tvb, offset);
-
+
decode_file_bitmap(tree, tvb, offset);
offset += 2;
if (tree) {
@@ -1539,7 +1539,7 @@ dissect_reply_afp_open_fork(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
static gint
dissect_query_afp_enumerate(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset)
{
-
+
PAD(1);
offset = decode_vol_did_file_dir_bitmap(tree, tvb, offset);
@@ -1559,7 +1559,7 @@ dissect_query_afp_enumerate(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* -------------------------- */
static int
-loop_record(tvbuff_t *tvb, proto_tree *ptree, gint offset,
+loop_record(tvbuff_t *tvb, proto_tree *ptree, gint offset,
int count, guint16 d_bitmap, guint16 f_bitmap, int add)
{
proto_tree *tree = NULL;
@@ -1579,7 +1579,7 @@ loop_record(tvbuff_t *tvb, proto_tree *ptree, gint offset,
if (ptree) {
if (flags) {
name = name_in_dbitmap(tvb, offset +2, d_bitmap);
- }
+ }
else {
name = name_in_fbitmap(tvb, offset +2, f_bitmap);
}
@@ -1602,12 +1602,12 @@ loop_record(tvbuff_t *tvb, proto_tree *ptree, gint offset,
else {
offset = parse_file_bitmap(tree, tvb, offset, f_bitmap,0);
}
- if ((offset & 1))
+ if ((offset & 1))
PAD(1);
offset = org +size; /* play safe */
if (ptree)
g_free((gpointer)name);
- }
+ }
return offset;
}
@@ -1620,10 +1620,10 @@ dissect_reply_afp_enumerate(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
int count;
guint16 f_bitmap;
guint16 d_bitmap;
-
+
f_bitmap = decode_file_bitmap(tree, tvb, offset);
offset += 2;
-
+
d_bitmap = decode_dir_bitmap(tree, tvb, offset);
offset += 2;
@@ -1652,7 +1652,7 @@ dissect_query_afp_cat_search(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
if (!ptree)
return offset;
PAD(1);
-
+
proto_tree_add_item(ptree, hf_afp_vol_id, tvb, offset, 2,FALSE);
offset += 2;
@@ -1664,10 +1664,10 @@ dissect_query_afp_cat_search(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
proto_tree_add_item(ptree, hf_afp_cat_position, tvb, offset, 16,FALSE);
offset += 16;
-
+
f_bitmap = decode_file_bitmap(ptree, tvb, offset);
offset += 2;
-
+
d_bitmap = decode_dir_bitmap(ptree, tvb, offset);
offset += 2;
@@ -1686,7 +1686,7 @@ dissect_query_afp_cat_search(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
proto_tree_add_item(tree, hf_afp_struct_size, tvb, offset, 1,FALSE);
offset++;
- PAD(1);
+ PAD(1);
offset = parse_file_bitmap(tree, tvb, offset, r_bitmap,0);
offset = org +size;
@@ -1701,7 +1701,7 @@ dissect_query_afp_cat_search(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
proto_tree_add_item(tree, hf_afp_struct_size, tvb, offset, 1,FALSE);
offset++;
PAD(1);
-
+
offset = parse_file_bitmap(tree, tvb, offset, r_bitmap,0);
offset = org +size;
@@ -1717,13 +1717,13 @@ dissect_reply_afp_cat_search(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
guint16 f_bitmap;
guint16 d_bitmap;
int count;
-
+
proto_tree_add_item(tree, hf_afp_cat_position, tvb, offset, 16,FALSE);
offset += 16;
f_bitmap = decode_file_bitmap(tree, tvb, offset);
offset += 2;
-
+
d_bitmap = decode_dir_bitmap(tree, tvb, offset);
offset += 2;
@@ -1746,8 +1746,8 @@ dissect_query_afp_get_vol_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
decode_vol_bitmap(tree, tvb, offset);
offset += 2;
-
- return offset;
+
+ return offset;
}
/* ------------------------ */
@@ -1776,10 +1776,10 @@ dissect_query_afp_set_vol_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
bitmap = decode_vol_bitmap(tree, tvb, offset);
offset += 2;
-
+
offset = parse_vol_bitmap(tree, tvb, offset, bitmap);
- return offset;
+ return offset;
}
/* ***************************/
@@ -1788,7 +1788,7 @@ dissect_query_afp_login(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
{
int len;
const char *uam;
-
+
len = tvb_get_guint8(tvb, offset);
proto_tree_add_item(tree, hf_afp_AFPVersion, tvb, offset, 1,FALSE);
offset += len +1;
@@ -1836,7 +1836,7 @@ dissect_reply_afp_write(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
{
proto_tree_add_item(tree, hf_afp_last_written, tvb, offset, 4, FALSE);
offset += 4;
-
+
return offset;
}
@@ -1864,7 +1864,7 @@ dissect_reply_afp_write_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
{
proto_tree_add_item(tree, hf_afp_last_written64, tvb, offset, 8, FALSE);
offset += 8;
-
+
return offset;
}
@@ -1873,7 +1873,7 @@ static gint
dissect_query_afp_read(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset)
{
PAD(1);
-
+
proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,FALSE);
offset += 2;
@@ -1885,7 +1885,7 @@ dissect_query_afp_read(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
proto_tree_add_item(tree, hf_afp_newline_mask, tvb, offset, 1,FALSE);
offset++;
-
+
proto_tree_add_item(tree, hf_afp_newline_char, tvb, offset, 1,FALSE);
offset++;
@@ -1897,7 +1897,7 @@ static gint
dissect_query_afp_read_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset)
{
PAD(1);
-
+
proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,FALSE);
offset += 2;
@@ -1910,8 +1910,8 @@ dissect_query_afp_read_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
return offset;
}
-/* **************************
- Open desktop call
+/* **************************
+ Open desktop call
query is the same than AFP_FLUSH, AFP_CLOSEVOL
*/
@@ -1924,7 +1924,7 @@ dissect_reply_afp_open_dt(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
return offset;
}
-/* **************************
+/* **************************
no reply
*/
static gint
@@ -1937,10 +1937,10 @@ dissect_query_afp_close_dt(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
return offset;
}
-/* **************************
+/* **************************
calls using the same format :
- 1 pad byte
- fork number
+ 1 pad byte
+ fork number
AFP_FLUSHFORK
AFP_CLOSEFORK
*/
@@ -1975,7 +1975,7 @@ dissect_reply_afp_get_fldr_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
f_bitmap = decode_file_bitmap(tree, tvb, offset);
offset += 2;
-
+
d_bitmap = decode_dir_bitmap(tree, tvb, offset);
offset += 2;
@@ -1992,25 +1992,25 @@ dissect_reply_afp_get_fldr_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
return offset;
}
-/* **************************
+/* **************************
no reply
*/
static gint
dissect_query_afp_set_fldr_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset)
{
guint16 f_bitmap;
-
+
PAD(1);
offset = decode_vol_did(tree, tvb, offset);
f_bitmap = decode_file_bitmap(tree, tvb, offset);
offset += 2;
-
+
offset = decode_name(tree, pinfo, tvb, offset);
if ((offset & 1))
PAD(1);
- /* did:name can be a file or a folder but only the intersection between
+ /* did:name can be a file or a folder but only the intersection between
* file bitmap and dir bitmap can be set.
* Well it's in afp spec, but clients (Mac) are setting 'file only' bits with this call
* (WriteInhibit for example).
@@ -2020,20 +2020,20 @@ dissect_query_afp_set_fldr_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
return offset;
}
-/* **************************
+/* **************************
no reply
*/
static gint
dissect_query_afp_set_file_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset)
{
guint16 f_bitmap;
-
+
PAD(1);
offset = decode_vol_did(tree, tvb, offset);
f_bitmap = decode_file_bitmap(tree, tvb, offset);
offset += 2;
-
+
offset = decode_name(tree, pinfo, tvb, offset);
if ((offset & 1))
@@ -2043,7 +2043,7 @@ dissect_query_afp_set_file_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
return offset;
}
-/* **************************
+/* **************************
no reply
*/
static gint
@@ -2056,7 +2056,7 @@ dissect_query_afp_set_dir_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
d_bitmap = decode_dir_bitmap(tree, tvb, offset);
offset += 2;
-
+
offset = decode_name(tree, pinfo, tvb, offset);
if ((offset & 1))
@@ -2081,7 +2081,7 @@ dissect_query_afp_create_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
return offset;
}
-/* --------------------------
+/* --------------------------
AFP_MOVE
*/
static gint
@@ -2089,7 +2089,7 @@ dissect_reply_afp_create_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
{
proto_tree_add_item(tree, hf_afp_file_id, tvb, offset, 4,FALSE);
offset += 4;
-
+
return offset;
}
@@ -2099,11 +2099,11 @@ dissect_reply_afp_create_dir(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
{
proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4,FALSE);
offset += 4;
-
+
return offset;
}
-/* **************************
+/* **************************
no reply
*/
static gint
@@ -2114,11 +2114,11 @@ dissect_query_afp_delete_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
offset += 2;
proto_tree_add_item(tree, hf_afp_file_id, tvb, offset, 4,FALSE);
offset += 4;
-
+
return offset;
}
-/* **************************
+/* **************************
same reply as get_fork_param
*/
static gint
@@ -2185,7 +2185,7 @@ dissect_query_afp_set_fork_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
static gint
dissect_query_afp_move(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset)
{
-
+
PAD(1);
offset = decode_vol_did(tree, tvb, offset);
@@ -2203,7 +2203,7 @@ dissect_query_afp_move(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint
static gint
dissect_query_afp_exchange_file(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset)
{
-
+
PAD(1);
offset = decode_vol_did(tree, tvb, offset);
@@ -2221,7 +2221,7 @@ dissect_query_afp_copy_file(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
{
proto_tree *sub_tree = NULL;
proto_item *item;
-
+
PAD(1);
if (tree) {
item = proto_tree_add_text(tree, tvb, offset, 6,"Source volume");
@@ -2246,7 +2246,7 @@ dissect_query_afp_copy_file(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
static gint
dissect_query_afp_rename(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset)
{
-
+
PAD(1);
offset = decode_vol_did(tree, tvb, offset);
@@ -2263,7 +2263,7 @@ dissect_query_afp_byte_lock(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
proto_tree *sub_tree = NULL;
proto_item *item;
guint8 flag;
-
+
flag = tvb_get_guint8(tvb, offset);
if (tree) {
item = proto_tree_add_text(tree, tvb, offset, 1, "Flags: 0x%02x", flag);
@@ -2276,7 +2276,7 @@ dissect_query_afp_byte_lock(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,FALSE);
offset += 2;
-
+
proto_tree_add_item(tree, hf_afp_lock_offset, tvb, offset, 4,FALSE);
offset += 4;
@@ -2302,7 +2302,7 @@ dissect_query_afp_byte_lock_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
proto_tree *sub_tree = NULL;
proto_item *item;
guint8 flag;
-
+
flag = tvb_get_guint8(tvb, offset);
if (tree) {
item = proto_tree_add_text(tree, tvb, offset, 1, "Flags: 0x%02x", flag);
@@ -2315,7 +2315,7 @@ dissect_query_afp_byte_lock_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,FALSE);
offset += 2;
-
+
proto_tree_add_item(tree, hf_afp_lock_offset64, tvb, offset, 8,FALSE);
offset += 8;
@@ -2349,7 +2349,7 @@ dissect_query_afp_add_cmt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g
offset = decode_name(tree, pinfo, tvb, offset);
- if ((offset & 1))
+ if ((offset & 1))
PAD(1);
len = tvb_get_guint8(tvb, offset);
@@ -2402,7 +2402,7 @@ dissect_query_afp_get_icon(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4,FALSE);
offset += 4;
-
+
proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1,FALSE);
offset += 1;
PAD(1);
@@ -2440,7 +2440,7 @@ dissect_reply_afp_get_icon_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4,FALSE);
offset += 4;
-
+
proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1,FALSE);
offset += 1;
@@ -2464,21 +2464,21 @@ dissect_query_afp_add_icon(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4,FALSE);
offset += 4;
-
+
proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1,FALSE);
offset += 1;
-
+
PAD(1);
proto_tree_add_item(tree, hf_afp_icon_tag, tvb, offset, 4,FALSE);
offset += 4;
-
+
proto_tree_add_item(tree, hf_afp_icon_length, tvb, offset, 2,FALSE);
offset += 2;
return offset;
}
-/* **************************
+/* **************************
no reply
*/
static gint
@@ -2497,13 +2497,13 @@ dissect_query_afp_add_appl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
proto_tree_add_item(tree, hf_afp_appl_tag, tvb, offset, 4,FALSE);
offset += 4;
-
+
offset = decode_name(tree, pinfo, tvb, offset);
return offset;
}
-/* **************************
+/* **************************
no reply
*/
static gint
@@ -2576,7 +2576,7 @@ dissect_query_afp_map_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
{
proto_tree_add_item(tree, hf_afp_map_id_type, tvb, offset, 1,FALSE);
offset++;
-
+
proto_tree_add_item(tree, hf_afp_map_id, tvb, offset, 4,FALSE);
offset += 4;
@@ -2606,7 +2606,7 @@ int len;
len = tvb_get_guint8(tvb, offset);
proto_tree_add_item(tree, hf_afp_map_name, tvb, offset, 1,FALSE);
offset += len +1;
-
+
return offset;
}
@@ -2742,7 +2742,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint8 afp_command;
int len = tvb_reported_length_remaining(tvb,0);
-
+
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AFP");
if (check_col(pinfo->cinfo, COL_INFO))
@@ -2757,7 +2757,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
}
- request_key.conversation = conversation->index;
+ request_key.conversation = conversation->index;
request_key.seq = aspinfo->seq;
request_val = (afp_request_val *) g_hash_table_lookup(
@@ -2776,7 +2776,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
if (!request_val) { /* missing request */
- if (check_col(pinfo->cinfo, COL_INFO))
+ if (check_col(pinfo->cinfo, COL_INFO))
col_add_fstr(pinfo->cinfo, COL_INFO, "[Reply without query?]");
return;
}
@@ -2804,36 +2804,36 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset++;
switch(afp_command) {
case AFP_BYTELOCK:
- offset = dissect_query_afp_byte_lock(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_byte_lock(tvb, pinfo, afp_tree, offset);break;
case AFP_BYTELOCK_EXT:
- offset = dissect_query_afp_byte_lock_ext(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_byte_lock_ext(tvb, pinfo, afp_tree, offset);break;
case AFP_OPENDT: /* same as close vol */
- case AFP_FLUSH:
+ case AFP_FLUSH:
case AFP_CLOSEVOL:
offset = dissect_query_afp_with_vol_id(tvb, pinfo, afp_tree, offset);break;
case AFP_CLOSEDIR:
/* offset = dissect_query_afp_close_dir(tvb, pinfo, afp_tree, offset);break; */
break;
- case AFP_CLOSEDT:
+ case AFP_CLOSEDT:
offset = dissect_query_afp_close_dt(tvb, pinfo, afp_tree, offset);break;
case AFP_FLUSHFORK: /* same packet as closefork */
case AFP_CLOSEFORK:
offset = dissect_query_afp_with_fork(tvb, pinfo, afp_tree, offset);break;
case AFP_COPYFILE:
- offset = dissect_query_afp_copy_file(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_copy_file(tvb, pinfo, afp_tree, offset);break;
case AFP_CREATEFILE:
- offset = dissect_query_afp_create_file(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_create_file(tvb, pinfo, afp_tree, offset);break;
case AFP_DISCTOLDSESS:
- offset = dissect_query_afp_disconnect_old_session(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_disconnect_old_session(tvb, pinfo, afp_tree, offset);break;
case AFP_ENUMERATE_EXT:
case AFP_ENUMERATE:
offset = dissect_query_afp_enumerate(tvb, pinfo, afp_tree, offset);break;
case AFP_GETFORKPARAM:
- offset = dissect_query_afp_get_fork_param(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_get_fork_param(tvb, pinfo, afp_tree, offset);break;
case AFP_GETSESSTOKEN:
- offset = dissect_query_afp_get_session_token(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_get_session_token(tvb, pinfo, afp_tree, offset);break;
case AFP_GETUSERINFO:
- offset = dissect_query_afp_get_user_info(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_get_user_info(tvb, pinfo, afp_tree, offset);break;
case AFP_GETSRVINFO:
/* offset = dissect_query_afp_get_server_info(tvb, pinfo, afp_tree, offset);break; */
case AFP_GETSRVPARAM:
@@ -2864,11 +2864,11 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case AFP_RENAME:
offset = dissect_query_afp_rename(tvb, pinfo, afp_tree, offset);break;
case AFP_SETDIRPARAM:
- offset = dissect_query_afp_set_dir_param(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_set_dir_param(tvb, pinfo, afp_tree, offset);break;
case AFP_SETFILEPARAM:
- offset = dissect_query_afp_set_file_param(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_set_file_param(tvb, pinfo, afp_tree, offset);break;
case AFP_SETFORKPARAM:
- offset = dissect_query_afp_set_fork_param(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_set_fork_param(tvb, pinfo, afp_tree, offset);break;
case AFP_SETVOLPARAM:
offset = dissect_query_afp_set_vol_param(tvb, pinfo, afp_tree, offset);break;
case AFP_WRITE:
@@ -2885,33 +2885,33 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case AFP_DELETE: /* same as create_id */
case AFP_CREATEDIR:
case AFP_CREATEID:
- offset = dissect_query_afp_create_id(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_create_id(tvb, pinfo, afp_tree, offset);break;
case AFP_DELETEID:
- offset = dissect_query_afp_delete_id(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_delete_id(tvb, pinfo, afp_tree, offset);break;
case AFP_RESOLVEID:
- offset = dissect_query_afp_resolve_id(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_resolve_id(tvb, pinfo, afp_tree, offset);break;
case AFP_EXCHANGEFILE:
- offset = dissect_query_afp_exchange_file(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_exchange_file(tvb, pinfo, afp_tree, offset);break;
case AFP_CATSEARCH_EXT:
case AFP_CATSEARCH:
- offset = dissect_query_afp_cat_search(tvb, pinfo, afp_tree, offset);break;
- case AFP_GETICON:
- offset = dissect_query_afp_get_icon(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_cat_search(tvb, pinfo, afp_tree, offset);break;
+ case AFP_GETICON:
+ offset = dissect_query_afp_get_icon(tvb, pinfo, afp_tree, offset);break;
case AFP_GTICNINFO:
- offset = dissect_query_afp_get_icon_info(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_get_icon_info(tvb, pinfo, afp_tree, offset);break;
case AFP_ADDAPPL:
- offset = dissect_query_afp_add_appl(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_add_appl(tvb, pinfo, afp_tree, offset);break;
case AFP_RMVAPPL:
- offset = dissect_query_afp_rmv_appl(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_rmv_appl(tvb, pinfo, afp_tree, offset);break;
case AFP_GETAPPL:
- offset = dissect_query_afp_get_appl(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_get_appl(tvb, pinfo, afp_tree, offset);break;
case AFP_ADDCMT:
- offset = dissect_query_afp_add_cmt(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_add_cmt(tvb, pinfo, afp_tree, offset);break;
case AFP_RMVCMT: /* same as get_cmt */
case AFP_GETCMT:
- offset = dissect_query_afp_get_cmt(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_get_cmt(tvb, pinfo, afp_tree, offset);break;
case AFP_ADDICON:
- offset = dissect_query_afp_add_icon(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_query_afp_add_icon(tvb, pinfo, afp_tree, offset);break;
break;
}
}
@@ -2924,9 +2924,9 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
switch(afp_command) {
case AFP_BYTELOCK:
- offset = dissect_reply_afp_byte_lock(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_reply_afp_byte_lock(tvb, pinfo, afp_tree, offset);break;
case AFP_BYTELOCK_EXT:
- offset = dissect_reply_afp_byte_lock_ext(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_reply_afp_byte_lock_ext(tvb, pinfo, afp_tree, offset);break;
case AFP_ENUMERATE_EXT:
case AFP_ENUMERATE:
offset = dissect_reply_afp_enumerate(tvb, pinfo, afp_tree, offset);break;
@@ -2942,16 +2942,16 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case AFP_GETSRVPARAM:
offset = dissect_reply_afp_get_server_param(tvb, pinfo, afp_tree, offset);break;
case AFP_CREATEDIR:
- offset = dissect_reply_afp_create_dir(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_reply_afp_create_dir(tvb, pinfo, afp_tree, offset);break;
case AFP_MAPID:
offset = dissect_reply_afp_map_id(tvb, pinfo, afp_tree, offset);break;
case AFP_MAPNAME:
offset = dissect_reply_afp_map_name(tvb, pinfo, afp_tree, offset);break;
case AFP_MOVE: /* same as create_id */
case AFP_CREATEID:
- offset = dissect_reply_afp_create_id(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_reply_afp_create_id(tvb, pinfo, afp_tree, offset);break;
case AFP_GETSESSTOKEN:
- offset = dissect_reply_afp_get_session_token(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_reply_afp_get_session_token(tvb, pinfo, afp_tree, offset);break;
case AFP_GETVOLPARAM:
offset = dissect_reply_afp_get_vol_param(tvb, pinfo, afp_tree, offset);break;
case AFP_GETFLDRPARAM:
@@ -2961,13 +2961,13 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case AFP_CATSEARCH_EXT:
case AFP_CATSEARCH:
- offset = dissect_reply_afp_cat_search(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_reply_afp_cat_search(tvb, pinfo, afp_tree, offset);break;
case AFP_GTICNINFO:
- offset = dissect_reply_afp_get_icon_info(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_reply_afp_get_icon_info(tvb, pinfo, afp_tree, offset);break;
case AFP_GETAPPL:
- offset = dissect_reply_afp_get_appl(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_reply_afp_get_appl(tvb, pinfo, afp_tree, offset);break;
case AFP_GETCMT:
- offset = dissect_reply_afp_get_cmt(tvb, pinfo, afp_tree, offset);break;
+ offset = dissect_reply_afp_get_cmt(tvb, pinfo, afp_tree, offset);break;
case AFP_WRITE:
offset = dissect_reply_afp_write(tvb, pinfo, afp_tree, offset);break;
case AFP_WRITE_EXT:
@@ -3013,9 +3013,9 @@ proto_register_afp(void)
FT_UINT8, BASE_DEC, VALS(CommandCode_vals), 0x0,
"AFP function", HFILL }},
- { &hf_afp_pad,
- { "Pad", "afp.pad",
- FT_NONE, BASE_NONE, NULL, 0,
+ { &hf_afp_pad,
+ { "Pad", "afp.pad",
+ FT_NONE, BASE_NONE, NULL, 0,
"Pad Byte", HFILL }},
{ &hf_afp_AFPVersion,
@@ -3053,7 +3053,7 @@ proto_register_afp(void)
FT_UINT16, BASE_HEX, NULL, 0,
"Volume attributes", HFILL }},
- { &hf_afp_vol_attribute_ReadOnly,
+ { &hf_afp_vol_attribute_ReadOnly,
{ "Read only", "afp.vol_attribute.read_only",
FT_BOOLEAN, 16, NULL, kReadOnly,
"Read only volume", HFILL }},
@@ -3143,77 +3143,77 @@ proto_register_afp(void)
FT_BOOLEAN, 16, NULL, kFPVolBlockSizeBit,
"Volume block size", HFILL }},
- { &hf_afp_dir_bitmap_Attributes,
+ { &hf_afp_dir_bitmap_Attributes,
{ "Attributes", "afp.dir_bitmap.attributes",
FT_BOOLEAN, 16, NULL, kFPAttributeBit,
"Return attributes if directory", HFILL }},
- { &hf_afp_dir_bitmap_ParentDirID,
+ { &hf_afp_dir_bitmap_ParentDirID,
{ "DID", "afp.dir_bitmap.did",
FT_BOOLEAN, 16, NULL, kFPParentDirIDBit,
"Return parent directory ID if directory", HFILL }},
- { &hf_afp_dir_bitmap_CreateDate,
+ { &hf_afp_dir_bitmap_CreateDate,
{ "Creation date", "afp.dir_bitmap.create_date",
FT_BOOLEAN, 16, NULL, kFPCreateDateBit,
"Return creation date if directory", HFILL }},
- { &hf_afp_dir_bitmap_ModDate,
+ { &hf_afp_dir_bitmap_ModDate,
{ "Modification date", "afp.dir_bitmap.mod_date",
FT_BOOLEAN, 16, NULL, kFPModDateBit,
"Return modification date if directory", HFILL }},
- { &hf_afp_dir_bitmap_BackupDate,
+ { &hf_afp_dir_bitmap_BackupDate,
{ "Backup date", "afp.dir_bitmap.backup_date",
FT_BOOLEAN, 16, NULL, kFPBackupDateBit,
"Return backup date if directory", HFILL }},
- { &hf_afp_dir_bitmap_FinderInfo,
+ { &hf_afp_dir_bitmap_FinderInfo,
{ "Finder info", "afp.dir_bitmap.finder_info",
FT_BOOLEAN, 16, NULL, kFPFinderInfoBit,
"Return finder info if directory", HFILL }},
- { &hf_afp_dir_bitmap_LongName,
+ { &hf_afp_dir_bitmap_LongName,
{ "Long name", "afp.dir_bitmap.long_name",
FT_BOOLEAN, 16, NULL, kFPLongNameBit,
"Return long name if directory", HFILL }},
- { &hf_afp_dir_bitmap_ShortName,
+ { &hf_afp_dir_bitmap_ShortName,
{ "Short name", "afp.dir_bitmap.short_name",
FT_BOOLEAN, 16, NULL, kFPShortNameBit,
"Return short name if directory", HFILL }},
- { &hf_afp_dir_bitmap_NodeID,
+ { &hf_afp_dir_bitmap_NodeID,
{ "File ID", "afp.dir_bitmap.fid",
FT_BOOLEAN, 16, NULL, kFPNodeIDBit,
"Return file ID if directory", HFILL }},
- { &hf_afp_dir_bitmap_OffspringCount,
+ { &hf_afp_dir_bitmap_OffspringCount,
{ "Offspring count", "afp.dir_bitmap.offspring_count",
FT_BOOLEAN, 16, NULL, kFPOffspringCountBit,
"Return offspring count if directory", HFILL }},
- { &hf_afp_dir_bitmap_OwnerID,
+ { &hf_afp_dir_bitmap_OwnerID,
{ "Owner id", "afp.dir_bitmap.owner_id",
FT_BOOLEAN, 16, NULL, kFPOwnerIDBit,
"Return owner id if directory", HFILL }},
- { &hf_afp_dir_bitmap_GroupID,
+ { &hf_afp_dir_bitmap_GroupID,
{ "Group id", "afp.dir_bitmap.group_id",
FT_BOOLEAN, 16, NULL, kFPGroupIDBit,
"Return group id if directory", HFILL }},
- { &hf_afp_dir_bitmap_AccessRights,
+ { &hf_afp_dir_bitmap_AccessRights,
{ "Access rights", "afp.dir_bitmap.access_rights",
FT_BOOLEAN, 16, NULL, kFPAccessRightsBit,
"Return access rights if directory", HFILL }},
- { &hf_afp_dir_bitmap_UTF8Name,
+ { &hf_afp_dir_bitmap_UTF8Name,
{ "UTF-8 name", "afp.dir_bitmap.UTF8_name",
FT_BOOLEAN, 16, NULL, kFPUTF8NameBit,
"Return UTF-8 name if diectory", HFILL }},
- { &hf_afp_dir_bitmap_UnixPrivs,
+ { &hf_afp_dir_bitmap_UnixPrivs,
{ "UNIX privileges", "afp.dir_bitmap.unix_privs",
FT_BOOLEAN, 16, NULL, kFPUnixPrivsBit,
"Return UNIX privileges if directory", HFILL }},
@@ -3268,42 +3268,42 @@ proto_register_afp(void)
FT_BOOLEAN, 16, NULL, kFPAttributeBit,
"Return attributes if file", HFILL }},
- { &hf_afp_file_bitmap_ParentDirID,
+ { &hf_afp_file_bitmap_ParentDirID,
{ "DID", "afp.file_bitmap.did",
FT_BOOLEAN, 16, NULL, kFPParentDirIDBit,
"Return parent directory ID if file", HFILL }},
- { &hf_afp_file_bitmap_CreateDate,
+ { &hf_afp_file_bitmap_CreateDate,
{ "Creation date", "afp.file_bitmap.create_date",
FT_BOOLEAN, 16, NULL, kFPCreateDateBit,
"Return creation date if file", HFILL }},
- { &hf_afp_file_bitmap_ModDate,
+ { &hf_afp_file_bitmap_ModDate,
{ "Modification date", "afp.file_bitmap.mod_date",
FT_BOOLEAN, 16, NULL, kFPModDateBit,
"Return modification date if file", HFILL }},
- { &hf_afp_file_bitmap_BackupDate,
+ { &hf_afp_file_bitmap_BackupDate,
{ "Backup date", "afp.file_bitmap.backup_date",
FT_BOOLEAN, 16, NULL, kFPBackupDateBit,
"Return backup date if file", HFILL }},
- { &hf_afp_file_bitmap_FinderInfo,
+ { &hf_afp_file_bitmap_FinderInfo,
{ "Finder info", "afp.file_bitmap.finder_info",
FT_BOOLEAN, 16, NULL, kFPFinderInfoBit,
"Return finder info if file", HFILL }},
- { &hf_afp_file_bitmap_LongName,
+ { &hf_afp_file_bitmap_LongName,
{ "Long name", "afp.file_bitmap.long_name",
FT_BOOLEAN, 16, NULL, kFPLongNameBit,
"Return long name if file", HFILL }},
- { &hf_afp_file_bitmap_ShortName,
+ { &hf_afp_file_bitmap_ShortName,
{ "Short name", "afp.file_bitmap.short_name",
FT_BOOLEAN, 16, NULL, kFPShortNameBit,
"Return short name if file", HFILL }},
- { &hf_afp_file_bitmap_NodeID,
+ { &hf_afp_file_bitmap_NodeID,
{ "File ID", "afp.file_bitmap.fid",
FT_BOOLEAN, 16, NULL, kFPNodeIDBit,
"Return file ID if file", HFILL }},
@@ -3328,7 +3328,7 @@ proto_register_afp(void)
FT_BOOLEAN, 16, NULL, kFPLaunchLimitBit,
"Return launch limit if file", HFILL }},
- { &hf_afp_file_bitmap_UTF8Name,
+ { &hf_afp_file_bitmap_UTF8Name,
{ "UTF-8 name", "afp.file_bitmap.UTF8_name",
FT_BOOLEAN, 16, NULL, kFPUTF8NameBit,
"Return UTF-8 name if file", HFILL }},
@@ -3338,7 +3338,7 @@ proto_register_afp(void)
FT_BOOLEAN, 16, NULL, kFPExtRsrcForkLenBit,
"Return extended (>2GB) resource fork size if file", HFILL }},
- { &hf_afp_file_bitmap_UnixPrivs,
+ { &hf_afp_file_bitmap_UnixPrivs,
{ "UNIX privileges", "afp.file_bitmap.unix_privs",
FT_BOOLEAN, 16, NULL, kFPUnixPrivsBit_file,
"Return UNIX privileges if file", HFILL }},
@@ -3574,22 +3574,22 @@ proto_register_afp(void)
{ "Extended resource fork size", "afp.ext_resource_fork_len",
FT_UINT64, BASE_DEC, NULL, 0x0,
"Extended (>2GB) resource fork length", HFILL }},
-
+
{ &hf_afp_file_bitmap,
{ "File bitmap", "afp.file_bitmap",
FT_UINT16, BASE_HEX, NULL, 0x0,
"File bitmap", HFILL }},
-
+
{ &hf_afp_req_count,
{ "Req count", "afp.req_count",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Maximum number of structures returned", HFILL }},
- { &hf_afp_start_index,
+ { &hf_afp_start_index,
{ "Start index", "afp.start_index",
FT_UINT16, BASE_DEC, NULL, 0x0,
"First structure returned", HFILL }},
-
+
{ &hf_afp_max_reply_size,
{ "Reply size", "afp.reply_size",
FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -3609,7 +3609,7 @@ proto_register_afp(void)
{ "Struct size", "afp.struct_size",
FT_UINT8, BASE_DEC, NULL,0,
"Sizeof of struct", HFILL }},
-
+
{ &hf_afp_flag,
{ "From", "afp.flag",
FT_UINT8, BASE_HEX, VALS(flag_vals), 0x80,
@@ -3629,22 +3629,22 @@ proto_register_afp(void)
{ "Offset", "afp.offset",
FT_INT32, BASE_DEC, NULL, 0x0,
"Offset", HFILL }},
-
+
{ &hf_afp_rw_count,
{ "Count", "afp.rw_count",
FT_INT32, BASE_DEC, NULL, 0x0,
"Number of bytes to be read/written", HFILL }},
-
+
{ &hf_afp_newline_mask,
{ "Newline mask", "afp.newline_mask",
FT_UINT8, BASE_HEX, NULL, 0x0,
"Value to AND bytes with when looking for newline", HFILL }},
-
+
{ &hf_afp_newline_char,
{ "Newline char", "afp.newline_char",
FT_UINT8, BASE_HEX, NULL, 0x0,
"Value to compare ANDed bytes with when looking for newline", HFILL }},
-
+
{ &hf_afp_last_written,
{ "Last written", "afp.last_written",
FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -3654,7 +3654,7 @@ proto_register_afp(void)
{ "Count", "afp.actual_count",
FT_INT32, BASE_DEC, NULL, 0x0,
"Number of bytes returned by read/write", HFILL }},
-
+
{ &hf_afp_ofork_len,
{ "New length", "afp.ofork_len",
FT_INT32, BASE_DEC, NULL, 0x0,
@@ -3749,7 +3749,7 @@ proto_register_afp(void)
{ "Tag", "afp.appl_tag",
FT_UINT32, BASE_HEX, NULL, 0x0,
"Application tag", HFILL }},
-
+
{ &hf_afp_lock_op,
{ "unlock", "afp.lock_op",
FT_BOOLEAN, 8, NULL, 0x1,
@@ -3759,7 +3759,7 @@ proto_register_afp(void)
{ "End", "afp.lock_from",
FT_BOOLEAN, 8, NULL, 0x80,
"Offset is relative to the end of the fork", HFILL }},
-
+
{ &hf_afp_lock_offset,
{ "Offset", "afp.lock_offset",
FT_INT32, BASE_DEC, NULL, 0x0,
@@ -3916,7 +3916,7 @@ proto_register_afp(void)
{ "Offset", "afp.offset64",
FT_INT64, BASE_DEC, NULL, 0x0,
"Offset (64 bits)", HFILL }},
-
+
{ &hf_afp_rw_count64,
{ "Count", "afp.rw_count64",
FT_INT64, BASE_DEC, NULL, 0x0,
diff --git a/packet-afs-defs.h b/packet-afs-defs.h
index d00887f..cb33fde 100644
--- a/packet-afs-defs.h
+++ b/packet-afs-defs.h
@@ -6,9 +6,9 @@
* Portions based on information retrieved from the RX definitions
* in Arla, the free AFS client at http://www.stacken.kth.se/project/arla/
* Portions based on information/specs retrieved from the OpenAFS sources at
- * www.openafs.org, Copyright IBM.
+ * www.openafs.org, Copyright IBM.
*
- * $Id: packet-afs-defs.h,v 1.11 2002/02/08 22:36:21 nneul Exp $
+ * $Id: packet-afs-defs.h,v 1.12 2002/08/28 21:00:06 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -432,7 +432,7 @@ static const value_string afs_errors[] = {
{ 1492325135, "No volume"},
{ 1492325136, "Multiple RW volumes"},
{ 1492325137, "Failed operation"},
-
+
/* add more of these errors to decode the errcode responses */
{ 0, NULL },
};
diff --git a/packet-afs-macros.h b/packet-afs-macros.h
index c48c257..8a3a90c 100644
--- a/packet-afs-macros.h
+++ b/packet-afs-macros.h
@@ -6,9 +6,9 @@
* Portions based on information retrieved from the RX definitions
* in Arla, the free AFS client at http://www.stacken.kth.se/project/arla/
* Portions based on information/specs retrieved from the OpenAFS sources at
- * www.openafs.org, Copyright IBM.
+ * www.openafs.org, Copyright IBM.
*
- * $Id: packet-afs-macros.h,v 1.18 2002/02/10 02:22:02 guy Exp $
+ * $Id: packet-afs-macros.h,v 1.19 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -53,12 +53,12 @@
#define OUT_INT(field) \
proto_tree_add_int(tree, field, tvb, offset, sizeof(gint32), tvb_get_ntohl(tvb, offset)); \
offset += 4;
-
+
/* Output a unsigned integer, stored into field 'field'
- Assumes it is in network byte order, converts to host before using,
+ Assumes it is in network byte order, converts to host before using,
Note - does not increment offset, so can be used repeatedly for bitfields */
#define DISP_UINT(field) \
- proto_tree_add_uint(tree,field,tvb,offset,sizeof(guint32),tvb_get_ntohl(tvb, offset));
+ proto_tree_add_uint(tree,field,tvb,offset,sizeof(guint32),tvb_get_ntohl(tvb, offset));
/* Output an IPv4 address, stored into field 'field' */
#define OUT_IP(field) \
@@ -107,7 +107,7 @@
offset += 4; \
}
-/* Output a rx style string, up to a maximum length first
+/* Output a rx style string, up to a maximum length first
4 bytes - length, then char data */
#define OUT_RXString(field) \
{ int i,len; \
@@ -236,7 +236,7 @@
OUT_UINT(hf_afs_cb_fid_uniqifier); \
tree = save; \
}
-
+
/* Output a StoreStatus */
#define OUT_FS_AFSStoreStatus(label) \
{ proto_tree *save, *ti; \
@@ -464,7 +464,7 @@
/* Skip a certain number of bytes */
#define SKIP(bytes) \
offset += bytes;
-
+
/* Raw data - to end of frame */
#define OUT_BYTES_ALL(field) OUT_BYTES(field, tvb_length_remaining(tvb,offset))
diff --git a/packet-afs-register-info.h b/packet-afs-register-info.h
index 6fc23da..198771c 100644
--- a/packet-afs-register-info.h
+++ b/packet-afs-register-info.h
@@ -6,9 +6,9 @@
* Portions based on information retrieved from the RX definitions
* in Arla, the free AFS client at http://www.stacken.kth.se/project/arla/
* Portions based on information/specs retrieved from the OpenAFS sources at
- * www.openafs.org, Copyright IBM.
+ * www.openafs.org, Copyright IBM.
*
- * $Id: packet-afs-register-info.h,v 1.13 2002/02/10 02:22:02 guy Exp $
+ * $Id: packet-afs-register-info.h,v 1.14 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -31,537 +31,537 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-{ &hf_afs_fs, { "File Server", "afs.fs",
+{ &hf_afs_fs, { "File Server", "afs.fs",
FT_BOOLEAN, BASE_NONE, 0, 0, "File Server", HFILL }},
-{ &hf_afs_cb, { "Callback", "afs.cb",
+{ &hf_afs_cb, { "Callback", "afs.cb",
FT_BOOLEAN, BASE_NONE, 0, 0, "Callback", HFILL }},
-{ &hf_afs_prot, { "Protection", "afs.prot",
+{ &hf_afs_prot, { "Protection", "afs.prot",
FT_BOOLEAN, BASE_NONE, 0, 0, "Protection Server", HFILL }},
-{ &hf_afs_vldb, { "VLDB", "afs.vldb",
+{ &hf_afs_vldb, { "VLDB", "afs.vldb",
FT_BOOLEAN, BASE_NONE, 0, 0, "Volume Location Database Server", HFILL }},
-{ &hf_afs_kauth, { "KAuth", "afs.kauth",
+{ &hf_afs_kauth, { "KAuth", "afs.kauth",
FT_BOOLEAN, BASE_NONE, 0, 0, "Kerberos Auth Server", HFILL }},
-{ &hf_afs_vol, { "Volume Server", "afs.vol",
+{ &hf_afs_vol, { "Volume Server", "afs.vol",
FT_BOOLEAN, BASE_NONE, 0, 0, "Volume Server", HFILL }},
-{ &hf_afs_error, { "Error", "afs.error",
+{ &hf_afs_error, { "Error", "afs.error",
FT_BOOLEAN, BASE_NONE, 0, 0, "Error", HFILL }},
-{ &hf_afs_bos, { "BOS", "afs.bos",
+{ &hf_afs_bos, { "BOS", "afs.bos",
FT_BOOLEAN, BASE_NONE, 0, 0, "Basic Oversee Server", HFILL }},
-{ &hf_afs_update, { "Update", "afs.update",
+{ &hf_afs_update, { "Update", "afs.update",
FT_BOOLEAN, BASE_NONE, 0, 0, "Update Server", HFILL }},
-{ &hf_afs_rmtsys, { "Rmtsys", "afs.rmtsys",
+{ &hf_afs_rmtsys, { "Rmtsys", "afs.rmtsys",
FT_BOOLEAN, BASE_NONE, 0, 0, "Rmtsys", HFILL }},
-{ &hf_afs_ubik, { "Ubik", "afs.ubik",
+{ &hf_afs_ubik, { "Ubik", "afs.ubik",
FT_BOOLEAN, BASE_NONE, 0, 0, "Ubik", HFILL }},
-{ &hf_afs_backup, { "Backup", "afs.backup",
+{ &hf_afs_backup, { "Backup", "afs.backup",
FT_BOOLEAN, BASE_NONE, 0, 0, "Backup Server", HFILL }},
-{ &hf_afs_fs_opcode, { "Operation", "afs.fs.opcode",
+{ &hf_afs_fs_opcode, { "Operation", "afs.fs.opcode",
FT_UINT32, BASE_DEC,
VALS(fs_req), 0, "Operation", HFILL }},
-{ &hf_afs_cb_opcode, { "Operation", "afs.cb.opcode",
+{ &hf_afs_cb_opcode, { "Operation", "afs.cb.opcode",
FT_UINT32, BASE_DEC,
VALS(cb_req), 0, "Operation", HFILL }},
-{ &hf_afs_prot_opcode, { "Operation", "afs.prot.opcode",
+{ &hf_afs_prot_opcode, { "Operation", "afs.prot.opcode",
FT_UINT32, BASE_DEC,
VALS(prot_req), 0, "Operation", HFILL }},
-{ &hf_afs_vldb_opcode, { "Operation", "afs.vldb.opcode",
+{ &hf_afs_vldb_opcode, { "Operation", "afs.vldb.opcode",
FT_UINT32, BASE_DEC,
VALS(vldb_req), 0, "Operation", HFILL }},
-{ &hf_afs_kauth_opcode, { "Operation", "afs.kauth.opcode",
+{ &hf_afs_kauth_opcode, { "Operation", "afs.kauth.opcode",
FT_UINT32, BASE_DEC,
VALS(kauth_req), 0, "Operation", HFILL }},
-{ &hf_afs_vol_opcode, { "Operation", "afs.vol.opcode",
+{ &hf_afs_vol_opcode, { "Operation", "afs.vol.opcode",
FT_UINT32, BASE_DEC,
VALS(vol_req), 0, "Operation", HFILL }},
-{ &hf_afs_bos_opcode, { "Operation", "afs.bos.opcode",
+{ &hf_afs_bos_opcode, { "Operation", "afs.bos.opcode",
FT_UINT32, BASE_DEC,
VALS(bos_req), 0, "Operation", HFILL }},
-{ &hf_afs_update_opcode, { "Operation", "afs.update.opcode",
+{ &hf_afs_update_opcode, { "Operation", "afs.update.opcode",
FT_UINT32, BASE_DEC,
VALS(update_req), 0, "Operation", HFILL }},
-{ &hf_afs_rmtsys_opcode, { "Operation", "afs.rmtsys.opcode",
+{ &hf_afs_rmtsys_opcode, { "Operation", "afs.rmtsys.opcode",
FT_UINT32, BASE_DEC,
VALS(rmtsys_req), 0, "Operation", HFILL }},
-{ &hf_afs_error_opcode, { "Operation", "afs.error.opcode",
+{ &hf_afs_error_opcode, { "Operation", "afs.error.opcode",
FT_UINT32, BASE_DEC,
0, 0, "Operation", HFILL }},
{ &hf_afs_backup_opcode, {
- "Operation", "afs.backup.opcode",
+ "Operation", "afs.backup.opcode",
FT_UINT32, BASE_DEC,
VALS(backup_req), 0, "Operation", HFILL }},
{ &hf_afs_ubik_opcode, {
- "Operation", "afs.ubik.opcode",
+ "Operation", "afs.ubik.opcode",
FT_UINT32, BASE_DEC,
VALS(ubik_req), 0, "Operation", HFILL }},
/* File Server Fields */
-{ &hf_afs_fs_fid_volume, { "FileID (Volume)", "afs.fs.fid.volume",
+{ &hf_afs_fs_fid_volume, { "FileID (Volume)", "afs.fs.fid.volume",
FT_UINT32, BASE_DEC,
0, 0, "File ID (Volume)", HFILL }},
-{ &hf_afs_fs_fid_vnode, { "FileID (VNode)", "afs.fs.fid.vnode",
+{ &hf_afs_fs_fid_vnode, { "FileID (VNode)", "afs.fs.fid.vnode",
FT_UINT32, BASE_DEC,
0, 0, "File ID (VNode)", HFILL }},
-{ &hf_afs_fs_fid_uniqifier, { "FileID (Uniqifier)", "afs.fs.fid.uniq",
+{ &hf_afs_fs_fid_uniqifier, { "FileID (Uniqifier)", "afs.fs.fid.uniq",
FT_UINT32, BASE_DEC,
0, 0, "File ID (Uniqifier)", HFILL }},
-{ &hf_afs_fs_offset, { "Offset", "afs.fs.offset",
+{ &hf_afs_fs_offset, { "Offset", "afs.fs.offset",
FT_UINT32, BASE_DEC,
0, 0, "Offset", HFILL }},
-{ &hf_afs_fs_length, { "Length", "afs.fs.length",
+{ &hf_afs_fs_length, { "Length", "afs.fs.length",
FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }},
-{ &hf_afs_fs_flength, { "FLength", "afs.fs.flength",
+{ &hf_afs_fs_flength, { "FLength", "afs.fs.flength",
FT_UINT32, BASE_DEC, 0, 0, "FLength", HFILL }},
-{ &hf_afs_fs_errcode, { "Error Code", "afs.fs.errcode",
+{ &hf_afs_fs_errcode, { "Error Code", "afs.fs.errcode",
FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
-{ &hf_afs_fs_data, { "Data", "afs.fs.data",
+{ &hf_afs_fs_data, { "Data", "afs.fs.data",
FT_BYTES, BASE_HEX, 0, 0, "Data", HFILL }},
-{ &hf_afs_fs_token, { "Token", "afs.fs.token",
+{ &hf_afs_fs_token, { "Token", "afs.fs.token",
FT_BYTES, BASE_HEX, 0, 0, "Token", HFILL }},
-{ &hf_afs_fs_oldname, { "Old Name", "afs.fs.oldname",
+{ &hf_afs_fs_oldname, { "Old Name", "afs.fs.oldname",
FT_STRING, BASE_HEX, 0, 0, "Old Name", HFILL }},
-{ &hf_afs_fs_newname, { "New Name", "afs.fs.newname",
+{ &hf_afs_fs_newname, { "New Name", "afs.fs.newname",
FT_STRING, BASE_HEX, 0, 0, "New Name", HFILL }},
-{ &hf_afs_fs_name, { "Name", "afs.fs.name",
+{ &hf_afs_fs_name, { "Name", "afs.fs.name",
FT_STRING, BASE_HEX, 0, 0, "Name", HFILL }},
-{ &hf_afs_fs_symlink_name, { "Symlink Name", "afs.fs.symlink.name",
+{ &hf_afs_fs_symlink_name, { "Symlink Name", "afs.fs.symlink.name",
FT_STRING, BASE_HEX, 0, 0, "Symlink Name", HFILL }},
-{ &hf_afs_fs_symlink_content, { "Symlink Content", "afs.fs.symlink.content",
+{ &hf_afs_fs_symlink_content, { "Symlink Content", "afs.fs.symlink.content",
FT_STRING, BASE_HEX, 0, 0, "Symlink Content", HFILL }},
-{ &hf_afs_fs_volid, { "Volume ID", "afs.fs.volid",
+{ &hf_afs_fs_volid, { "Volume ID", "afs.fs.volid",
FT_UINT32, BASE_DEC, 0, 0, "Volume ID", HFILL }},
-{ &hf_afs_fs_volname, { "Volume Name", "afs.fs.volname",
+{ &hf_afs_fs_volname, { "Volume Name", "afs.fs.volname",
FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
-{ &hf_afs_fs_timestamp, { "Timestamp", "afs.fs.timestamp",
+{ &hf_afs_fs_timestamp, { "Timestamp", "afs.fs.timestamp",
FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Timestamp", HFILL }},
-{ &hf_afs_fs_offlinemsg, { "Offline Message", "afs.fs.offlinemsg",
+{ &hf_afs_fs_offlinemsg, { "Offline Message", "afs.fs.offlinemsg",
FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
-{ &hf_afs_fs_motd, { "Message of the Day", "afs.fs.motd",
+{ &hf_afs_fs_motd, { "Message of the Day", "afs.fs.motd",
FT_STRING, BASE_HEX, 0, 0, "Message of the Day", HFILL }},
-{ &hf_afs_fs_xstats_version, { "XStats Version", "afs.fs.xstats.version",
+{ &hf_afs_fs_xstats_version, { "XStats Version", "afs.fs.xstats.version",
FT_UINT32, BASE_DEC, 0, 0, "XStats Version", HFILL }},
-{ &hf_afs_fs_xstats_clientversion, { "Client Version", "afs.fs.xstats.clientversion",
+{ &hf_afs_fs_xstats_clientversion, { "Client Version", "afs.fs.xstats.clientversion",
FT_UINT32, BASE_DEC, 0, 0, "Client Version", HFILL }},
-{ &hf_afs_fs_xstats_version, { "Collection Number", "afs.fs.xstats.collnumber",
+{ &hf_afs_fs_xstats_version, { "Collection Number", "afs.fs.xstats.collnumber",
FT_UINT32, BASE_DEC, VALS(xstat_collections), 0, "Collection Number", HFILL }},
-{ &hf_afs_fs_xstats_timestamp, { "XStats Timestamp", "afs.fs.xstats.timestamp",
+{ &hf_afs_fs_xstats_timestamp, { "XStats Timestamp", "afs.fs.xstats.timestamp",
FT_UINT32, BASE_DEC, 0, 0, "XStats Timestamp", HFILL }},
-{ &hf_afs_fs_cps_spare1, { "CPS Spare1", "afs.fs.cps.spare1",
+{ &hf_afs_fs_cps_spare1, { "CPS Spare1", "afs.fs.cps.spare1",
FT_UINT32, BASE_DEC, 0, 0, "CPS Spare1", HFILL }},
-{ &hf_afs_fs_cps_spare2, { "CPS Spare2", "afs.fs.cps.spare2",
+{ &hf_afs_fs_cps_spare2, { "CPS Spare2", "afs.fs.cps.spare2",
FT_UINT32, BASE_DEC, 0, 0, "CPS Spare2", HFILL }},
-{ &hf_afs_fs_cps_spare3, { "CPS Spare3", "afs.fs.cps.spare3",
+{ &hf_afs_fs_cps_spare3, { "CPS Spare3", "afs.fs.cps.spare3",
FT_UINT32, BASE_DEC, 0, 0, "CPS Spare3", HFILL }},
-{ &hf_afs_fs_vicelocktype, { "Vice Lock Type", "afs.fs.vicelocktype",
+{ &hf_afs_fs_vicelocktype, { "Vice Lock Type", "afs.fs.vicelocktype",
FT_UINT32, BASE_DEC, VALS(vice_lock_types), 0, "Vice Lock Type", HFILL }},
-{ &hf_afs_fs_viceid, { "Vice ID", "afs.fs.viceid",
+{ &hf_afs_fs_viceid, { "Vice ID", "afs.fs.viceid",
FT_UINT32, BASE_DEC, 0, 0, "Vice ID", HFILL }},
-{ &hf_afs_fs_viceid, { "IP Address", "afs.fs.ipaddr",
+{ &hf_afs_fs_viceid, { "IP Address", "afs.fs.ipaddr",
FT_IPv4, BASE_HEX, 0, 0, "IP Address", HFILL }},
-
-{ &hf_afs_fs_status_mask, { "Mask", "afs.fs.status.mask",
+
+{ &hf_afs_fs_status_mask, { "Mask", "afs.fs.status.mask",
FT_UINT32, BASE_HEX, 0, 0, "Mask", HFILL }},
-{ &hf_afs_fs_status_mask_setmodtime, { "Set Modification Time", "afs.fs.status.mask.setmodtime",
+{ &hf_afs_fs_status_mask_setmodtime, { "Set Modification Time", "afs.fs.status.mask.setmodtime",
FT_BOOLEAN, 32, 0, 0x00000001, "Set Modification Time", HFILL }},
-{ &hf_afs_fs_status_mask_setowner, { "Set Owner", "afs.fs.status.mask.setowner",
+{ &hf_afs_fs_status_mask_setowner, { "Set Owner", "afs.fs.status.mask.setowner",
FT_BOOLEAN, 32, 0, 0x00000002, "Set Owner", HFILL }},
-{ &hf_afs_fs_status_mask_setgroup, { "Set Group", "afs.fs.status.mask.setgroup",
+{ &hf_afs_fs_status_mask_setgroup, { "Set Group", "afs.fs.status.mask.setgroup",
FT_BOOLEAN, 32, 0, 0x00000004, "Set Group", HFILL }},
-{ &hf_afs_fs_status_mask_setmode, { "Set Mode", "afs.fs.status.mask.setmode",
+{ &hf_afs_fs_status_mask_setmode, { "Set Mode", "afs.fs.status.mask.setmode",
FT_BOOLEAN, 32, 0, 0x00000008, "Set Mode", HFILL }},
-{ &hf_afs_fs_status_mask_setsegsize, { "Set Segment Size", "afs.fs.status.mask.setsegsize",
+{ &hf_afs_fs_status_mask_setsegsize, { "Set Segment Size", "afs.fs.status.mask.setsegsize",
FT_BOOLEAN, 32, 0, 0x00000010, "Set Segment Size", HFILL }},
-{ &hf_afs_fs_status_mask_fsync, { "FSync", "afs.fs.status.mask.fsync",
+{ &hf_afs_fs_status_mask_fsync, { "FSync", "afs.fs.status.mask.fsync",
FT_BOOLEAN, 32, 0, 0x00000400, "FSync", HFILL }},
-{ &hf_afs_fs_status_clientmodtime, { "Client Modification Time", "afs.fs.status.clientmodtime",
+{ &hf_afs_fs_status_clientmodtime, { "Client Modification Time", "afs.fs.status.clientmodtime",
FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Client Modification Time", HFILL }},
-{ &hf_afs_fs_status_servermodtime, { "Server Modification Time", "afs.fs.status.servermodtime",
+{ &hf_afs_fs_status_servermodtime, { "Server Modification Time", "afs.fs.status.servermodtime",
FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Server Modification Time", HFILL }},
-{ &hf_afs_fs_status_owner, { "Owner", "afs.fs.status.owner",
+{ &hf_afs_fs_status_owner, { "Owner", "afs.fs.status.owner",
FT_UINT32, BASE_DEC, 0, 0, "Owner", HFILL }},
-{ &hf_afs_fs_status_group, { "Group", "afs.fs.status.group",
+{ &hf_afs_fs_status_group, { "Group", "afs.fs.status.group",
FT_UINT32, BASE_DEC, 0, 0, "Group", HFILL }},
-{ &hf_afs_fs_status_mode, { "Unix Mode", "afs.fs.status.mode",
+{ &hf_afs_fs_status_mode, { "Unix Mode", "afs.fs.status.mode",
FT_UINT32, BASE_OCT, 0, 0, "Unix Mode", HFILL }},
-{ &hf_afs_fs_status_segsize, { "Segment Size", "afs.fs.status.segsize",
+{ &hf_afs_fs_status_segsize, { "Segment Size", "afs.fs.status.segsize",
FT_UINT32, BASE_DEC, 0, 0, "Segment Size", HFILL }},
-{ &hf_afs_fs_status_interfaceversion, { "Interface Version", "afs.fs.status.interfaceversion",
+{ &hf_afs_fs_status_interfaceversion, { "Interface Version", "afs.fs.status.interfaceversion",
FT_UINT32, BASE_DEC, 0, 0, "Interface Version", HFILL }},
-{ &hf_afs_fs_status_filetype, { "File Type", "afs.fs.status.filetype",
+{ &hf_afs_fs_status_filetype, { "File Type", "afs.fs.status.filetype",
FT_UINT32, BASE_DEC, 0, 0, "File Type", HFILL }},
-{ &hf_afs_fs_status_author, { "Author", "afs.fs.status.author",
+{ &hf_afs_fs_status_author, { "Author", "afs.fs.status.author",
FT_UINT32, BASE_DEC, 0, 0, "Author", HFILL }},
-{ &hf_afs_fs_status_calleraccess, { "Caller Access", "afs.fs.status.calleraccess",
+{ &hf_afs_fs_status_calleraccess, { "Caller Access", "afs.fs.status.calleraccess",
FT_UINT32, BASE_DEC, 0, 0, "Caller Access", HFILL }},
-{ &hf_afs_fs_status_anonymousaccess, { "Anonymous Access", "afs.fs.status.anonymousaccess",
+{ &hf_afs_fs_status_anonymousaccess, { "Anonymous Access", "afs.fs.status.anonymousaccess",
FT_UINT32, BASE_DEC, 0, 0, "Anonymous Access", HFILL }},
-{ &hf_afs_fs_status_parentvnode, { "Parent VNode", "afs.fs.status.parentvnode",
+{ &hf_afs_fs_status_parentvnode, { "Parent VNode", "afs.fs.status.parentvnode",
FT_UINT32, BASE_DEC, 0, 0, "Parent VNode", HFILL }},
-{ &hf_afs_fs_status_parentunique, { "Parent Unique", "afs.fs.status.parentunique",
+{ &hf_afs_fs_status_parentunique, { "Parent Unique", "afs.fs.status.parentunique",
FT_UINT32, BASE_DEC, 0, 0, "Parent Unique", HFILL }},
-{ &hf_afs_fs_status_dataversion, { "Data Version", "afs.fs.status.dataversion",
+{ &hf_afs_fs_status_dataversion, { "Data Version", "afs.fs.status.dataversion",
FT_UINT32, BASE_DEC, 0, 0, "Data Version", HFILL }},
-{ &hf_afs_fs_status_dataversionhigh, { "Data Version (High)", "afs.fs.status.dataversionhigh",
+{ &hf_afs_fs_status_dataversionhigh, { "Data Version (High)", "afs.fs.status.dataversionhigh",
FT_UINT32, BASE_DEC, 0, 0, "Data Version (High)", HFILL }},
-{ &hf_afs_fs_status_linkcount, { "Link Count", "afs.fs.status.linkcount",
+{ &hf_afs_fs_status_linkcount, { "Link Count", "afs.fs.status.linkcount",
FT_UINT32, BASE_DEC, 0, 0, "Link Count", HFILL }},
-{ &hf_afs_fs_status_spare2, { "Spare 2", "afs.fs.status.spare2",
+{ &hf_afs_fs_status_spare2, { "Spare 2", "afs.fs.status.spare2",
FT_UINT32, BASE_DEC, 0, 0, "Spare 2", HFILL }},
-{ &hf_afs_fs_status_spare3, { "Spare 3", "afs.fs.status.spare3",
+{ &hf_afs_fs_status_spare3, { "Spare 3", "afs.fs.status.spare3",
FT_UINT32, BASE_DEC, 0, 0, "Spare 3", HFILL }},
-{ &hf_afs_fs_status_spare4, { "Spare 4", "afs.fs.status.spare4",
+{ &hf_afs_fs_status_spare4, { "Spare 4", "afs.fs.status.spare4",
FT_UINT32, BASE_DEC, 0, 0, "Spare 4", HFILL }},
-{ &hf_afs_fs_status_synccounter, { "Sync Counter", "afs.fs.status.synccounter",
+{ &hf_afs_fs_status_synccounter, { "Sync Counter", "afs.fs.status.synccounter",
FT_UINT32, BASE_DEC, 0, 0, "Sync Counter", HFILL }},
-{ &hf_afs_fs_status_length, { "Length", "afs.fs.status.length",
+{ &hf_afs_fs_status_length, { "Length", "afs.fs.status.length",
FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }},
-{ &hf_afs_fs_volsync_spare1, { "Volume Creation Timestamp", "afs.fs.volsync.spare1",
+{ &hf_afs_fs_volsync_spare1, { "Volume Creation Timestamp", "afs.fs.volsync.spare1",
FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Volume Creation Timestamp", HFILL }},
-{ &hf_afs_fs_volsync_spare2, { "Spare 2", "afs.fs.volsync.spare2",
+{ &hf_afs_fs_volsync_spare2, { "Spare 2", "afs.fs.volsync.spare2",
FT_UINT32, BASE_DEC, 0, 0, "Spare 2", HFILL }},
-{ &hf_afs_fs_volsync_spare3, { "Spare 3", "afs.fs.volsync.spare3",
+{ &hf_afs_fs_volsync_spare3, { "Spare 3", "afs.fs.volsync.spare3",
FT_UINT32, BASE_DEC, 0, 0, "Spare 3", HFILL }},
-{ &hf_afs_fs_volsync_spare4, { "Spare 4", "afs.fs.volsync.spare4",
+{ &hf_afs_fs_volsync_spare4, { "Spare 4", "afs.fs.volsync.spare4",
FT_UINT32, BASE_DEC, 0, 0, "Spare 4", HFILL }},
-{ &hf_afs_fs_volsync_spare5, { "Spare 5", "afs.fs.volsync.spare5",
+{ &hf_afs_fs_volsync_spare5, { "Spare 5", "afs.fs.volsync.spare5",
FT_UINT32, BASE_DEC, 0, 0, "Spare 5", HFILL }},
-{ &hf_afs_fs_volsync_spare6, { "Spare 6", "afs.fs.volsync.spare6",
+{ &hf_afs_fs_volsync_spare6, { "Spare 6", "afs.fs.volsync.spare6",
FT_UINT32, BASE_DEC, 0, 0, "Spare 6", HFILL }},
{ &hf_afs_fs_acl_count_positive, {
- "ACL Count (Positive)", "afs.fs.acl.count.positive",
+ "ACL Count (Positive)", "afs.fs.acl.count.positive",
FT_UINT32, BASE_DEC, 0, 0, "Number of Positive ACLs", HFILL }},
{ &hf_afs_fs_acl_count_negative, {
- "ACL Count (Negative)", "afs.fs.acl.count.negative",
+ "ACL Count (Negative)", "afs.fs.acl.count.negative",
FT_UINT32, BASE_DEC, 0, 0, "Number of Negative ACLs", HFILL }},
{ &hf_afs_fs_acl_datasize, {
- "ACL Size", "afs.fs.acl.datasize",
+ "ACL Size", "afs.fs.acl.datasize",
FT_UINT32, BASE_DEC, 0, 0, "ACL Data Size", HFILL }},
{ &hf_afs_fs_acl_entity, {
- "Entity (User/Group)", "afs.fs.acl.entity",
+ "Entity (User/Group)", "afs.fs.acl.entity",
FT_STRING, BASE_HEX, 0, 0, "ACL Entity (User/Group)", HFILL }},
{ &hf_afs_fs_acl_r, {
- "_R_ead", "afs.fs.acl.r",
+ "_R_ead", "afs.fs.acl.r",
FT_BOOLEAN, 8, 0, PRSFS_READ, "Read", HFILL }},
{ &hf_afs_fs_acl_l, {
- "_L_ookup", "afs.fs.acl.l",
+ "_L_ookup", "afs.fs.acl.l",
FT_BOOLEAN, 8, 0, PRSFS_LOOKUP, "Lookup", HFILL }},
{ &hf_afs_fs_acl_i, {
- "_I_nsert", "afs.fs.acl.i",
+ "_I_nsert", "afs.fs.acl.i",
FT_BOOLEAN, 8, 0, PRSFS_INSERT, "Insert", HFILL }},
-{ &hf_afs_fs_acl_d, { "_D_elete", "afs.fs.acl.d",
+{ &hf_afs_fs_acl_d, { "_D_elete", "afs.fs.acl.d",
FT_BOOLEAN, 8, 0, PRSFS_DELETE, "Delete", HFILL }},
-{ &hf_afs_fs_acl_w, { "_W_rite", "afs.fs.acl.w",
+{ &hf_afs_fs_acl_w, { "_W_rite", "afs.fs.acl.w",
FT_BOOLEAN, 8, 0, PRSFS_WRITE, "Write", HFILL }},
-{ &hf_afs_fs_acl_k, { "_L_ock", "afs.fs.acl.k",
+{ &hf_afs_fs_acl_k, { "_L_ock", "afs.fs.acl.k",
FT_BOOLEAN, 8, 0, PRSFS_LOCK, "Lock", HFILL }},
-{ &hf_afs_fs_acl_a, { "_A_dminister", "afs.fs.acl.a",
+{ &hf_afs_fs_acl_a, { "_A_dminister", "afs.fs.acl.a",
FT_BOOLEAN, 8, 0, PRSFS_ADMINISTER, "Administer", HFILL }},
-{ &hf_afs_fs_callback_version, { "Version", "afs.fs.callback.version",
+{ &hf_afs_fs_callback_version, { "Version", "afs.fs.callback.version",
FT_UINT32, BASE_DEC, 0, 0, "Version", HFILL }},
-{ &hf_afs_fs_callback_expires, { "Expires", "afs.fs.callback.expires",
+{ &hf_afs_fs_callback_expires, { "Expires", "afs.fs.callback.expires",
FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Expires", HFILL }},
-{ &hf_afs_fs_callback_type, { "Type", "afs.fs.callback.type",
+{ &hf_afs_fs_callback_type, { "Type", "afs.fs.callback.type",
FT_UINT32, BASE_DEC, VALS(cb_types), 0, "Type", HFILL }},
/* BOS Server Fields */
-{ &hf_afs_bos_errcode, { "Error Code", "afs.bos.errcode",
+{ &hf_afs_bos_errcode, { "Error Code", "afs.bos.errcode",
FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
-{ &hf_afs_bos_type, { "Type", "afs.bos.type",
+{ &hf_afs_bos_type, { "Type", "afs.bos.type",
FT_STRING, BASE_HEX, 0, 0, "Type", HFILL }},
-{ &hf_afs_bos_content, { "Content", "afs.bos.content",
+{ &hf_afs_bos_content, { "Content", "afs.bos.content",
FT_STRING, BASE_HEX, 0, 0, "Content", HFILL }},
-{ &hf_afs_bos_data, { "Data", "afs.bos.data",
+{ &hf_afs_bos_data, { "Data", "afs.bos.data",
FT_BYTES, BASE_HEX, 0, 0, "Data", HFILL }},
-{ &hf_afs_bos_path, { "Path", "afs.bos.path",
+{ &hf_afs_bos_path, { "Path", "afs.bos.path",
FT_STRING, BASE_HEX, 0, 0, "Path", HFILL }},
-{ &hf_afs_bos_parm, { "Parm", "afs.bos.parm",
+{ &hf_afs_bos_parm, { "Parm", "afs.bos.parm",
FT_STRING, BASE_HEX, 0, 0, "Parm", HFILL }},
-{ &hf_afs_bos_error, { "Error", "afs.bos.error",
+{ &hf_afs_bos_error, { "Error", "afs.bos.error",
FT_STRING, BASE_HEX, 0, 0, "Error", HFILL }},
-{ &hf_afs_bos_spare1, { "Spare1", "afs.bos.spare1",
+{ &hf_afs_bos_spare1, { "Spare1", "afs.bos.spare1",
FT_STRING, BASE_HEX, 0, 0, "Spare1", HFILL }},
-{ &hf_afs_bos_spare2, { "Spare2", "afs.bos.spare2",
+{ &hf_afs_bos_spare2, { "Spare2", "afs.bos.spare2",
FT_STRING, BASE_HEX, 0, 0, "Spare2", HFILL }},
-{ &hf_afs_bos_spare3, { "Spare3", "afs.bos.spare3",
+{ &hf_afs_bos_spare3, { "Spare3", "afs.bos.spare3",
FT_STRING, BASE_HEX, 0, 0, "Spare3", HFILL }},
-{ &hf_afs_bos_file, { "File", "afs.bos.file",
+{ &hf_afs_bos_file, { "File", "afs.bos.file",
FT_STRING, BASE_HEX, 0, 0, "File", HFILL }},
-{ &hf_afs_bos_cmd, { "Command", "afs.bos.cmd",
+{ &hf_afs_bos_cmd, { "Command", "afs.bos.cmd",
FT_STRING, BASE_HEX, 0, 0, "Command", HFILL }},
-{ &hf_afs_bos_key, { "Key", "afs.bos.key",
+{ &hf_afs_bos_key, { "Key", "afs.bos.key",
FT_BYTES, BASE_HEX, 0, 0, "key", HFILL }},
-{ &hf_afs_bos_user, { "User", "afs.bos.user",
+{ &hf_afs_bos_user, { "User", "afs.bos.user",
FT_STRING, BASE_HEX, 0, 0, "User", HFILL }},
-{ &hf_afs_bos_instance, { "Instance", "afs.bos.instance",
+{ &hf_afs_bos_instance, { "Instance", "afs.bos.instance",
FT_STRING, BASE_HEX, 0, 0, "Instance", HFILL }},
-{ &hf_afs_bos_status, { "Status", "afs.bos.status",
+{ &hf_afs_bos_status, { "Status", "afs.bos.status",
FT_INT32, BASE_DEC, 0, 0, "Status", HFILL }},
-{ &hf_afs_bos_statusdesc, { "Status Description", "afs.bos.statusdesc",
+{ &hf_afs_bos_statusdesc, { "Status Description", "afs.bos.statusdesc",
FT_STRING, BASE_DEC, 0, 0, "Status Description", HFILL }},
-{ &hf_afs_bos_num, { "Number", "afs.bos.number",
+{ &hf_afs_bos_num, { "Number", "afs.bos.number",
FT_UINT32, BASE_DEC, 0, 0, "Number", HFILL }},
-{ &hf_afs_bos_size, { "Size", "afs.bos.size",
+{ &hf_afs_bos_size, { "Size", "afs.bos.size",
FT_UINT32, BASE_DEC, 0, 0, "Size", HFILL }},
-{ &hf_afs_bos_flags, { "Flags", "afs.bos.flags",
+{ &hf_afs_bos_flags, { "Flags", "afs.bos.flags",
FT_UINT32, BASE_DEC, 0, 0, "Flags", HFILL }},
-{ &hf_afs_bos_date, { "Date", "afs.bos.date",
+{ &hf_afs_bos_date, { "Date", "afs.bos.date",
FT_UINT32, BASE_DEC, 0, 0, "Date", HFILL }},
-{ &hf_afs_bos_kvno, { "Key Version Number", "afs.bos.kvno",
+{ &hf_afs_bos_kvno, { "Key Version Number", "afs.bos.kvno",
FT_UINT32, BASE_DEC, 0, 0, "Key Version Number", HFILL }},
-{ &hf_afs_bos_cell, { "Cell", "afs.bos.cell",
+{ &hf_afs_bos_cell, { "Cell", "afs.bos.cell",
FT_STRING, BASE_HEX, 0, 0, "Cell", HFILL }},
-{ &hf_afs_bos_host, { "Host", "afs.bos.host",
+{ &hf_afs_bos_host, { "Host", "afs.bos.host",
FT_STRING, BASE_HEX, 0, 0, "Host", HFILL }},
-{ &hf_afs_bos_newtime, { "New Time", "afs.bos.newtime",
+{ &hf_afs_bos_newtime, { "New Time", "afs.bos.newtime",
FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "New Time", HFILL }},
-{ &hf_afs_bos_baktime, { "Backup Time", "afs.bos.baktime",
+{ &hf_afs_bos_baktime, { "Backup Time", "afs.bos.baktime",
FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Backup Time", HFILL }},
-{ &hf_afs_bos_oldtime, { "Old Time", "afs.bos.oldtime",
+{ &hf_afs_bos_oldtime, { "Old Time", "afs.bos.oldtime",
FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Old Time", HFILL }},
-{ &hf_afs_bos_keymodtime, { "Key Modification Time", "afs.bos.keymodtime",
+{ &hf_afs_bos_keymodtime, { "Key Modification Time", "afs.bos.keymodtime",
FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Key Modification Time", HFILL }},
-{ &hf_afs_bos_keychecksum, { "Key Checksum", "afs.bos.keychecksum",
+{ &hf_afs_bos_keychecksum, { "Key Checksum", "afs.bos.keychecksum",
FT_UINT32, BASE_DEC, 0, 0, "Key Checksum", HFILL }},
-{ &hf_afs_bos_keyspare2, { "Key Spare 2", "afs.bos.keyspare2",
+{ &hf_afs_bos_keyspare2, { "Key Spare 2", "afs.bos.keyspare2",
FT_UINT32, BASE_DEC, 0, 0, "Key Spare 2", HFILL }},
/* KAUTH Server Fields */
-{ &hf_afs_kauth_errcode, { "Error Code", "afs.kauth.errcode",
+{ &hf_afs_kauth_errcode, { "Error Code", "afs.kauth.errcode",
FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
-{ &hf_afs_kauth_princ, { "Principal", "afs.kauth.princ",
+{ &hf_afs_kauth_princ, { "Principal", "afs.kauth.princ",
FT_STRING, BASE_HEX, 0, 0, "Principal", HFILL }},
-{ &hf_afs_kauth_realm, { "Realm", "afs.kauth.realm",
+{ &hf_afs_kauth_realm, { "Realm", "afs.kauth.realm",
FT_STRING, BASE_HEX, 0, 0, "Realm", HFILL }},
-{ &hf_afs_kauth_domain, { "Domain", "afs.kauth.domain",
+{ &hf_afs_kauth_domain, { "Domain", "afs.kauth.domain",
FT_STRING, BASE_HEX, 0, 0, "Domain", HFILL }},
-{ &hf_afs_kauth_name, { "Name", "afs.kauth.name",
+{ &hf_afs_kauth_name, { "Name", "afs.kauth.name",
FT_STRING, BASE_HEX, 0, 0, "Name", HFILL }},
-{ &hf_afs_kauth_data, { "Data", "afs.kauth.data",
+{ &hf_afs_kauth_data, { "Data", "afs.kauth.data",
FT_BYTES, BASE_HEX, 0, 0, "Data", HFILL }},
-{ &hf_afs_kauth_kvno, { "Key Version Number", "afs.kauth.kvno",
+{ &hf_afs_kauth_kvno, { "Key Version Number", "afs.kauth.kvno",
FT_UINT32, BASE_DEC, 0, 0, "Key Version Number", HFILL }},
/* VOL Server Fields */
-{ &hf_afs_vol_errcode, { "Error Code", "afs.vol.errcode",
+{ &hf_afs_vol_errcode, { "Error Code", "afs.vol.errcode",
FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
-{ &hf_afs_vol_id, { "Volume ID", "afs.vol.id",
+{ &hf_afs_vol_id, { "Volume ID", "afs.vol.id",
FT_UINT32, BASE_DEC, 0, 0, "Volume ID", HFILL }},
-{ &hf_afs_vol_count, { "Volume Count", "afs.vol.count",
+{ &hf_afs_vol_count, { "Volume Count", "afs.vol.count",
FT_UINT32, BASE_DEC, 0, 0, "Volume Count", HFILL }},
-{ &hf_afs_vol_name, { "Volume Name", "afs.vol.name",
+{ &hf_afs_vol_name, { "Volume Name", "afs.vol.name",
FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
/* VLDB Server Fields */
-{ &hf_afs_vldb_errcode, { "Error Code", "afs.vldb.errcode",
+{ &hf_afs_vldb_errcode, { "Error Code", "afs.vldb.errcode",
FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
-{ &hf_afs_vldb_type, { "Volume Type", "afs.vldb.type",
+{ &hf_afs_vldb_type, { "Volume Type", "afs.vldb.type",
FT_UINT32, BASE_HEX, VALS(volume_types), 0, "Volume Type", HFILL }},
-{ &hf_afs_vldb_id, { "Volume ID", "afs.vldb.id",
+{ &hf_afs_vldb_id, { "Volume ID", "afs.vldb.id",
FT_UINT32, BASE_DEC, 0, 0, "Volume ID", HFILL }},
-{ &hf_afs_vldb_bump, { "Bumped Volume ID", "afs.vldb.bump",
+{ &hf_afs_vldb_bump, { "Bumped Volume ID", "afs.vldb.bump",
FT_UINT32, BASE_DEC, 0, 0, "Bumped Volume ID", HFILL }},
-{ &hf_afs_vldb_index, { "Volume Index", "afs.vldb.index",
+{ &hf_afs_vldb_index, { "Volume Index", "afs.vldb.index",
FT_UINT32, BASE_DEC, 0, 0, "Volume Index", HFILL }},
-{ &hf_afs_vldb_count, { "Volume Count", "afs.vldb.count",
+{ &hf_afs_vldb_count, { "Volume Count", "afs.vldb.count",
FT_UINT32, BASE_DEC, 0, 0, "Volume Count", HFILL }},
-{ &hf_afs_vldb_numservers, { "Number of Servers", "afs.vldb.numservers",
+{ &hf_afs_vldb_numservers, { "Number of Servers", "afs.vldb.numservers",
FT_UINT32, BASE_DEC, 0, 0, "Number of Servers", HFILL }},
-{ &hf_afs_vldb_nextindex, { "Next Volume Index", "afs.vldb.nextindex",
+{ &hf_afs_vldb_nextindex, { "Next Volume Index", "afs.vldb.nextindex",
FT_UINT32, BASE_DEC, 0, 0, "Next Volume Index", HFILL }},
-{ &hf_afs_vldb_rovol, { "Read-Only Volume ID", "afs.vldb.rovol",
+{ &hf_afs_vldb_rovol, { "Read-Only Volume ID", "afs.vldb.rovol",
FT_UINT32, BASE_DEC, 0, 0, "Read-Only Volume ID", HFILL }},
-{ &hf_afs_vldb_rwvol, { "Read-Write Volume ID", "afs.vldb.rwvol",
+{ &hf_afs_vldb_rwvol, { "Read-Write Volume ID", "afs.vldb.rwvol",
FT_UINT32, BASE_DEC, 0, 0, "Read-Only Volume ID", HFILL }},
-{ &hf_afs_vldb_bkvol, { "Backup Volume ID", "afs.vldb.bkvol",
+{ &hf_afs_vldb_bkvol, { "Backup Volume ID", "afs.vldb.bkvol",
FT_UINT32, BASE_DEC, 0, 0, "Read-Only Volume ID", HFILL }},
-{ &hf_afs_vldb_clonevol, { "Clone Volume ID", "afs.vldb.clonevol",
+{ &hf_afs_vldb_clonevol, { "Clone Volume ID", "afs.vldb.clonevol",
FT_UINT32, BASE_DEC, 0, 0, "Clone Volume ID", HFILL }},
-{ &hf_afs_vldb_name, { "Volume Name", "afs.vldb.name",
+{ &hf_afs_vldb_name, { "Volume Name", "afs.vldb.name",
FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
-{ &hf_afs_vldb_partition, { "Partition", "afs.vldb.partition",
+{ &hf_afs_vldb_partition, { "Partition", "afs.vldb.partition",
FT_STRING, BASE_HEX, 0, 0, "Partition", HFILL }},
-{ &hf_afs_vldb_server, { "Server", "afs.vldb.server",
+{ &hf_afs_vldb_server, { "Server", "afs.vldb.server",
FT_IPv4, BASE_HEX, 0, 0, "Server", HFILL }},
-{ &hf_afs_vldb_serveruuid, { "Server UUID", "afs.vldb.serveruuid",
+{ &hf_afs_vldb_serveruuid, { "Server UUID", "afs.vldb.serveruuid",
FT_BYTES, BASE_HEX, 0, 0, "Server UUID", HFILL }},
-{ &hf_afs_vldb_serveruniq, { "Server Unique Address", "afs.vldb.serveruniq",
+{ &hf_afs_vldb_serveruniq, { "Server Unique Address", "afs.vldb.serveruniq",
FT_UINT32, BASE_HEX, 0, 0, "Server Unique Address", HFILL }},
-{ &hf_afs_vldb_serverflags, { "Server Flags", "afs.vldb.serverflags",
+{ &hf_afs_vldb_serverflags, { "Server Flags", "afs.vldb.serverflags",
FT_UINT32, BASE_HEX, 0, 0, "Server Flags", HFILL }},
-{ &hf_afs_vldb_serverip, { "Server IP", "afs.vldb.serverip",
+{ &hf_afs_vldb_serverip, { "Server IP", "afs.vldb.serverip",
FT_IPv4, BASE_HEX, 0, 0, "Server IP", HFILL }},
-{ &hf_afs_vldb_flags, { "Flags", "afs.vldb.flags",
+{ &hf_afs_vldb_flags, { "Flags", "afs.vldb.flags",
FT_UINT32, BASE_HEX, 0, 0, "Flags", HFILL }},
-
-{ &hf_afs_vldb_flags_rwexists, { "Read/Write Exists", "afs.vldb.flags.rwexists",
+
+{ &hf_afs_vldb_flags_rwexists, { "Read/Write Exists", "afs.vldb.flags.rwexists",
FT_BOOLEAN, 32, 0, 0x1000, "Read/Write Exists", HFILL }},
-{ &hf_afs_vldb_flags_roexists, { "Read-Only Exists", "afs.vldb.flags.roexists",
+{ &hf_afs_vldb_flags_roexists, { "Read-Only Exists", "afs.vldb.flags.roexists",
FT_BOOLEAN, 32, 0, 0x2000, "Read-Only Exists", HFILL }},
-{ &hf_afs_vldb_flags_bkexists, { "Backup Exists", "afs.vldb.flags.bkexists",
+{ &hf_afs_vldb_flags_bkexists, { "Backup Exists", "afs.vldb.flags.bkexists",
FT_BOOLEAN, 32, 0, 0x4000, "Backup Exists", HFILL }},
-{ &hf_afs_vldb_flags_dfsfileset, { "DFS Fileset", "afs.vldb.flags.dfsfileset",
+{ &hf_afs_vldb_flags_dfsfileset, { "DFS Fileset", "afs.vldb.flags.dfsfileset",
FT_BOOLEAN, 32, 0, 0x8000, "DFS Fileset", HFILL }},
-
-{ &hf_afs_vldb_spare1, { "Spare 1", "afs.vldb.spare1",
+
+{ &hf_afs_vldb_spare1, { "Spare 1", "afs.vldb.spare1",
FT_UINT32, BASE_DEC, 0, 0, "Spare 1", HFILL }},
-{ &hf_afs_vldb_spare2, { "Spare 2", "afs.vldb.spare2",
+{ &hf_afs_vldb_spare2, { "Spare 2", "afs.vldb.spare2",
FT_UINT32, BASE_DEC, 0, 0, "Spare 2", HFILL }},
-{ &hf_afs_vldb_spare3, { "Spare 3", "afs.vldb.spare3",
+{ &hf_afs_vldb_spare3, { "Spare 3", "afs.vldb.spare3",
FT_UINT32, BASE_DEC, 0, 0, "Spare 3", HFILL }},
-{ &hf_afs_vldb_spare4, { "Spare 4", "afs.vldb.spare4",
+{ &hf_afs_vldb_spare4, { "Spare 4", "afs.vldb.spare4",
FT_UINT32, BASE_DEC, 0, 0, "Spare 4", HFILL }},
-{ &hf_afs_vldb_spare5, { "Spare 5", "afs.vldb.spare5",
+{ &hf_afs_vldb_spare5, { "Spare 5", "afs.vldb.spare5",
FT_UINT32, BASE_DEC, 0, 0, "Spare 5", HFILL }},
-{ &hf_afs_vldb_spare6, { "Spare 6", "afs.vldb.spare6",
+{ &hf_afs_vldb_spare6, { "Spare 6", "afs.vldb.spare6",
FT_UINT32, BASE_DEC, 0, 0, "Spare 6", HFILL }},
-{ &hf_afs_vldb_spare7, { "Spare 7", "afs.vldb.spare7",
+{ &hf_afs_vldb_spare7, { "Spare 7", "afs.vldb.spare7",
FT_UINT32, BASE_DEC, 0, 0, "Spare 7", HFILL }},
-{ &hf_afs_vldb_spare8, { "Spare 8", "afs.vldb.spare8",
+{ &hf_afs_vldb_spare8, { "Spare 8", "afs.vldb.spare8",
FT_UINT32, BASE_DEC, 0, 0, "Spare 8", HFILL }},
-{ &hf_afs_vldb_spare9, { "Spare 9", "afs.vldb.spare9",
+{ &hf_afs_vldb_spare9, { "Spare 9", "afs.vldb.spare9",
FT_UINT32, BASE_DEC, 0, 0, "Spare 9", HFILL }},
/* BACKUP Server Fields */
-{ &hf_afs_backup_errcode, { "Error Code", "afs.backup.errcode",
+{ &hf_afs_backup_errcode, { "Error Code", "afs.backup.errcode",
FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
/* CB Server Fields */
-{ &hf_afs_cb_errcode, { "Error Code", "afs.cb.errcode",
+{ &hf_afs_cb_errcode, { "Error Code", "afs.cb.errcode",
FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
-{ &hf_afs_cb_callback_version, { "Version", "afs.cb.callback.version",
+{ &hf_afs_cb_callback_version, { "Version", "afs.cb.callback.version",
FT_UINT32, BASE_DEC, 0, 0, "Version", HFILL }},
-{ &hf_afs_cb_callback_expires, { "Expires", "afs.cb.callback.expires",
+{ &hf_afs_cb_callback_expires, { "Expires", "afs.cb.callback.expires",
FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Expires", HFILL }},
-{ &hf_afs_cb_callback_type, { "Type", "afs.cb.callback.type",
+{ &hf_afs_cb_callback_type, { "Type", "afs.cb.callback.type",
FT_UINT32, BASE_DEC, VALS(cb_types), 0, "Type", HFILL }},
-{ &hf_afs_cb_fid_volume, { "FileID (Volume)", "afs.cb.fid.volume",
+{ &hf_afs_cb_fid_volume, { "FileID (Volume)", "afs.cb.fid.volume",
FT_UINT32, BASE_DEC, 0, 0, "File ID (Volume)", HFILL }},
-{ &hf_afs_cb_fid_vnode, { "FileID (VNode)", "afs.cb.fid.vnode",
+{ &hf_afs_cb_fid_vnode, { "FileID (VNode)", "afs.cb.fid.vnode",
FT_UINT32, BASE_DEC, 0, 0, "File ID (VNode)", HFILL }},
-{ &hf_afs_cb_fid_uniqifier, { "FileID (Uniqifier)", "afs.cb.fid.uniq",
+{ &hf_afs_cb_fid_uniqifier, { "FileID (Uniqifier)", "afs.cb.fid.uniq",
FT_UINT32, BASE_DEC, 0, 0, "File ID (Uniqifier)", HFILL }},
/* PROT Server Fields */
-{ &hf_afs_prot_errcode, { "Error Code", "afs.prot.errcode",
+{ &hf_afs_prot_errcode, { "Error Code", "afs.prot.errcode",
FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
-{ &hf_afs_prot_name, { "Name", "afs.prot.name",
+{ &hf_afs_prot_name, { "Name", "afs.prot.name",
FT_STRING, BASE_HEX, 0, 0, "Name", HFILL }},
-{ &hf_afs_prot_id, { "ID", "afs.prot.id",
+{ &hf_afs_prot_id, { "ID", "afs.prot.id",
FT_UINT32, BASE_DEC, 0, 0, "ID", HFILL }},
-{ &hf_afs_prot_oldid, { "Old ID", "afs.prot.oldid",
+{ &hf_afs_prot_oldid, { "Old ID", "afs.prot.oldid",
FT_UINT32, BASE_DEC, 0, 0, "Old ID", HFILL }},
-{ &hf_afs_prot_newid, { "New ID", "afs.prot.newid",
+{ &hf_afs_prot_newid, { "New ID", "afs.prot.newid",
FT_UINT32, BASE_DEC, 0, 0, "New ID", HFILL }},
-{ &hf_afs_prot_gid, { "Group ID", "afs.prot.gid",
+{ &hf_afs_prot_gid, { "Group ID", "afs.prot.gid",
FT_UINT32, BASE_DEC, 0, 0, "Group ID", HFILL }},
-{ &hf_afs_prot_uid, { "User ID", "afs.prot.uid",
+{ &hf_afs_prot_uid, { "User ID", "afs.prot.uid",
FT_UINT32, BASE_DEC, 0, 0, "User ID", HFILL }},
-{ &hf_afs_prot_count, { "Count", "afs.prot.count",
+{ &hf_afs_prot_count, { "Count", "afs.prot.count",
FT_UINT32, BASE_DEC, 0, 0, "Count", HFILL }},
-{ &hf_afs_prot_maxgid, { "Maximum Group ID", "afs.prot.maxgid",
+{ &hf_afs_prot_maxgid, { "Maximum Group ID", "afs.prot.maxgid",
FT_UINT32, BASE_DEC, 0, 0, "Maximum Group ID", HFILL }},
-{ &hf_afs_prot_maxuid, { "Maximum User ID", "afs.prot.maxuid",
+{ &hf_afs_prot_maxuid, { "Maximum User ID", "afs.prot.maxuid",
FT_UINT32, BASE_DEC, 0, 0, "Maximum User ID", HFILL }},
-{ &hf_afs_prot_pos, { "Position", "afs.prot.pos",
+{ &hf_afs_prot_pos, { "Position", "afs.prot.pos",
FT_UINT32, BASE_DEC, 0, 0, "Position", HFILL }},
-{ &hf_afs_prot_flag, { "Flag", "afs.prot.flag",
+{ &hf_afs_prot_flag, { "Flag", "afs.prot.flag",
FT_UINT32, BASE_HEX, 0, 0, "Flag", HFILL }},
/* UBIK Fields */
-{ &hf_afs_ubik_errcode, { "Error Code", "afs.ubik.errcode",
+{ &hf_afs_ubik_errcode, { "Error Code", "afs.ubik.errcode",
FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
-{ &hf_afs_ubik_state, { "State", "afs.ubik.state",
+{ &hf_afs_ubik_state, { "State", "afs.ubik.state",
FT_UINT32, BASE_HEX, 0, 0, "State", HFILL }},
-{ &hf_afs_ubik_version_epoch, { "Epoch", "afs.ubik.version.epoch",
+{ &hf_afs_ubik_version_epoch, { "Epoch", "afs.ubik.version.epoch",
FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Epoch", HFILL }},
-{ &hf_afs_ubik_version_counter, { "Counter", "afs.ubik.version.counter",
+{ &hf_afs_ubik_version_counter, { "Counter", "afs.ubik.version.counter",
FT_UINT32, BASE_DEC, 0, 0, "Counter", HFILL }},
-{ &hf_afs_ubik_votestart, { "Vote Started", "afs.ubik.votestart",
+{ &hf_afs_ubik_votestart, { "Vote Started", "afs.ubik.votestart",
FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Vote Started", HFILL }},
-{ &hf_afs_ubik_voteend, { "Vote Ends", "afs.ubik.voteend",
+{ &hf_afs_ubik_voteend, { "Vote Ends", "afs.ubik.voteend",
FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Vote Ends", HFILL }},
-{ &hf_afs_ubik_file, { "File", "afs.ubik.file",
+{ &hf_afs_ubik_file, { "File", "afs.ubik.file",
FT_UINT32, BASE_DEC, 0, 0, "File", HFILL }},
-{ &hf_afs_ubik_pos, { "Position", "afs.ubik.position",
+{ &hf_afs_ubik_pos, { "Position", "afs.ubik.position",
FT_UINT32, BASE_DEC, 0, 0, "Position", HFILL }},
-{ &hf_afs_ubik_length, { "Length", "afs.ubik.length",
+{ &hf_afs_ubik_length, { "Length", "afs.ubik.length",
FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }},
-{ &hf_afs_ubik_locktype, { "Lock Type", "afs.ubik.locktype",
+{ &hf_afs_ubik_locktype, { "Lock Type", "afs.ubik.locktype",
FT_UINT32, BASE_DEC, VALS(ubik_lock_types), 0, "Lock Type", HFILL }},
-{ &hf_afs_ubik_votetype, { "Vote Type", "afs.ubik.votetype",
+{ &hf_afs_ubik_votetype, { "Vote Type", "afs.ubik.votetype",
FT_UINT32, BASE_HEX, 0, 0, "Vote Type", HFILL }},
-{ &hf_afs_ubik_site, { "Site", "afs.ubik.site",
+{ &hf_afs_ubik_site, { "Site", "afs.ubik.site",
FT_IPv4, BASE_HEX, 0, 0, "Site", HFILL }},
-{ &hf_afs_ubik_interface, { "Interface Address", "afs.ubik.interface",
+{ &hf_afs_ubik_interface, { "Interface Address", "afs.ubik.interface",
FT_IPv4, BASE_HEX, 0, 0, "Interface Address", HFILL }},
-{ &hf_afs_ubik_now, { "Now", "afs.ubik.now",
+{ &hf_afs_ubik_now, { "Now", "afs.ubik.now",
FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Now", HFILL }},
-{ &hf_afs_ubik_lastyestime, { "Last Yes Time", "afs.ubik.lastyesttime",
+{ &hf_afs_ubik_lastyestime, { "Last Yes Time", "afs.ubik.lastyesttime",
FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Yes Time", HFILL }},
-{ &hf_afs_ubik_lastyeshost, { "Last Yes Host", "afs.ubik.lastyeshost",
+{ &hf_afs_ubik_lastyeshost, { "Last Yes Host", "afs.ubik.lastyeshost",
FT_IPv4, BASE_HEX, 0, 0, "Last Yes Host", HFILL }},
-{ &hf_afs_ubik_lastyesstate, { "Last Yes State", "afs.ubik.lastyesstate",
+{ &hf_afs_ubik_lastyesstate, { "Last Yes State", "afs.ubik.lastyesstate",
FT_UINT32, BASE_HEX, 0, 0, "Last Yes State", HFILL }},
-{ &hf_afs_ubik_lastyesclaim, { "Last Yes Claim", "afs.ubik.lastyesclaim",
+{ &hf_afs_ubik_lastyesclaim, { "Last Yes Claim", "afs.ubik.lastyesclaim",
FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Yes Claim", HFILL }},
-{ &hf_afs_ubik_lowesthost, { "Lowest Host", "afs.ubik.lowesthost",
+{ &hf_afs_ubik_lowesthost, { "Lowest Host", "afs.ubik.lowesthost",
FT_IPv4, BASE_HEX, 0, 0, "Lowest Host", HFILL }},
-{ &hf_afs_ubik_lowesttime, { "Lowest Time", "afs.ubik.lowesttime",
+{ &hf_afs_ubik_lowesttime, { "Lowest Time", "afs.ubik.lowesttime",
FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Lowest Time", HFILL }},
-{ &hf_afs_ubik_synchost, { "Sync Host", "afs.ubik.synchost",
+{ &hf_afs_ubik_synchost, { "Sync Host", "afs.ubik.synchost",
FT_IPv4, BASE_HEX, 0, 0, "Sync Host", HFILL }},
-{ &hf_afs_ubik_addr, { "Address", "afs.ubik.addr",
+{ &hf_afs_ubik_addr, { "Address", "afs.ubik.addr",
FT_IPv4, BASE_HEX, 0, 0, "Address", HFILL }},
-{ &hf_afs_ubik_synctime, { "Sync Time", "afs.ubik.synctime",
+{ &hf_afs_ubik_synctime, { "Sync Time", "afs.ubik.synctime",
FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Sync Time", HFILL }},
-{ &hf_afs_ubik_lastvotetime, { "Last Vote Time", "afs.ubik.lastvotetime",
+{ &hf_afs_ubik_lastvotetime, { "Last Vote Time", "afs.ubik.lastvotetime",
FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Vote Time", HFILL }},
-{ &hf_afs_ubik_lastbeaconsent, { "Last Beacon Sent", "afs.ubik.lastbeaconsent",
+{ &hf_afs_ubik_lastbeaconsent, { "Last Beacon Sent", "afs.ubik.lastbeaconsent",
FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Beacon Sent", HFILL }},
-{ &hf_afs_ubik_lastvote, { "Last Vote", "afs.ubik.lastvote",
+{ &hf_afs_ubik_lastvote, { "Last Vote", "afs.ubik.lastvote",
FT_UINT32, BASE_HEX, 0, 0, "Last Vote", HFILL }},
-{ &hf_afs_ubik_currentdb, { "Current DB", "afs.ubik.currentdb",
+{ &hf_afs_ubik_currentdb, { "Current DB", "afs.ubik.currentdb",
FT_UINT32, BASE_HEX, 0, 0, "Current DB", HFILL }},
-{ &hf_afs_ubik_up, { "Up", "afs.ubik.up",
+{ &hf_afs_ubik_up, { "Up", "afs.ubik.up",
FT_UINT32, BASE_HEX, 0, 0, "Up", HFILL }},
-{ &hf_afs_ubik_beaconsincedown, { "Beacon Since Down", "afs.ubik.beaconsincedown",
+{ &hf_afs_ubik_beaconsincedown, { "Beacon Since Down", "afs.ubik.beaconsincedown",
FT_UINT32, BASE_HEX, 0, 0, "Beacon Since Down", HFILL }},
-{ &hf_afs_ubik_amsyncsite, { "Am Sync Site", "afs.ubik.amsyncsite",
+{ &hf_afs_ubik_amsyncsite, { "Am Sync Site", "afs.ubik.amsyncsite",
FT_UINT32, BASE_HEX, 0, 0, "Am Sync Site", HFILL }},
-{ &hf_afs_ubik_syncsiteuntil, { "Sync Site Until", "afs.ubik.syncsiteuntil",
+{ &hf_afs_ubik_syncsiteuntil, { "Sync Site Until", "afs.ubik.syncsiteuntil",
FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Sync Site Until", HFILL }},
-{ &hf_afs_ubik_nservers, { "Number of Servers", "afs.ubik.nservers",
+{ &hf_afs_ubik_nservers, { "Number of Servers", "afs.ubik.nservers",
FT_UINT32, BASE_HEX, 0, 0, "Number of Servers", HFILL }},
-{ &hf_afs_ubik_lockedpages, { "Locked Pages", "afs.ubik.lockedpages",
+{ &hf_afs_ubik_lockedpages, { "Locked Pages", "afs.ubik.lockedpages",
FT_UINT32, BASE_HEX, 0, 0, "Locked Pages", HFILL }},
-{ &hf_afs_ubik_writelockedpages, { "Write Locked Pages", "afs.ubik.writelockedpages",
+{ &hf_afs_ubik_writelockedpages, { "Write Locked Pages", "afs.ubik.writelockedpages",
FT_UINT32, BASE_HEX, 0, 0, "Write Locked Pages", HFILL }},
-{ &hf_afs_ubik_activewrite, { "Active Write", "afs.ubik.activewrite",
+{ &hf_afs_ubik_activewrite, { "Active Write", "afs.ubik.activewrite",
FT_UINT32, BASE_HEX, 0, 0, "Active Write", HFILL }},
-{ &hf_afs_ubik_tidcounter, { "TID Counter", "afs.ubik.tidcounter",
+{ &hf_afs_ubik_tidcounter, { "TID Counter", "afs.ubik.tidcounter",
FT_UINT32, BASE_HEX, 0, 0, "TID Counter", HFILL }},
-{ &hf_afs_ubik_anyreadlocks, { "Any Read Locks", "afs.ubik.anyreadlocks",
+{ &hf_afs_ubik_anyreadlocks, { "Any Read Locks", "afs.ubik.anyreadlocks",
FT_UINT32, BASE_HEX, 0, 0, "Any Read Locks", HFILL }},
-{ &hf_afs_ubik_anywritelocks, { "Any Write Locks", "afs.ubik.anywritelocks",
+{ &hf_afs_ubik_anywritelocks, { "Any Write Locks", "afs.ubik.anywritelocks",
FT_UINT32, BASE_HEX, 0, 0, "Any Write Locks", HFILL }},
-{ &hf_afs_ubik_recoverystate, { "Recovery State", "afs.ubik.recoverystate",
+{ &hf_afs_ubik_recoverystate, { "Recovery State", "afs.ubik.recoverystate",
FT_UINT32, BASE_HEX, 0, 0, "Recovery State", HFILL }},
-{ &hf_afs_ubik_currenttrans, { "Current Transaction", "afs.ubik.currenttran",
+{ &hf_afs_ubik_currenttrans, { "Current Transaction", "afs.ubik.currenttran",
FT_UINT32, BASE_HEX, 0, 0, "Current Transaction", HFILL }},
-{ &hf_afs_ubik_writetrans, { "Write Transaction", "afs.ubik.writetran",
+{ &hf_afs_ubik_writetrans, { "Write Transaction", "afs.ubik.writetran",
FT_UINT32, BASE_HEX, 0, 0, "Write Transaction", HFILL }},
-{ &hf_afs_ubik_epochtime, { "Epoch Time", "afs.ubik.epochtime",
+{ &hf_afs_ubik_epochtime, { "Epoch Time", "afs.ubik.epochtime",
FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Epoch Time", HFILL }},
-{ &hf_afs_ubik_isclone, { "Is Clone", "afs.ubik.isclone",
+{ &hf_afs_ubik_isclone, { "Is Clone", "afs.ubik.isclone",
FT_UINT32, BASE_HEX, 0, 0, "Is Clone", HFILL }},
diff --git a/packet-afs.c b/packet-afs.c
index d19ad71..f226e29 100644
--- a/packet-afs.c
+++ b/packet-afs.c
@@ -6,9 +6,9 @@
* Portions based on information retrieved from the RX definitions
* in Arla, the free AFS client at http://www.stacken.kth.se/project/arla/
* Portions based on information/specs retrieved from the OpenAFS sources at
- * www.openafs.org, Copyright IBM.
+ * www.openafs.org, Copyright IBM.
*
- * $Id: packet-afs.c,v 1.48 2002/08/02 23:35:46 jmayer Exp $
+ * $Id: packet-afs.c,v 1.49 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -74,43 +74,43 @@ static GMemChunk *afs_request_vals = NULL;
/*
* Dissector prototypes
*/
-static int dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static int dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset);
-static void dissect_fs_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_fs_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_fs_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_fs_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_bos_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_bos_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_bos_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_bos_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_vol_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_vol_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_vol_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_vol_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_kauth_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_kauth_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_kauth_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_kauth_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_cb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_cb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_cb_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_cb_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_prot_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_prot_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_prot_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_prot_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_vldb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_vldb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_vldb_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_vldb_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_ubik_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_ubik_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_ubik_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_ubik_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_backup_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_backup_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
-static void dissect_backup_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
+static void dissect_backup_request(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset, int opcode);
/*
@@ -215,11 +215,11 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->srcport, pinfo->destport, 0);
if (conversation == NULL) {
/* It's not part of any conversation - create a new one. */
- conversation = conversation_new(&pinfo->src, &pinfo->dst,
+ conversation = conversation_new(&pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
}
- request_key.conversation = conversation->index;
+ request_key.conversation = conversation->index;
request_key.service = rxinfo->serviceid;
request_key.callnumber = rxinfo->callnumber;
@@ -381,15 +381,15 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ti = proto_tree_add_text(afs_tree, tvb,
offset, 0, "Operation: Unknown");
}
-
+
/* Add the subtree for this particular service */
afs_op_tree = proto_item_add_subtree(ti, ett_afs_op);
-
+
if ( typenode != 0 ) {
/* indicate the type of request */
proto_tree_add_boolean_hidden(afs_tree, typenode, tvb, offset, 0, 1);
}
-
+
/* Process the packet according to what service it is */
if ( dissector ) {
(*dissector)(tvb, rxinfo, afs_op_tree, offset, opcode);
@@ -431,7 +431,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
*
* Should this just scan the string itself, rather than using "sscanf()"?
*/
-static int
+static int
dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offset)
{
int old_offset;
@@ -445,12 +445,12 @@ dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offs
if (sscanf((char *) GETSTR, "%d %n", &pos, &n) != 1) {
- /* does not matter what we return, if this fails,
+ /* does not matter what we return, if this fails,
* we cant dissect anything else in the packet either.
*/
return offset;
}
- proto_tree_add_uint(tree, hf_afs_fs_acl_count_positive, tvb,
+ proto_tree_add_uint(tree, hf_afs_fs_acl_count_positive, tvb,
offset, n, pos);
offset += n;
@@ -458,7 +458,7 @@ dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offs
if (sscanf((char *) GETSTR, "%d %n", &neg, &n) != 1) {
return offset;
}
- proto_tree_add_uint(tree, hf_afs_fs_acl_count_negative, tvb,
+ proto_tree_add_uint(tree, hf_afs_fs_acl_count_negative, tvb,
offset, n, neg);
offset += n;
@@ -466,7 +466,7 @@ dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offs
* This wacky order preserves the order used by the "fs" command
*/
for (i = 0; i < pos; i++) {
- if (sscanf((char *) GETSTR,
+ if (sscanf((char *) GETSTR,
"%127s %d %n", user, &acl, &n) != 2) {
return offset;
}
@@ -474,7 +474,7 @@ dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offs
offset += n;
}
for (i = 0; i < neg; i++) {
- if (sscanf((char *) GETSTR,
+ if (sscanf((char *) GETSTR,
"%127s %d %n", user, &acl, &n) != 2) {
return offset;
}
@@ -518,7 +518,7 @@ dissect_fs_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int off
OUT_FS_AFSFetchStatus("Status");
OUT_FS_AFSCallBack();
OUT_FS_AFSVolSync();
- break;
+ break;
case 133: /* Store data */
case 134: /* Store ACL */
case 135: /* Store status */
@@ -554,7 +554,7 @@ dissect_fs_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int off
case 145: /* old release lock */
case 147: /* give up callbacks */
case 150: /* set volume status */
- case 152: /* check token */
+ case 152: /* check token */
/* nothing returned */
break;
case 146: /* get statistics */
@@ -578,7 +578,7 @@ dissect_fs_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int off
break;
case 155: /* bulk status */
OUT_FS_AFSBulkStats();
- SKIP(4);
+ SKIP(4);
OUT_FS_AFSCBs();
OUT_FS_AFSVolSync();
break;
@@ -625,7 +625,7 @@ dissect_fs_request(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int o
break;
case 131: /* Fetch ACL */
OUT_FS_AFSFid("Target");
- break;
+ break;
case 132: /* Fetch Status */
OUT_FS_AFSFid("Target");
break;
diff --git a/packet-aim.c b/packet-aim.c
index 83991ba..077b05b 100644
--- a/packet-aim.c
+++ b/packet-aim.c
@@ -2,7 +2,7 @@
* Routines for AIM Instant Messenger (OSCAR) dissection
* Copyright 2000, Ralf Hoelzer <ralf@well.com>
*
- * $Id: packet-aim.c,v 1.16 2002/08/02 23:35:47 jmayer Exp $
+ * $Id: packet-aim.c,v 1.17 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -12,12 +12,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -113,27 +113,27 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Not an instant messenger packet, just happened to use the same port */
return;
}
-
+
/* Make entries in Protocol column and Info column on summary display */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AIM");
-
- if (check_col(pinfo->cinfo, COL_INFO))
+
+ if (check_col(pinfo->cinfo, COL_INFO))
col_add_str(pinfo->cinfo, COL_INFO, "AOL Instant Messenger");
/* get relevant header information */
hdr_channel = tvb_get_guint8(tvb, 1);
- hdr_sequence_no = tvb_get_ntohs(tvb, 2);
- hdr_data_field_length = tvb_get_ntohs(tvb, 4);
+ hdr_sequence_no = tvb_get_ntohs(tvb, 2);
+ hdr_data_field_length = tvb_get_ntohs(tvb, 4);
/* In the interest of speed, if "tree" is NULL, don't do any work not
necessary to generate protocol tree items. */
if (tree) {
-
- ti = proto_tree_add_item(tree, proto_aim, tvb, 0, -1, FALSE);
+
+ ti = proto_tree_add_item(tree, proto_aim, tvb, 0, -1, FALSE);
aim_tree = proto_item_add_subtree(ti, ett_aim);
- proto_tree_add_uint(aim_tree, hf_aim_cmd_start, tvb, 0, 1, '*');
+ proto_tree_add_uint(aim_tree, hf_aim_cmd_start, tvb, 0, 1, '*');
proto_tree_add_uint(aim_tree, hf_aim_channel, tvb, 1, 1, hdr_channel);
proto_tree_add_uint(aim_tree, hf_aim_seqno, tvb, 2, 2, hdr_sequence_no);
proto_tree_add_uint(aim_tree, hf_aim_data_len, tvb, 4, 2, hdr_data_field_length);
@@ -148,17 +148,17 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case CHANNEL_NEW_CONN:
if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "New Connection");
break;
-
+
/* SNAC channel. Most packets are of this type, such as messages or buddy list
* management.
*/
case CHANNEL_SNAC_DATA:
- family = tvb_get_ntohs(tvb, 6);
- subtype = tvb_get_ntohs(tvb, 8);
+ family = tvb_get_ntohs(tvb, 6);
+ subtype = tvb_get_ntohs(tvb, 8);
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "SNAC data");
- }
+ }
if( tree )
{
ti1 = proto_tree_add_text(aim_tree, tvb, 6, tvb_length(tvb) - 6, "FNAC");
@@ -170,7 +170,7 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Family: 0x%04x - Subtype: 0x%04x (unknown)", family, subtype);
-
+
switch(family)
{
case FAMILY_SIGNON:
@@ -182,16 +182,16 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "Login");
col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", buddyname);
- }
+ }
if( tree )
{
- proto_tree_add_text(aim_tree_fnac, tvb, 20, buddyname_length, "Screen Name: %s", buddyname);
+ proto_tree_add_text(aim_tree_fnac, tvb, 20, buddyname_length, "Screen Name: %s", buddyname);
}
break;
case 0x0003:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Login information reply");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Login information reply");
break;
case 0x0006:
buddyname_length = get_buddyname( buddyname, tvb, 19, 20 );
@@ -199,16 +199,16 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "Sign-on");
col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", buddyname);
- }
-
+ }
+
if( tree )
{
- proto_tree_add_text(aim_tree_fnac, tvb, 20, buddyname_length, "Screen Name: %s", buddyname);
+ proto_tree_add_text(aim_tree_fnac, tvb, 20, buddyname_length, "Screen Name: %s", buddyname);
}
break;
case 0x0007:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Sign-on reply");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Sign-on reply");
break;
}
break;
@@ -217,28 +217,28 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
switch(subtype)
{
case 0x0002:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Client is now online and ready for normal function");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Client is now online and ready for normal function");
break;
case 0x0003:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Server is now ready for normal functions");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Server is now ready for normal functions");
break;
case 0x0004:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request for new service (server will redirect client)");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request for new service (server will redirect client)");
break;
case 0x0005:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Redirect response");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Redirect response");
break;
case 0x0006:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request Rate Information");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request Rate Information");
break;
case 0x0007:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rate information response");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rate information response");
break;
case 0x0008:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rate Information Response Ack");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rate Information Response Ack");
break;
case 0x0016:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "No-op");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "No-op");
break;
}
break;
@@ -247,23 +247,23 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
switch(subtype)
{
case 0x0001:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Buddylist - Error");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Buddylist - Error");
break;
case 0x0002:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request Rights information");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request Rights information");
break;
case 0x0003:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rights information");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rights information");
break;
case 0x0004:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Add to Buddylist");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Add to Buddylist");
break;
case 0x0005:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Remove from Buddylist");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Remove from Buddylist");
break;
case 0x000b:
@@ -272,11 +272,11 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "Oncoming Buddy");
col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", buddyname);
- }
-
+ }
+
if( tree )
{
- proto_tree_add_text(aim_tree_fnac, tvb, 17, buddyname_length, "Screen Name: %s", buddyname);
+ proto_tree_add_text(aim_tree_fnac, tvb, 17, buddyname_length, "Screen Name: %s", buddyname);
}
break;
@@ -288,11 +288,11 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "Offgoing Buddy");
col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", buddyname);
- }
-
+ }
+
if( tree )
{
- proto_tree_add_text(aim_tree_fnac, tvb, 17, buddyname_length, "Screen Name: %s", buddyname);
+ proto_tree_add_text(aim_tree_fnac, tvb, 17, buddyname_length, "Screen Name: %s", buddyname);
}
@@ -304,28 +304,28 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
switch(subtype)
{
case 0x0001:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Location - Error");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Location - Error");
break;
case 0x0002:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request Rights Information");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request Rights Information");
break;
case 0x0003:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rights Information");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rights Information");
break;
case 0x0004:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Set User Information");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Set User Information");
break;
case 0x0005:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request User Information");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request User Information");
break;
case 0x0006:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "User Information");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "User Information");
break;
case 0x0007:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Watcher Subrequest");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Watcher Subrequest");
break;
case 0x0008:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Watcher Notification");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Watcher Notification");
break;
}
break;
@@ -334,13 +334,13 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
switch(subtype)
{
case 0x0001:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Advertisements - Error");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Advertisements - Error");
break;
case 0x0002:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Advertisement Request");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Advertisement Request");
break;
case 0x0003:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Advertisement data (GIF)");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Advertisement data (GIF)");
break;
}
break;
@@ -349,13 +349,13 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
switch(subtype)
{
case 0x0001:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Search - Error (could be: not found)");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Search - Error (could be: not found)");
break;
case 0x0002:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Search for Screen Name by e-mail");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Search for Screen Name by e-mail");
break;
case 0x0003:
- if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Screen Name Search Result");
+ if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Screen Name Search Result");
break;
}
break;
@@ -370,23 +370,23 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "Chat Message ");
col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", msg);
- }
+ }
break;
-
+
case 0x006:
/* channel message to client */
buddyname_length = get_buddyname( buddyname, tvb, 30, 31 );
get_message( msg, tvb, 36 + buddyname_length, tvb_length(tvb) - 36 - buddyname_length );
-
+
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "Chat Message ");
col_append_fstr(pinfo->cinfo, COL_INFO, "from: %s", buddyname);
col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", msg);
- }
-
+ }
+
if( tree )
{
- proto_tree_add_text(aim_tree_fnac, tvb, 31, buddyname_length, "Screen Name: %s", buddyname);
+ proto_tree_add_text(aim_tree_fnac, tvb, 31, buddyname_length, "Screen Name: %s", buddyname);
}
break;
}
@@ -400,16 +400,16 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
buddyname_length = get_buddyname( buddyname, tvb, 26, 27 );
get_message( msg, tvb, 36 + buddyname_length, tvb_length(tvb) - 36 - buddyname_length );
-
+
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "Message ");
col_append_fstr(pinfo->cinfo, COL_INFO, "to: %s", buddyname);
col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", msg);
- }
+ }
if( tree )
{
- proto_tree_add_text(aim_tree_fnac, tvb, 27, buddyname_length, "Screen Name: %s", buddyname);
+ proto_tree_add_text(aim_tree_fnac, tvb, 27, buddyname_length, "Screen Name: %s", buddyname);
}
break;
@@ -424,38 +424,38 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_append_fstr(pinfo->cinfo, COL_INFO, " from: %s", buddyname);
col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", msg);
- }
-
+ }
+
if( tree )
{
- proto_tree_add_text(aim_tree_fnac, tvb, 27, buddyname_length, "Screen Name: %s", buddyname);
+ proto_tree_add_text(aim_tree_fnac, tvb, 27, buddyname_length, "Screen Name: %s", buddyname);
}
break;
}
break;
}
-
-
+
+
break;
-
+
case CHANNEL_FLAP_ERR:
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "FLAP error");
- }
+ }
break;
-
+
case CHANNEL_CLOSE_CONN:
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "Close Connection");
- }
+ }
break;
-
+
default:
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown Channel: %d", hdr_channel );
- }
+ }
break;
}
@@ -467,7 +467,7 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
static int get_buddyname( char *name, tvbuff_t *tvb, int len_offset, int name_offset)
{
guint8 buddyname_length;
-
+
buddyname_length = tvb_get_guint8(tvb, len_offset);
if(buddyname_length > MAX_BUDDYNAME_LENGTH ) buddyname_length = MAX_BUDDYNAME_LENGTH;
@@ -513,20 +513,20 @@ static void get_message( guchar *msg, tvbuff_t *tvb, int msg_offset, int msg_len
new_offset++;
new_length--;
}
-
+
/* set offset and length of message to after the first HTML tag */
msg_offset = new_offset;
msg_length = new_length;
max = msg_length - 1;
tagchars = 0;
-
+
/* find the rest of the message until either a </html> is reached or the end of the frame.
* All other HTML tags are stripped to display only the raw message (printable characters) */
while( (c < max) && (tagchars < 7) )
{
j = tvb_get_guint8(tvb, msg_offset+c);
-
+
/* make sure this is an HTML tag by checking the order of the chars */
if( ( (j == '<') && (tagchars == 0) ) ||
( (j == '/') && (tagchars == 1) ) ||
@@ -542,7 +542,7 @@ static void get_message( guchar *msg, tvbuff_t *tvb, int msg_offset, int msg_len
#ifdef STRIP_TAGS
if( j == '<' ) bracket = TRUE;
- if( j == '>' ) bracket = FALSE;
+ if( j == '>' ) bracket = FALSE;
if( (isprint(j) ) && (bracket == FALSE) && (j != '>'))
#else
if( isprint(j) )
@@ -554,12 +554,12 @@ static void get_message( guchar *msg, tvbuff_t *tvb, int msg_offset, int msg_len
c++;
}
}
-
+
/* Register the protocol with Ethereal */
-void
+void
proto_register_aim(void)
-{
+{
/* Setup list of header fields */
static hf_register_info hf[] = {
diff --git a/packet-ajp13.c b/packet-ajp13.c
index b35ff85..f20069b 100644
--- a/packet-ajp13.c
+++ b/packet-ajp13.c
@@ -2,7 +2,7 @@
* Routines for AJP13 dissection
* Copyright 2002, Christopher K. St. John <cks@distributopia.com>
*
- * $Id: packet-ajp13.c,v 1.7 2002/08/02 23:35:47 jmayer Exp $
+ * $Id: packet-ajp13.c,v 1.8 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -12,12 +12,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -77,7 +77,7 @@
*
* Since AJP13 is a TCP/IP based protocol, writing a dissector for it
* requires addressing several other issues:
- *
+ *
* 1) TCP/IP segments can get retransmitted or be sent out of
* order. Users don't normally care, because the low-level kernel
* networking code takes care of reassembling them properly. But we're
@@ -236,7 +236,7 @@ typedef struct ajp13_frame_data {
*
* XXX - is there a tvbuff routine to handle this?
*/
-static guint16
+static guint16
get_nstring(tvbuff_t *tvb, gint offset, guint8* cbuf, size_t cbuflen)
{
guint16 len;
@@ -331,7 +331,7 @@ display_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ajp13_tree)
/* dangerous assumption that we can just %s out raw bytes */
if(check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", rsmsg_bytes);
-
+
/* NUMBER OF HEADERS
*/
nhdr = tvb_get_ntohs(tvb, pos);
@@ -436,7 +436,7 @@ display_req_body(tvbuff_t *tvb, proto_tree *ajp13_tree)
*/
proto_tree_add_item(ajp13_tree, hf_ajp13_len, tvb, pos, 2, 0);
pos+=2;
-
+
/* BODY (AS STRING)
*/
body_len = get_nstring(tvb, pos, body_bytes, sizeof body_bytes);
@@ -578,7 +578,7 @@ display_req_forward(tvbuff_t *tvb, packet_info *pinfo,
proto_tree_add_item(ajp13_tree, hf_ajp13_nhdr, tvb, pos, 2, 0);
pos+=2;
cd->content_length = 0;
-
+
/* HEADERS
*/
for(i=0; i<nhdr; i++) {
@@ -705,7 +705,7 @@ dissect_ajp13_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
-
+
mag = tvb_get_ntohs(tvb, 0);
len = tvb_get_ntohs(tvb, 2);
@@ -718,7 +718,7 @@ dissect_ajp13_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_append_fstr(pinfo->cinfo, COL_INFO, "%d:REQ:Body", conv->index);
else if (mag == 0x4142)
col_append_fstr(pinfo->cinfo, COL_INFO, "%d:RSP:", conv->index);
- else
+ else
col_set_str(pinfo->cinfo, COL_INFO, "AJP13 Error?");
}
@@ -762,7 +762,7 @@ get_ajp13_pdu_len(tvbuff_t *tvb, int offset)
-/* Code to actually dissect the packets.
+/* Code to actually dissect the packets.
*/
static void
dissect_ajp13(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -782,7 +782,7 @@ dissect_ajp13(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
void
proto_register_ajp13(void)
-{
+{
static hf_register_info hf[] = {
{ &hf_ajp13_magic,
{ "Magic", "ajp13.magic", FT_BYTES, BASE_HEX, NULL, 0x0, "Magic Number",
diff --git a/packet-aodv.c b/packet-aodv.c
index 4b893ef..1677660 100644
--- a/packet-aodv.c
+++ b/packet-aodv.c
@@ -2,7 +2,7 @@
* Routines for AODV dissection
* Copyright 2000, Erik Nordstrm <erik.nordstrom@it.uu.se>
*
- * $Id: packet-aodv.c,v 1.5 2002/08/22 07:32:22 guy Exp $
+ * $Id: packet-aodv.c,v 1.6 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -12,12 +12,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -122,7 +122,7 @@ static int
dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_item *ti = NULL, *tj = NULL, *tk = NULL;
- proto_tree *aodv_tree = NULL, *aodv_flags_tree = NULL,
+ proto_tree *aodv_tree = NULL, *aodv_flags_tree = NULL,
*aodv_unreach_dest_tree = NULL;
guint8 type;
int i;
@@ -131,12 +131,12 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
struct aodv_rerr rerr;
/* Make entries in Protocol column and Info column on summary display */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AODV");
- if (check_col(pinfo->cinfo, COL_INFO))
+ if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
-
+
/* Check the type of AODV packet. */
type = tvb_get_guint8(tvb, 0);
if (type < 1 || type > 3) {
@@ -145,7 +145,7 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
*/
return 0;
}
-
+
if (tree) {
ti = proto_tree_add_protocol_format(tree, proto_aodv, tvb, 0, -1,
"Ad hoc On-demand Distance Vector Routing Protocol, %s",
@@ -168,7 +168,7 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
rreq.dest_seqno = tvb_get_ntohl(tvb, 12);
tvb_memcpy(tvb, (guint8 *)&rreq.orig_addr, 16, 4);
rreq.orig_seqno = tvb_get_ntohl(tvb, 20);
-
+
if (tree) {
proto_tree_add_boolean(aodv_flags_tree, hf_aodv_flags_rreq_join, tvb, 1, 1, rreq.flags);
proto_tree_add_boolean(aodv_flags_tree, hf_aodv_flags_rreq_repair, tvb, 1, 1, rreq.flags);
@@ -187,18 +187,18 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(aodv_tree, hf_aodv_orig_seqno, tvb, 20, 4, rreq.orig_seqno);
proto_item_append_text(ti, ", Dest IP: %s, Orig IP: %s, Id=%u", ip_to_str(tvb_get_ptr(tvb, 8, 4)), ip_to_str(tvb_get_ptr(tvb, 16, 4)), rreq.rreq_id);
}
-
+
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s, D: %s O: %s Id=%u Hcnt=%u DSN=%u OSN=%u",
- val_to_str(type, type_vals,
- "Unknown AODV Packet Type (%u)"),
- ip_to_str(tvb_get_ptr(tvb, 8, 4)),
- ip_to_str(tvb_get_ptr(tvb, 16, 4)),
- rreq.rreq_id,
- rreq.hop_count,
- rreq.dest_seqno,
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s, D: %s O: %s Id=%u Hcnt=%u DSN=%u OSN=%u",
+ val_to_str(type, type_vals,
+ "Unknown AODV Packet Type (%u)"),
+ ip_to_str(tvb_get_ptr(tvb, 8, 4)),
+ ip_to_str(tvb_get_ptr(tvb, 16, 4)),
+ rreq.rreq_id,
+ rreq.hop_count,
+ rreq.dest_seqno,
rreq.orig_seqno);
-
+
break;
case RREP:
rrep.type = type;
@@ -227,27 +227,27 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s D: %s O: %s Hcnt=%u DSN=%u Lifetime=%u",
- val_to_str(type, type_vals,
- "Unknown AODV Packet Type (%u)"),
- ip_to_str(tvb_get_ptr(tvb, 4, 4)),
- ip_to_str(tvb_get_ptr(tvb, 12, 4)),
- rrep.hop_count,
- rrep.dest_seqno,
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s D: %s O: %s Hcnt=%u DSN=%u Lifetime=%u",
+ val_to_str(type, type_vals,
+ "Unknown AODV Packet Type (%u)"),
+ ip_to_str(tvb_get_ptr(tvb, 4, 4)),
+ ip_to_str(tvb_get_ptr(tvb, 12, 4)),
+ rrep.hop_count,
+ rrep.dest_seqno,
rrep.lifetime);
break;
case RERR:
rerr.type = type;
rerr.flags = tvb_get_guint8(tvb, 1);
rerr.dest_count = tvb_get_guint8(tvb, 3);
-
+
if (tree) {
proto_tree_add_boolean(aodv_flags_tree, hf_aodv_flags_rerr_nodelete, tvb, 1, 1, rerr.flags);
if (rerr.flags & RERR_NODEL)
proto_item_append_text(tj, " N");
proto_tree_add_uint(aodv_tree, hf_aodv_destcount, tvb, 3, 1, rerr.dest_count);
tk = proto_tree_add_text(aodv_tree, tvb, 4, 8*rerr.dest_count, "Unreachable Destinations:");
-
+
aodv_unreach_dest_tree = proto_item_add_subtree(tk, ett_aodv_unreach_dest);
for (i = 0; i < rerr.dest_count; i++) {
tvb_memcpy(tvb, (guint8 *)&rerr.dest_addr, 4+8*i, 4);
@@ -258,9 +258,9 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s, Dest Count=%u",
- val_to_str(type, type_vals,
- "Unknown AODV Packet Type (%u)"),
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s, Dest Count=%u",
+ val_to_str(type, type_vals,
+ "Unknown AODV Packet Type (%u)"),
rerr.dest_count);
break;
default:
@@ -276,101 +276,101 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Register the protocol with Ethereal */
void
proto_register_aodv(void)
-{
+{
static hf_register_info hf[] = {
{ &hf_aodv_type,
{ "Type", "aodv.type",
- FT_UINT8, BASE_DEC, VALS(type_vals), 0x0,
+ FT_UINT8, BASE_DEC, VALS(type_vals), 0x0,
"AODV packet type", HFILL }
},
{ &hf_aodv_flags,
{ "Flags", "aodv.flags",
- FT_UINT16, BASE_DEC, NULL, 0x0,
+ FT_UINT16, BASE_DEC, NULL, 0x0,
"Flags", HFILL }
},
{ &hf_aodv_flags_rreq_join,
{ "RREQ Join", "aodv.flags.rreq_join",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_JOIN,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_JOIN,
"", HFILL }
},
{ &hf_aodv_flags_rreq_repair,
{ "RREQ Repair", "aodv.flags.rreq_repair",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_REP,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_REP,
"", HFILL }
},
{ &hf_aodv_flags_rreq_gratuitous,
{ "RREQ Gratuitous", "aodv.flags.rreq_gratuitous",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_GRAT,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_GRAT,
"", HFILL }
},
{ &hf_aodv_flags_rrep_repair,
{ "RREP Repair", "aodv.flags.rrep_repair",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), RREP_REP,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), RREP_REP,
"", HFILL }
},
{ &hf_aodv_flags_rrep_ack,
{ "RREP Acknowledgement", "aodv.flags.rrep_ack",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), RREP_ACK,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), RREP_ACK,
"", HFILL }
},
{ &hf_aodv_flags_rerr_nodelete,
{ "RERR No Delete", "aodv.flags.rerr_nodelete",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), RERR_NODEL,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), RERR_NODEL,
"", HFILL }
},
{ &hf_aodv_prefix_sz,
{ "Prefix Size", "aodv.prefix_sz",
- FT_UINT8, BASE_DEC, NULL, 0x0,
+ FT_UINT8, BASE_DEC, NULL, 0x0,
"Prefix_size", HFILL }
},
{ &hf_aodv_hopcount,
{ "Hop Count", "aodv.hopcount",
- FT_UINT8, BASE_DEC, NULL, 0x0,
+ FT_UINT8, BASE_DEC, NULL, 0x0,
"Hop Count", HFILL }
},
{ &hf_aodv_rreq_id,
{ "RREQ Id", "aodv.rreq_id",
- FT_UINT32, BASE_DEC, NULL, 0x0,
+ FT_UINT32, BASE_DEC, NULL, 0x0,
"RREQ Id", HFILL }
},
{ &hf_aodv_dest_ip,
{ "Destination IP", "aodv.dest_ip",
- FT_IPv4, BASE_DEC, NULL, 0x0,
+ FT_IPv4, BASE_DEC, NULL, 0x0,
"Destination IP Address", HFILL }
},
{ &hf_aodv_dest_seqno,
{ "Destination Sequence Number", "aodv.dest_seqno",
- FT_UINT32, BASE_DEC, NULL, 0x0,
+ FT_UINT32, BASE_DEC, NULL, 0x0,
"Destination Sequence Number", HFILL }
},
{ &hf_aodv_orig_ip,
{ "Originator IP", "aodv.orig_ip",
- FT_IPv4, BASE_DEC, NULL, 0x0,
+ FT_IPv4, BASE_DEC, NULL, 0x0,
"Originator IP Address", HFILL }
},
{ &hf_aodv_orig_seqno,
{ "Originator Sequence Number", "aodv.orig_seqno",
- FT_UINT32, BASE_DEC, NULL, 0x0,
+ FT_UINT32, BASE_DEC, NULL, 0x0,
"Originator Sequence Number", HFILL }
},
{ &hf_aodv_lifetime,
{ "Lifetime", "aodv.lifetime",
- FT_UINT32, BASE_DEC, NULL, 0x0,
+ FT_UINT32, BASE_DEC, NULL, 0x0,
"Lifetime", HFILL }
},
{ &hf_aodv_destcount,
{ "Destination Count", "aodv.destcount",
- FT_UINT8, BASE_DEC, NULL, 0x0,
+ FT_UINT8, BASE_DEC, NULL, 0x0,
"Unreachable Destinations Count", HFILL }
},
{ &hf_aodv_unreach_dest_ip,
{ "Unreachable Destination IP", "aodv.unreach_dest_ip",
- FT_IPv4, BASE_DEC, NULL, 0x0,
+ FT_IPv4, BASE_DEC, NULL, 0x0,
"Unreachable Destination IP Address", HFILL }
},
{ &hf_aodv_unreach_dest_seqno,
{ "Unreachable Destination Sequence Number", "aodv.unreach_dest_seqno",
- FT_UINT32, BASE_DEC, NULL, 0x0,
+ FT_UINT32, BASE_DEC, NULL, 0x0,
"Unreachable Destination Sequence Number", HFILL }
},
};
diff --git a/packet-aodv6.c b/packet-aodv6.c
index 6f8f399..0698f1f 100644
--- a/packet-aodv6.c
+++ b/packet-aodv6.c
@@ -3,7 +3,7 @@
* Copyright 2002, Antti J. Tuominen <ajtuomin@tml.hut.fi>
* Loosely based on packet-aodv.c.
*
- * $Id: packet-aodv6.c,v 1.4 2002/08/22 07:32:22 guy Exp $
+ * $Id: packet-aodv6.c,v 1.5 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -13,12 +13,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -235,7 +235,7 @@ dissect_aodv6(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
rerr_t rerr;
/* Make entries in Protocol column and Info column on summary
- * display
+ * display
*/
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AODV6");
diff --git a/packet-arp.c b/packet-arp.c
index 20139cb..2093764 100644
--- a/packet-arp.c
+++ b/packet-arp.c
@@ -1,22 +1,22 @@
/* packet-arp.c
* Routines for ARP packet disassembly
*
- * $Id: packet-arp.c,v 1.52 2002/08/02 23:35:47 jmayer Exp $
+ * $Id: packet-arp.c,v 1.53 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -446,7 +446,7 @@ dissect_atmarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tot_len = MIN_ATMARP_HEADER_SIZE + ar_shl + ar_ssl + ar_spln +
ar_thl + ar_tsl + ar_tpln;
-
+
/* Adjust the length of this tvbuff to include only the ARP datagram.
Our caller may use that to determine how much of its packet
was padding. */
@@ -558,7 +558,7 @@ dissect_atmarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tree) {
if ((op_str = match_strval(ar_op, atmop_vals)))
ti = proto_tree_add_protocol_format(tree, proto_arp, tvb, 0, tot_len,
- "ATM Address Resolution Protocol (%s)",
+ "ATM Address Resolution Protocol (%s)",
op_str);
else
ti = proto_tree_add_protocol_format(tree, proto_arp, tvb, 0, tot_len,
@@ -691,7 +691,7 @@ dissect_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ar_op = tvb_get_ntohs(tvb, AR_OP);
tot_len = MIN_ARP_HEADER_SIZE + ar_hln*2 + ar_pln*2;
-
+
/* Adjust the length of this tvbuff to include only the ARP datagram.
Our caller may use that to determine how much of its packet
was padding. */
@@ -702,7 +702,7 @@ dissect_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
spa_offset = sha_offset + ar_hln;
tha_offset = spa_offset + ar_pln;
tpa_offset = tha_offset + ar_hln;
-
+
if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
switch (ar_op) {
@@ -772,7 +772,7 @@ dissect_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb_memcpy(tvb, (guint8 *)&ip, spa_offset, sizeof(ip));
add_ether_byip(ip, tvb_get_ptr(tvb, sha_offset, 6));
-
+
if (ar_op == ARPOP_REQUEST) {
/* Add target address *if* the target MAC address isn't a
broadcast address. */
@@ -828,7 +828,7 @@ proto_register_arp(void)
static hf_register_info hf[] = {
{ &hf_arp_hard_type,
- { "Hardware type", "arp.hw.type",
+ { "Hardware type", "arp.hw.type",
FT_UINT16, BASE_HEX, VALS(hrd_vals), 0x0,
"", HFILL }},
diff --git a/packet-arp.h b/packet-arp.h
index 6e93f52..b20bb48 100644
--- a/packet-arp.h
+++ b/packet-arp.h
@@ -2,23 +2,23 @@
* Definitions of routines for ARP packet disassembly that are used
* elsewhere
*
- * $Id: packet-arp.h,v 1.5 2001/03/13 21:34:23 gram Exp $
+ * $Id: packet-arp.h,v 1.6 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/packet-asap.c b/packet-asap.c
index e6b2f0e..efc5663 100644
--- a/packet-asap.c
+++ b/packet-asap.c
@@ -6,24 +6,24 @@
*
* Copyright 2002, Michael Tuexen <Michael.Tuexen@icn.siemens.de>
*
- * $Id: packet-asap.c,v 1.4 2002/07/08 21:09:32 guy Exp $
+ * $Id: packet-asap.c,v 1.5 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -80,7 +80,7 @@ dissect_parameters(tvbuff_t *, proto_tree *);
/* Helper functions */
-static guint
+static guint
nr_of_padding_bytes (guint length)
{
guint remainder;
@@ -112,7 +112,7 @@ dissect_unknown_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, proto_item *c
length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET);
cause_info_length = length - CAUSE_HEADER_LENGTH;
if (cause_info_length > 0)
- proto_tree_add_bytes(cause_tree, hf_cause_info, cause_tvb, CAUSE_INFO_OFFSET, cause_info_length,
+ proto_tree_add_bytes(cause_tree, hf_cause_info, cause_tvb, CAUSE_INFO_OFFSET, cause_info_length,
tvb_get_ptr(cause_tvb, CAUSE_INFO_OFFSET, cause_info_length));
proto_item_set_text(cause_item, "Error cause with code %u and %u byte%s information", code, cause_info_length, plurality(cause_info_length, "", "s"));
}
@@ -147,10 +147,10 @@ dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *parameter_tree)
cause_item = proto_tree_add_text(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, total_length, "BAD ERROR CAUSE");
cause_tree = proto_item_add_subtree(cause_item, ett_asap_cause);
-
+
proto_tree_add_uint(cause_tree, hf_cause_code, cause_tvb, CAUSE_CODE_OFFSET, CAUSE_CODE_LENGTH, code);
proto_tree_add_uint(cause_tree, hf_cause_length, cause_tvb, CAUSE_LENGTH_OFFSET, CAUSE_LENGTH_LENGTH, length);
-
+
switch(code) {
default:
dissect_unknown_cause(cause_tvb, cause_tree, cause_item);
@@ -174,7 +174,7 @@ dissect_error_causes(tvbuff_t *error_causes_tvb, proto_tree *parameter_tree)
padding_length = nr_of_padding_bytes(length);
total_length = length + padding_length;
error_cause_tvb = tvb_new_subset(error_causes_tvb, offset , total_length, total_length);
- dissect_error_cause(error_cause_tvb, parameter_tree);
+ dissect_error_cause(error_cause_tvb, parameter_tree);
offset += total_length;
}
}
@@ -198,8 +198,8 @@ dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot
{
guint32 ipv4_address;
- tvb_memcpy(parameter_tvb, (guint8 *)&ipv4_address, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH);
- proto_tree_add_ipv4(parameter_tree, hf_parameter_ipv4_address, parameter_tvb, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH, ipv4_address);
+ tvb_memcpy(parameter_tvb, (guint8 *)&ipv4_address, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH);
+ proto_tree_add_ipv4(parameter_tree, hf_parameter_ipv4_address, parameter_tvb, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH, ipv4_address);
proto_item_set_text(parameter_item, "IPV4 address parameter: %s", ip_to_str((const guint8 *)&ipv4_address));
}
@@ -210,11 +210,11 @@ static void
dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{
guint8 *ip6_address_ptr;
-
+
ip6_address_ptr = (guint8 *)tvb_get_ptr(parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH);
proto_tree_add_ipv6(parameter_tree, hf_parameter_ipv6_address, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH,
(const guint8 *)ip6_address_ptr);
-
+
proto_item_set_text(parameter_item, "IPV6 address parameter: %s", ip6_to_str((struct e_in6_addr *)ip6_address_ptr));
}
@@ -226,20 +226,20 @@ dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot
static void
dissect_sctp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{
+{
tvbuff_t *parameters_tvb;
guint16 port, reserved;
-
+
port = tvb_get_ntohs(parameter_tvb, SCTP_PORT_OFFSET);
reserved = tvb_get_ntohs(parameter_tvb, SCTP_RESERVED_OFFSET);
-
+
proto_tree_add_uint(parameter_tree, hf_sctp_port, parameter_tvb, SCTP_PORT_OFFSET, SCTP_PORT_LENGTH, port);
proto_tree_add_uint(parameter_tree, hf_sctp_reserved, parameter_tvb, SCTP_RESERVED_OFFSET, SCTP_RESERVED_LENGTH, reserved);
-
+
proto_item_set_text(parameter_item, "SCTP transport parameter");
parameters_tvb = tvb_new_subset(parameter_tvb, SCTP_ADDRESS_OFFSET, -1, -1);
- dissect_parameters(parameters_tvb, parameter_tree);
+ dissect_parameters(parameters_tvb, parameter_tree);
}
#define TCP_PORT_LENGTH 2
@@ -250,20 +250,20 @@ dissect_sctp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_
static void
dissect_tcp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{
+{
tvbuff_t *parameters_tvb;
guint16 port, reserved;
-
+
port = tvb_get_ntohs(parameter_tvb, TCP_PORT_OFFSET);
reserved = tvb_get_ntohs(parameter_tvb, TCP_RESERVED_OFFSET);
-
+
proto_tree_add_uint(parameter_tree, hf_tcp_port, parameter_tvb, TCP_PORT_OFFSET, TCP_PORT_LENGTH, port);
proto_tree_add_uint(parameter_tree, hf_tcp_reserved, parameter_tvb, TCP_RESERVED_OFFSET, TCP_RESERVED_LENGTH, reserved);
-
+
proto_item_set_text(parameter_item, "TCP transport parameter");
parameters_tvb = tvb_new_subset(parameter_tvb, TCP_ADDRESS_OFFSET, -1, -1);
- dissect_parameters(parameters_tvb, parameter_tree);
+ dissect_parameters(parameters_tvb, parameter_tree);
}
#define UDP_PORT_LENGTH 2
@@ -274,20 +274,20 @@ dissect_tcp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_t
static void
dissect_udp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{
+{
tvbuff_t *parameters_tvb;
guint16 port, reserved;
-
+
port = tvb_get_ntohs(parameter_tvb, UDP_PORT_OFFSET);
reserved = tvb_get_ntohs(parameter_tvb, UDP_RESERVED_OFFSET);
-
+
proto_tree_add_uint(parameter_tree, hf_udp_port, parameter_tvb, UDP_PORT_OFFSET, UDP_PORT_LENGTH, port);
proto_tree_add_uint(parameter_tree, hf_udp_reserved, parameter_tvb, UDP_RESERVED_OFFSET, UDP_RESERVED_LENGTH, reserved);
-
+
proto_item_set_text(parameter_item, "UDP transport parameter");
parameters_tvb = tvb_new_subset(parameter_tvb, UDP_ADDRESS_OFFSET, -1, -1);
- dissect_parameters(parameters_tvb, parameter_tree);
+ dissect_parameters(parameters_tvb, parameter_tree);
}
#define POLICY_TYPE_LENGTH 1
@@ -310,10 +310,10 @@ static const value_string policy_type_values[] = {
static void
dissect_pool_member_selection_policy_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{
+{
guint8 policy_type;
gint32 policy_value;
-
+
policy_type = tvb_get_guint8(parameter_tvb, POLICY_TYPE_OFFSET);
policy_value = tvb_get_ntoh24(parameter_tvb, POLICY_VALUE_OFFSET);
proto_tree_add_uint(parameter_tree, hf_policy_type, parameter_tvb, POLICY_TYPE_OFFSET, POLICY_TYPE_LENGTH, policy_type);
@@ -332,7 +332,7 @@ dissect_pool_handle_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre
char *handle_ptr;
length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
-
+
handle_length = length - PARAMETER_HEADER_LENGTH;
handle_ptr = (char *)tvb_get_ptr(parameter_tvb, POOL_HANDLE_OFFSET, handle_length);
proto_tree_add_bytes(parameter_tree, hf_pool_handle, parameter_tvb, POOL_HANDLE_OFFSET, handle_length, handle_ptr);
@@ -354,17 +354,17 @@ dissect_pool_element_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tr
tvbuff_t *parameters_tvb;
guint32 pe_identifier, home_enrp_identifier;
gint32 reg_life;
-
+
pe_identifier = tvb_get_ntohl(parameter_tvb, PE_PE_IDENTIFIER_OFFSET);
home_enrp_identifier = tvb_get_ntohl(parameter_tvb, HOME_ENRP_INDENTIFIER_OFFSET);
reg_life = tvb_get_ntohl(parameter_tvb, REGISTRATION_LIFE_OFFSET);
-
+
proto_tree_add_uint(parameter_tree, hf_pe_pe_identifier, parameter_tvb, PE_PE_IDENTIFIER_OFFSET, PE_PE_IDENTIFIER_LENGTH, pe_identifier);
proto_tree_add_uint(parameter_tree, hf_home_enrp_id, parameter_tvb, HOME_ENRP_INDENTIFIER_OFFSET, HOME_ENRP_INDENTIFIER_LENGTH, home_enrp_identifier);
proto_tree_add_int(parameter_tree, hf_reg_life, parameter_tvb, REGISTRATION_LIFE_OFFSET, REGISTRATION_LIFE_LENGTH, reg_life);
parameters_tvb = tvb_new_subset(parameter_tvb, USER_TRANSPORT_PARAMETER_OFFSET, -1, -1);
- dissect_parameters(parameters_tvb, parameter_tree);
+ dissect_parameters(parameters_tvb, parameter_tree);
proto_item_set_text(parameter_item, "Pool element");
}
@@ -381,28 +381,28 @@ dissect_pool_element_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tr
static void
dissect_server_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{
+{
tvbuff_t *parameters_tvb;
guint32 server_identifier, reserved;
server_identifier = tvb_get_ntohl(parameter_tvb, SERVER_ID_OFFSET);
reserved = tvb_get_ntohl(parameter_tvb, RESERVED_OFFSET);
-
+
proto_tree_add_uint(parameter_tree, hf_server_identifier, parameter_tvb, SERVER_ID_OFFSET, SERVER_ID_LENGTH, server_identifier);
proto_tree_add_boolean(parameter_tree, hf_m_bit, parameter_tvb, RESERVED_OFFSET, RESERVED_LENGTH, reserved);
proto_tree_add_uint(parameter_tree, hf_reserved, parameter_tvb, RESERVED_OFFSET, RESERVED_LENGTH, reserved);
-
+
proto_item_set_text(parameter_item, "Server information");
parameters_tvb = tvb_new_subset(parameter_tvb, SERVER_TRANSPORT_OFFSET, -1, -1);
- dissect_parameters(parameters_tvb, parameter_tree);
+ dissect_parameters(parameters_tvb, parameter_tree);
}
#define ERROR_CAUSES_OFFSET PARAMETER_VALUE_OFFSET
static void
dissect_operation_error_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{
+{
tvbuff_t *error_causes_tvb;
error_causes_tvb = tvb_new_subset(parameter_tvb, ERROR_CAUSES_OFFSET, -1,-1);
@@ -414,12 +414,12 @@ dissect_operation_error_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter
static void
dissect_cookie_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{
+{
guint16 cookie_length;
-
+
cookie_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
if (cookie_length > 0)
- proto_tree_add_bytes(parameter_tree, hf_cookie, parameter_tvb, COOKIE_OFFSET, cookie_length,
+ proto_tree_add_bytes(parameter_tree, hf_cookie, parameter_tvb, COOKIE_OFFSET, cookie_length,
tvb_get_ptr(parameter_tvb, COOKIE_OFFSET, cookie_length));
proto_item_set_text(parameter_item, "Cookie (%u byte%s)", cookie_length, plurality(cookie_length, "", "s"));
}
@@ -429,9 +429,9 @@ dissect_cookie_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, pr
static void
dissect_pe_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{
+{
guint32 pe_identifer;
-
+
pe_identifer = tvb_get_ntohl(parameter_tvb, PE_IDENTIFIER_OFFSET);
proto_tree_add_uint(parameter_tree, hf_pe_identifier, parameter_tvb, PE_IDENTIFIER_OFFSET, PE_IDENTIFIER_LENGTH, pe_identifer);
proto_item_set_text(parameter_item, "PE identifier: 0x%x", pe_identifer);
@@ -441,14 +441,14 @@ static void
dissect_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{
guint16 type, length, parameter_value_length;
-
+
type = tvb_get_ntohs(parameter_tvb, PARAMETER_TYPE_OFFSET);
length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
-
+
parameter_value_length = length - PARAMETER_HEADER_LENGTH;
if (parameter_value_length > 0)
- proto_tree_add_bytes(parameter_tree, hf_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length,
+ proto_tree_add_bytes(parameter_tree, hf_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length,
tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length));
proto_item_set_text(parameter_item, "Parameter with type %u and %u byte%s value", type, parameter_value_length, plurality(parameter_value_length, "", "s"));
@@ -548,7 +548,7 @@ dissect_asap_parameter(tvbuff_t *parameter_tvb, proto_tree *asap_tree)
};
if (padding_length > 0)
- proto_tree_add_bytes(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length,
+ proto_tree_add_bytes(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length,
tvb_get_ptr(parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length));
}
@@ -568,7 +568,7 @@ dissect_parameters(tvbuff_t *parameters_tvb, proto_tree *tree)
total_length = length + padding_length;
/* create a tvb for the parameter including the padding bytes */
parameter_tvb = tvb_new_subset(parameters_tvb, offset, total_length, total_length);
- dissect_asap_parameter(parameter_tvb, tree);
+ dissect_asap_parameter(parameter_tvb, tree);
/* get rid of the handled parameter */
offset += total_length;
}
@@ -621,7 +621,7 @@ dissect_asap_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *asap
tvbuff_t *parameters_tvb;
guint8 type, flags;
guint16 length;
-
+
type = tvb_get_guint8(message_tvb, MESSAGE_TYPE_OFFSET);
flags = tvb_get_guint8(message_tvb, MESSAGE_FLAGS_OFFSET);
length = tvb_get_ntohs (message_tvb, MESSAGE_LENGTH_OFFSET);
@@ -633,9 +633,9 @@ dissect_asap_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *asap
if (asap_tree) {
proto_tree_add_uint(asap_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, type);
proto_tree_add_uint(asap_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, flags);
- proto_tree_add_uint(asap_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, length);
+ proto_tree_add_uint(asap_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, length);
parameters_tvb = tvb_new_subset(message_tvb, MESSAGE_VALUE_OFFSET, -1, -1);
- dissect_parameters(parameters_tvb, asap_tree);
+ dissect_parameters(parameters_tvb, asap_tree);
}
}
@@ -646,9 +646,9 @@ dissect_asap(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
proto_tree *asap_tree;
/* make entry in the Protocol column on summary display */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ASAP");
-
+
/* In the interest of speed, if "tree" is NULL, don't do any work not
necessary to generate protocol tree items. */
if (tree) {
@@ -678,7 +678,7 @@ proto_register_asap(void)
{ "Flags", "asap.message_flags",
FT_UINT8, BASE_HEX, NULL, 0x0,
"", HFILL }
- },
+ },
{ &hf_message_length,
{ "Length", "asap.message_length",
FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -738,7 +738,7 @@ proto_register_asap(void)
{ "Port", "asap.sctp_transport.port",
FT_UINT16, BASE_DEC, NULL, 0x0,
"", HFILL }
- },
+ },
{ &hf_sctp_reserved,
{ "Reserved", "asap.sctp_transport.reserved",
FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -778,7 +778,7 @@ proto_register_asap(void)
{ "Pool handle", "asap.pool_handle.pool_handle",
FT_BYTES, BASE_HEX, NULL, 0x0,
"", HFILL }
- },
+ },
{ &hf_pe_pe_identifier,
{ "PE identifier", "asap.pool_element.pe_identifier",
FT_UINT32, BASE_HEX, NULL, 0x0,
@@ -788,7 +788,7 @@ proto_register_asap(void)
{ "Home ENRP server identifier", "asap.pool_element.home_enrp_server_identifier",
FT_UINT32, BASE_HEX, NULL, 0x0,
"", HFILL }
- },
+ },
{ &hf_reg_life,
{ "Registration life", "asap.pool_element.registration_life",
FT_INT32, BASE_DEC, NULL, 0x0,
@@ -820,14 +820,14 @@ proto_register_asap(void)
"", HFILL }
},
};
-
+
/* Setup protocol subtree array */
static gint *ett[] = {
&ett_asap,
&ett_asap_parameter,
&ett_asap_cause,
};
-
+
/* Register the protocol name and description */
proto_asap = proto_register_protocol("Aggregate Server Access Protocol", "ASAP", "asap");
@@ -841,7 +841,7 @@ void
proto_reg_handoff_asap(void)
{
dissector_handle_t asap_handle;
-
+
asap_handle = create_dissector_handle(dissect_asap, proto_asap);
dissector_add("sctp.ppi", ASAP_PAYLOAD_PROTO_ID, asap_handle);
}
diff --git a/packet-ascend.c b/packet-ascend.c
index 700ba90..56d4412 100644
--- a/packet-ascend.c
+++ b/packet-ascend.c
@@ -1,7 +1,7 @@
/* packet-ascend.c
* Routines for decoding Lucent/Ascend packet traces
*
- * $Id: packet-ascend.c,v 1.31 2002/08/02 23:35:47 jmayer Exp $
+ * $Id: packet-ascend.c,v 1.32 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -10,12 +10,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -84,16 +84,16 @@ dissect_ascend(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ti = proto_tree_add_protocol_format(tree, proto_ascend, tvb, 0, 0,
"Lucent/Ascend packet trace");
fh_tree = proto_item_add_subtree(ti, ett_raw);
- proto_tree_add_uint(fh_tree, hf_link_type, tvb, 0, 0,
+ proto_tree_add_uint(fh_tree, hf_link_type, tvb, 0, 0,
pseudo_header->ascend.type);
if (pseudo_header->ascend.type == ASCEND_PFX_WDD) {
- proto_tree_add_string(fh_tree, hf_called_number, tvb, 0, 0,
+ proto_tree_add_string(fh_tree, hf_called_number, tvb, 0, 0,
pseudo_header->ascend.call_num);
proto_tree_add_uint(fh_tree, hf_chunk, tvb, 0, 0,
pseudo_header->ascend.chunk);
proto_tree_add_uint_hidden(fh_tree, hf_session_id, tvb, 0, 0, 0);
} else { /* It's wandsession data */
- proto_tree_add_string(fh_tree, hf_user_name, tvb, 0, 0,
+ proto_tree_add_string(fh_tree, hf_user_name, tvb, 0, 0,
pseudo_header->ascend.user);
proto_tree_add_uint(fh_tree, hf_session_id, tvb, 0, 0,
pseudo_header->ascend.sess);
diff --git a/packet-atalk.c b/packet-atalk.c
index 0410572..bb7f103 100644
--- a/packet-atalk.c
+++ b/packet-atalk.c
@@ -2,7 +2,7 @@
* Routines for AppleTalk packet disassembly: LLAP, DDP, NBP, ATP, ASP,
* RTMP.
*
- * $Id: packet-atalk.c,v 1.80 2002/08/02 23:35:47 jmayer Exp $
+ * $Id: packet-atalk.c,v 1.81 2002/08/28 21:00:07 jmayer Exp $
*
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
*
@@ -14,12 +14,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -80,10 +80,10 @@ static int hf_ddp_type = -1;
#define ATP_MAXDATA (578+4) /* maximum ATP data size */
#define ATP_BUFSIZ 587 /* maximum packet size */
#define ATP_HDRSIZE 5 /* includes DDP type field */
-
+
#define ATP_TRELMASK 0x07 /* mask all but TREL */
#define ATP_RELTIME 30 /* base release timer (in secs) */
-
+
#define ATP_TREL30 0x0 /* release time codes */
#define ATP_TREL1M 0x1 /* these are passed in flags of */
#define ATP_TREL2M 0x2 /* atp_sreq call, and set in the */
@@ -95,16 +95,16 @@ static int hf_ddp_type = -1;
#define ATP_XO 0x20 /* (1<<5) eXactly Once mode */
#define ATP_EOM 0x10 /* (1<<4) End Of Message */
#define ATP_STS 0x08 /* (1<<3) Transaction Status */
-
+
/* function codes
*/
#define ATP_FUNCMASK (3<<6) /* mask all but function */
-
+
#define ATP_TREQ 1 /* (1<<6) Trans. REQuest */
#define ATP_TRESP 2 /* (2<<6) Trans. RESPonse */
#define ATP_TREL 3 /* (3<<6) Trans. RELease */
-/* ------------------------- */
+/* ------------------------- */
static dissector_handle_t asp_handle;
static int proto_atp = -1;
@@ -127,7 +127,7 @@ static int hf_atp_segment_multiple_tails = -1;
static int hf_atp_segment_too_long_segment = -1;
static int hf_atp_segment_error = -1;
-/* ------------------------- */
+/* ------------------------- */
static int proto_zip = -1;
static dissector_handle_t zip_atp_handle;
@@ -181,7 +181,7 @@ static gint ett_zip_network_list = -1;
/* --------------------------------
* from netatalk/include/atalk/ats.h
*/
-
+
#define ASPFUNC_CLOSE 1
#define ASPFUNC_CMD 2
#define ASPFUNC_STAT 3
@@ -191,7 +191,7 @@ static gint ett_zip_network_list = -1;
#define ASPFUNC_WRTCONT 7
#define ASPFUNC_ATTN 8
-#define ASP_HDRSIZ 4
+#define ASP_HDRSIZ 4
#define ASPERR_OK 0x0000
#define ASPERR_BADVERS 0xfbd6
#define ASPERR_BUFSMALL 0xfbd5
@@ -256,11 +256,11 @@ typedef struct {
guint8 src[4];
guint16 seq;
} asp_request_key;
-
+
typedef struct {
guint8 value; /* command for asp, bitmap for atp */
} asp_request_val;
-
+
static GHashTable *asp_request_hash = NULL;
static GMemChunk *asp_request_keys = NULL;
static GMemChunk *asp_request_vals = NULL;
@@ -495,7 +495,7 @@ static int dissect_pascal_string(tvbuff_t *tvb, int offset, proto_tree *tree,
int hf_index)
{
int len;
-
+
len = tvb_get_guint8(tvb, offset);
offset++;
@@ -504,7 +504,7 @@ static int dissect_pascal_string(tvbuff_t *tvb, int offset, proto_tree *tree,
char *tmp;
proto_tree *item;
proto_tree *subtree;
-
+
/*
* XXX - if we could do this inside the protocol tree
* code, we could perhaps avoid allocating and freeing
@@ -518,12 +518,12 @@ static int dissect_pascal_string(tvbuff_t *tvb, int offset, proto_tree *tree,
subtree = proto_item_add_subtree(item, ett_pstring);
proto_tree_add_text(subtree, tvb, offset-1, 1, "Length: %d", len);
proto_tree_add_text(subtree, tvb, offset, len, "Data: %s", tmp);
-
+
g_free(tmp);
}
offset += len;
-
- return offset;
+
+ return offset;
}
static void
@@ -542,7 +542,7 @@ dissect_rtmp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
if (check_col(pinfo->cinfo, COL_INFO))
col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
val_to_str(function, rtmp_function_vals, "Unknown function (%02x)"));
-
+
if (tree) {
ti = proto_tree_add_item(tree, proto_rtmp, tvb, 0, 1, FALSE);
rtmp_tree = proto_item_add_subtree(ti, ett_rtmp);
@@ -575,11 +575,11 @@ dissect_rtmp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
node = tvb_get_ntohs(tvb, offset);
nodelen = 2;
}
-
+
if (check_col(pinfo->cinfo, COL_INFO))
col_add_fstr(pinfo->cinfo, COL_INFO, "Net: %u Node Len: %u Node: %u",
net, nodelen_bits, node);
-
+
if (tree) {
ti = proto_tree_add_item(tree, proto_rtmp, tvb, offset, -1, FALSE);
rtmp_tree = proto_item_add_subtree(ti, ett_rtmp);
@@ -614,10 +614,10 @@ dissect_rtmp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tuple_tree = proto_item_add_subtree(tuple_item, ett_rtmp_tuple);
if (tuple_dist & 0x80) {
- proto_tree_add_uint(tuple_tree, hf_rtmp_tuple_range_start, tvb, offset, 2,
+ proto_tree_add_uint(tuple_tree, hf_rtmp_tuple_range_start, tvb, offset, 2,
tuple_net);
} else {
- proto_tree_add_uint(tuple_tree, hf_rtmp_tuple_net, tvb, offset, 2,
+ proto_tree_add_uint(tuple_tree, hf_rtmp_tuple_net, tvb, offset, 2,
tuple_net);
}
proto_tree_add_uint(tuple_tree, hf_rtmp_tuple_dist, tvb, offset+2, 1,
@@ -627,7 +627,7 @@ dissect_rtmp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
/*
* Extended network tuple.
*/
- proto_tree_add_item(tuple_tree, hf_rtmp_tuple_range_end, tvb, offset+3, 2,
+ proto_tree_add_item(tuple_tree, hf_rtmp_tuple_range_end, tvb, offset+3, 2,
FALSE);
offset += 6;
} else
@@ -660,7 +660,7 @@ dissect_nbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
if (check_col(pinfo->cinfo, COL_INFO))
col_add_fstr(pinfo->cinfo, COL_INFO, "Op: %s Count: %u",
val_to_str(op, nbp_op_vals, "Unknown (0x%01x)"), count);
-
+
if (tree) {
ti = proto_tree_add_item(tree, proto_nbp, tvb, offset, -1, FALSE);
nbp_tree = proto_item_add_subtree(ti, ett_nbp);
@@ -680,7 +680,7 @@ dissect_nbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
proto_tree *node_item,*node_tree;
int soffset = offset;
- node_item = proto_tree_add_text(nbp_tree, tvb, offset, -1,
+ node_item = proto_tree_add_text(nbp_tree, tvb, offset, -1,
"Node %u", i+1);
node_tree = proto_item_add_subtree(node_item, ett_nbp_node);
@@ -704,7 +704,7 @@ dissect_nbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
return;
}
-/* -----------------------------
+/* -----------------------------
ATP protocol cf. inside appletalk chap. 9
desegmentation from packet-ieee80211.c
*/
@@ -778,25 +778,25 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
g_hash_table_insert(atp_request_hash, new_request_key,request_val);
}
- /*
+ /*
ATP_EOM is not mandatory. Some implementations don't always set it
if the query is only one packet.
-
+
So it needs to keep the number of packets asked in request.
- */
+ */
if (aspinfo.reply) {
more_fragment = !((ATP_EOM & ctrlinfo) || (request_val && 1 == request_val->value));
frag_number = bitmap;
}
-
+
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s transaction %u",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s transaction %u",
val_to_str(op, atp_function_vals, "Unknown (0x%01x)"),tid);
- if (more_fragment)
+ if (more_fragment)
col_append_fstr(pinfo->cinfo, COL_INFO, " [fragment]");
- }
+ }
if (tree) {
ti = proto_tree_add_item(tree, proto_atp, tvb, offset, -1, FALSE);
@@ -825,7 +825,7 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
if (aspinfo.release)
proto_tree_add_item(atp_tree, hf_atp_user_bytes, tvb, offset +4, 4, FALSE);
-
+
}
if (aspinfo.release)
@@ -833,14 +833,14 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
save_fragmented = pinfo->fragmented;
- /* FIXME
+ /* FIXME
asp doesn't fit very well here
move asp back in atp?
*/
if (atp_defragment && aspinfo.reply && (more_fragment || frag_number != 0)) {
fragment_data *fd_head;
int hdr;
-
+
hdr = ATP_HDRSIZE -1;
if (frag_number != 0)
hdr += 4; /* asp header */
@@ -862,7 +862,7 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
atp_tree, pinfo, new_tvb);
}
}
- else
+ else
new_tvb = tvb_new_subset(tvb, ATP_HDRSIZE -1, -1, -1);
}
else {
@@ -873,7 +873,7 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
/* full packet */
new_tvb = tvb_new_subset(tvb, ATP_HDRSIZE -1, -1,- 1);
}
-
+
if (new_tvb) {
pinfo->private_data = &aspinfo;
/* if port == 6 it's not an ASP packet but a ZIP packet */
@@ -892,9 +892,9 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
}
/*
- copy and paste from dsi
+ copy and paste from dsi
*/
-static gint
+static gint
dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset)
{
proto_tree *sub_tree;
@@ -911,7 +911,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
if (!tree)
return offset;
-
+
ti = proto_tree_add_text(tree, tvb, offset, -1, "Get Status");
tree = proto_item_add_subtree(ti, ett_asp_status);
@@ -967,7 +967,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
dir_ofs += offset;
}
}
-
+
ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_MACHOFF);
if (ofs)
proto_tree_add_item(tree, hf_asp_server_type, tvb, ofs, 1, FALSE);
@@ -984,7 +984,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
ofs += len;
}
}
-
+
ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_UAMSOFF);
if (ofs) {
nbe = tvb_get_guint8(tvb, ofs);
@@ -1013,7 +1013,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
guint16 net;
guint8 node;
guint16 port;
-
+
ofs = adr_ofs;
nbe = tvb_get_guint8(tvb, ofs);
ti = proto_tree_add_text(tree, tvb, ofs, 1, "Address list: %u", nbe);
@@ -1021,7 +1021,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
adr_tree = proto_item_add_subtree(ti, ett_asp_addr);
for (i = 0; i < nbe; i++) {
guint8 type;
-
+
len = tvb_get_guint8(tvb, ofs);
type = tvb_get_guint8(tvb, ofs +1);
switch (type) {
@@ -1036,9 +1036,9 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
break;
case 3: /* DDP, atalk_addr_to_str want host order not network */
net = tvb_get_ntohs(tvb, ofs+2);
- node = tvb_get_guint8(tvb, ofs +4);
+ node = tvb_get_guint8(tvb, ofs +4);
port = tvb_get_guint8(tvb, ofs +5);
- ti = proto_tree_add_text(adr_tree, tvb, ofs, len, "ddp %u.%u:%u",
+ ti = proto_tree_add_text(adr_tree, tvb, ofs, len, "ddp %u.%u:%u",
net, node, port);
break;
case 4: /* DNS */
@@ -1049,17 +1049,17 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
ti = proto_tree_add_text(adr_tree, tvb, ofs, len, "dns %s", tmp);
g_free(tmp);
break;
- }
+ }
/* else fall to default malformed record */
default:
ti = proto_tree_add_text(adr_tree, tvb, ofs, len,"Unknow type : %u", type);
break;
- }
+ }
len -= 2;
sub_tree = proto_item_add_subtree(ti,ett_asp_addr_line);
proto_tree_add_item(sub_tree, hf_asp_server_addr_len, tvb, ofs, 1, FALSE);
ofs++;
- proto_tree_add_item(sub_tree, hf_asp_server_addr_type, tvb, ofs, 1, FALSE);
+ proto_tree_add_item(sub_tree, hf_asp_server_addr_type, tvb, ofs, 1, FALSE);
ofs++;
proto_tree_add_item(sub_tree, hf_asp_server_addr_value,tvb, ofs, len, FALSE);
ofs += len;
@@ -1082,7 +1082,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
return offset;
}
-/* -----------------------------
+/* -----------------------------
ASP protocol cf. inside appletalk chap. 11
*/
static struct aspinfo *
@@ -1103,7 +1103,7 @@ get_transaction(tvbuff_t *tvb, packet_info *pinfo)
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
}
- request_key.conversation = conversation->index;
+ request_key.conversation = conversation->index;
memcpy(request_key.src, (!aspinfo->reply)?pinfo->src.data:pinfo->dst.data, 4);
request_key.seq = aspinfo->seq;
@@ -1121,7 +1121,7 @@ get_transaction(tvbuff_t *tvb, packet_info *pinfo)
request_val);
}
- if (!request_val)
+ if (!request_val)
return NULL;
aspinfo->command = request_val->value;
@@ -1129,8 +1129,8 @@ get_transaction(tvbuff_t *tvb, packet_info *pinfo)
}
-static void
-dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+static void
+dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
struct aspinfo *aspinfo;
int offset = 0;
@@ -1138,7 +1138,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_item *ti;
guint8 fn;
int len;
-
+
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ASP");
if (check_col(pinfo->cinfo, COL_INFO))
@@ -1174,7 +1174,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset++;
proto_tree_add_item(asp_tree, hf_asp_version, tvb, offset, 2, FALSE);
offset += 2;
- break;
+ break;
case ASPFUNC_TICKLE:
case ASPFUNC_CLOSE:
proto_tree_add_item(asp_tree, hf_asp_session_id, tvb, offset, 1, FALSE);
@@ -1187,7 +1187,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset++;
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 2, FALSE);
offset += 2;
- break;
+ break;
case ASPFUNC_ATTN:
proto_tree_add_item(asp_tree, hf_asp_session_id, tvb, offset, 1, FALSE);
offset++;
@@ -1203,7 +1203,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 2;
len = tvb_reported_length_remaining(tvb,offset);
new_tvb = tvb_new_subset(tvb, offset,-1,len);
- call_dissector(afp_handle, new_tvb, pinfo, tree);
+ call_dissector(afp_handle, new_tvb, pinfo, tree);
break;
case ASPFUNC_WRTCONT:
proto_tree_add_item(asp_tree, hf_asp_session_id, tvb, offset, 1, FALSE);
@@ -1217,7 +1217,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_item_set_len(asp_tree, 4);
offset += 3;
len = tvb_reported_length_remaining(tvb,offset);
- call_dissector(data_handle,tvb_new_subset(tvb, offset,-1,len), pinfo, tree);
+ call_dissector(data_handle,tvb_new_subset(tvb, offset,-1,len), pinfo, tree);
break;
}
}
@@ -1241,12 +1241,12 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset++;
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 2, FALSE);
offset += 2;
- break;
+ break;
case ASPFUNC_STAT:
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 4, FALSE);
offset += 4;
dissect_asp_reply_get_status(tvb, pinfo, asp_tree, offset);
- break;
+ break;
case ASPFUNC_CMD:
case ASPFUNC_WRITE:
proto_item_set_len(asp_tree, 4);
@@ -1255,7 +1255,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 4;
len = tvb_reported_length_remaining(tvb,offset);
new_tvb = tvb_new_subset(tvb, offset,-1,len);
- call_dissector(afp_handle, new_tvb, pinfo, tree);
+ call_dissector(afp_handle, new_tvb, pinfo, tree);
break;
case ASPFUNC_TICKLE:
case ASPFUNC_WRTCONT:
@@ -1266,17 +1266,17 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_item_set_len(asp_tree, 4);
offset += 4;
len = tvb_reported_length_remaining(tvb,offset);
- call_dissector(data_handle,tvb_new_subset(tvb, offset,-1,len), pinfo, tree);
+ call_dissector(data_handle,tvb_new_subset(tvb, offset,-1,len), pinfo, tree);
break;
}
}
}
-/* -----------------------------
+/* -----------------------------
ZIP protocol cf. inside appletalk chap. 8
*/
static void
-dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
struct aspinfo *aspinfo;
int offset = 0;
@@ -1286,7 +1286,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint8 fn;
guint16 count;
guint8 len;
-
+
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZIP");
if (check_col(pinfo->cinfo, COL_INFO))
@@ -1306,9 +1306,9 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
val_to_str(fn, zip_atp_function_vals, "Unknown (0x%01x)"), aspinfo->seq);
}
- if (!tree)
+ if (!tree)
return;
-
+
ti = proto_tree_add_item(tree, proto_zip, tvb, offset, -1, FALSE);
zip_tree = proto_item_add_subtree(ti, ett_zip);
@@ -1327,7 +1327,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
else {
guint8 i;
-
+
proto_tree_add_uint(zip_tree, hf_zip_atp_function, tvb, 0, 0, fn);
switch(fn) {
case 7:
@@ -1335,7 +1335,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 9:
proto_tree_add_item(zip_tree, hf_zip_last_flag, tvb, offset, 1, FALSE);
offset++;
-
+
proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 1, FALSE);
offset++;
count = tvb_get_ntohs(tvb, offset);
@@ -1353,7 +1353,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
static void
-dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *zip_tree = NULL;
proto_item *ti;
@@ -1367,7 +1367,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint16 net;
guint8 i;
guint8 count;
-
+
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZIP");
if (check_col(pinfo->cinfo, COL_INFO))
@@ -1379,9 +1379,9 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
val_to_str(fn, zip_function_vals, "Unknown ZIP function (%02x)"));
}
- if (!tree)
+ if (!tree)
return;
-
+
ti = proto_tree_add_item(tree, proto_zip, tvb, 0, -1, FALSE);
zip_tree = proto_item_add_subtree(ti, ett_zip);
@@ -1441,7 +1441,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += len +1;
}
break;
-
+
case 5 : /* GetNetInfo request */
proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 1, FALSE);
offset++;
@@ -1468,7 +1468,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
len = tvb_get_guint8(tvb, offset);
proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,FALSE);
offset += len +1;
-
+
len = tvb_get_guint8(tvb, offset);
proto_tree_add_item(zip_tree, hf_zip_multicast_length,tvb, offset, 1,FALSE);
offset++;
@@ -1516,7 +1516,7 @@ dissect_ddp_short(tvbuff_t *tvb, packet_info *pinfo, guint8 dnode,
if (tree)
proto_tree_add_uint(ddp_tree, hf_ddp_src_socket, tvb, 3, 1, sport);
type = tvb_get_guint8(tvb, 4);
-
+
src.net = 0;
src.node = snode;
dst.net = 0;
@@ -1529,19 +1529,19 @@ dissect_ddp_short(tvbuff_t *tvb, packet_info *pinfo, guint8 dnode,
pinfo->ptype = PT_DDP;
pinfo->destport = dport;
pinfo->srcport = sport;
-
+
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(type, op_vals, "Unknown DDP protocol (%02x)"));
}
if (tree) {
- proto_tree_add_string_hidden(ddp_tree, hf_ddp_src, tvb,
+ proto_tree_add_string_hidden(ddp_tree, hf_ddp_src, tvb,
4, 3, atalk_addr_to_str(&src));
- proto_tree_add_string_hidden(ddp_tree, hf_ddp_dst, tvb,
+ proto_tree_add_string_hidden(ddp_tree, hf_ddp_dst, tvb,
6, 3, atalk_addr_to_str(&dst));
proto_tree_add_uint(ddp_tree, hf_ddp_type, tvb, 4, 1, type);
- }
+ }
new_tvb = tvb_new_subset(tvb, DDP_SHORT_HEADER_SIZE, -1, -1);
if (!dissector_try_port(ddp_dissector_table, type, new_tvb, pinfo, tree))
@@ -1567,7 +1567,7 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ddp.snet=g_ntohs(ddp.snet);
ddp.sum=g_ntohs(ddp.sum);
ddp.hops_len=g_ntohs(ddp.hops_len);
-
+
src.net = ddp.snet;
src.node = ddp.snode;
dst.net = ddp.dnet;
@@ -1584,20 +1584,20 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (check_col(pinfo->cinfo, COL_INFO))
col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(ddp.type, op_vals, "Unknown DDP protocol (%02x)"));
-
+
if (tree) {
ti = proto_tree_add_item(tree, proto_ddp, tvb, 0, DDP_HEADER_SIZE,
FALSE);
ddp_tree = proto_item_add_subtree(ti, ett_ddp);
- proto_tree_add_string_hidden(ddp_tree, hf_ddp_src, tvb,
+ proto_tree_add_string_hidden(ddp_tree, hf_ddp_src, tvb,
4, 3, atalk_addr_to_str(&src));
- proto_tree_add_string_hidden(ddp_tree, hf_ddp_dst, tvb,
+ proto_tree_add_string_hidden(ddp_tree, hf_ddp_dst, tvb,
6, 3, atalk_addr_to_str(&dst));
proto_tree_add_uint(ddp_tree, hf_ddp_hopcount, tvb, 0, 1,
ddp_hops(ddp.hops_len));
- proto_tree_add_uint(ddp_tree, hf_ddp_len, tvb, 0, 2,
+ proto_tree_add_uint(ddp_tree, hf_ddp_len, tvb, 0, 2,
ddp_len(ddp.hops_len));
proto_tree_add_uint(ddp_tree, hf_ddp_checksum, tvb, 2, 2,
ddp.sum);
@@ -1614,7 +1614,7 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(ddp_tree, hf_ddp_src_socket, tvb, 11, 1,
ddp.sport);
proto_tree_add_uint(ddp_tree, hf_ddp_type, tvb, 12, 1,
- ddp.type);
+ ddp.type);
}
new_tvb = tvb_new_subset(tvb, DDP_HEADER_SIZE, -1, -1);
@@ -1660,7 +1660,7 @@ dissect_llap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
dnode = tvb_get_guint8(tvb, 0);
- if (tree)
+ if (tree)
proto_tree_add_uint(llap_tree, hf_llap_dst, tvb, 0, 1, dnode);
snode = tvb_get_guint8(tvb, 1);
if (tree)
@@ -1672,7 +1672,7 @@ dissect_llap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
if (tree)
proto_tree_add_uint(llap_tree, hf_llap_type, tvb, 2, 1, type);
-
+
new_tvb = tvb_new_subset(tvb, 3, -1, -1);
if (proto_is_protocol_enabled(proto_ddp)) {
@@ -1717,7 +1717,7 @@ atp_init(void)
G_ALLOC_AND_FREE);
}
-static void
+static void
asp_reinit( void)
{
@@ -1810,74 +1810,74 @@ proto_register_atalk(void)
static hf_register_info hf_nbp[] = {
{ &hf_nbp_op,
- { "Operation", "nbp.op", FT_UINT8, BASE_DEC,
+ { "Operation", "nbp.op", FT_UINT8, BASE_DEC,
VALS(nbp_op_vals), 0xF0, "Operation", HFILL }},
{ &hf_nbp_info,
- { "Info", "nbp.info", FT_UINT8, BASE_HEX,
+ { "Info", "nbp.info", FT_UINT8, BASE_HEX,
NULL, 0x0, "Info", HFILL }},
{ &hf_nbp_count,
- { "Count", "nbp.count", FT_UINT8, BASE_DEC,
+ { "Count", "nbp.count", FT_UINT8, BASE_DEC,
NULL, 0x0F, "Count", HFILL }},
{ &hf_nbp_node_net,
- { "Network", "nbp.net", FT_UINT16, BASE_DEC,
+ { "Network", "nbp.net", FT_UINT16, BASE_DEC,
NULL, 0x0, "Network", HFILL }},
{ &hf_nbp_node_node,
- { "Node", "nbp.node", FT_UINT8, BASE_DEC,
+ { "Node", "nbp.node", FT_UINT8, BASE_DEC,
NULL, 0x0, "Node", HFILL }},
{ &hf_nbp_node_port,
- { "Port", "nbp.port", FT_UINT8, BASE_DEC,
+ { "Port", "nbp.port", FT_UINT8, BASE_DEC,
NULL, 0x0, "Port", HFILL }},
{ &hf_nbp_node_enum,
- { "Enumerator", "nbp.enum", FT_UINT8, BASE_DEC,
+ { "Enumerator", "nbp.enum", FT_UINT8, BASE_DEC,
NULL, 0x0, "Enumerator", HFILL }},
{ &hf_nbp_node_object,
- { "Object", "nbp.object", FT_STRING, BASE_DEC,
+ { "Object", "nbp.object", FT_STRING, BASE_DEC,
NULL, 0x0, "Object", HFILL }},
{ &hf_nbp_node_type,
- { "Type", "nbp.type", FT_STRING, BASE_DEC,
+ { "Type", "nbp.type", FT_STRING, BASE_DEC,
NULL, 0x0, "Type", HFILL }},
{ &hf_nbp_node_zone,
- { "Zone", "nbp.zone", FT_STRING, BASE_DEC,
+ { "Zone", "nbp.zone", FT_STRING, BASE_DEC,
NULL, 0x0, "Zone", HFILL }},
{ &hf_nbp_tid,
- { "Transaction ID", "nbp.tid", FT_UINT8, BASE_DEC,
+ { "Transaction ID", "nbp.tid", FT_UINT8, BASE_DEC,
NULL, 0x0, "Transaction ID", HFILL }}
};
static hf_register_info hf_rtmp[] = {
{ &hf_rtmp_net,
- { "Net", "rtmp.net", FT_UINT16, BASE_DEC,
+ { "Net", "rtmp.net", FT_UINT16, BASE_DEC,
NULL, 0x0, "Net", HFILL }},
{ &hf_rtmp_node,
- { "Node", "nbp.nodeid", FT_UINT8, BASE_DEC,
+ { "Node", "nbp.nodeid", FT_UINT8, BASE_DEC,
NULL, 0x0, "Node", HFILL }},
{ &hf_rtmp_node_len,
- { "Node Length", "nbp.nodeid.length", FT_UINT8, BASE_DEC,
+ { "Node Length", "nbp.nodeid.length", FT_UINT8, BASE_DEC,
NULL, 0x0, "Node Length", HFILL }},
{ &hf_rtmp_tuple_net,
- { "Net", "rtmp.tuple.net", FT_UINT16, BASE_DEC,
+ { "Net", "rtmp.tuple.net", FT_UINT16, BASE_DEC,
NULL, 0x0, "Net", HFILL }},
{ &hf_rtmp_tuple_range_start,
- { "Range Start", "rtmp.tuple.range_start", FT_UINT16, BASE_DEC,
+ { "Range Start", "rtmp.tuple.range_start", FT_UINT16, BASE_DEC,
NULL, 0x0, "Range Start", HFILL }},
{ &hf_rtmp_tuple_range_end,
- { "Range End", "rtmp.tuple.range_end", FT_UINT16, BASE_DEC,
+ { "Range End", "rtmp.tuple.range_end", FT_UINT16, BASE_DEC,
NULL, 0x0, "Range End", HFILL }},
{ &hf_rtmp_tuple_dist,
- { "Distance", "rtmp.tuple.dist", FT_UINT16, BASE_DEC,
+ { "Distance", "rtmp.tuple.dist", FT_UINT16, BASE_DEC,
NULL, 0x0, "Distance", HFILL }},
{ &hf_rtmp_function,
- { "Function", "rtmp.function", FT_UINT8, BASE_DEC,
+ { "Function", "rtmp.function", FT_UINT8, BASE_DEC,
VALS(rtmp_function_vals), 0x0, "Request Function", HFILL }}
};
static hf_register_info hf_atp[] = {
{ &hf_atp_ctrlinfo,
- { "Control info", "atp.ctrlinfo", FT_UINT8, BASE_HEX,
+ { "Control info", "atp.ctrlinfo", FT_UINT8, BASE_HEX,
NULL, 0, "control info", HFILL }},
{ &hf_atp_function,
- { "Function", "atp.function", FT_UINT8, BASE_DEC,
+ { "Function", "atp.function", FT_UINT8, BASE_DEC,
VALS(atp_function_vals), ATP_FUNCMASK, "function code", HFILL }},
@@ -1898,14 +1898,14 @@ proto_register_atalk(void)
VALS(atp_trel_timer_vals), 0x07, "TRel timer", HFILL }},
{ &hf_atp_bitmap,
- { "Bitmap", "atp.bitmap", FT_UINT8, BASE_HEX,
+ { "Bitmap", "atp.bitmap", FT_UINT8, BASE_HEX,
NULL, 0x0, "Bitmap or sequence number", HFILL }},
{ &hf_atp_tid,
- { "TID", "atp.tid", FT_UINT16, BASE_DEC,
+ { "TID", "atp.tid", FT_UINT16, BASE_DEC,
NULL, 0x0, "Transaction id", HFILL }},
{ &hf_atp_user_bytes,
- { "User bytes", "atp.user_bytes", FT_UINT32, BASE_HEX,
+ { "User bytes", "atp.user_bytes", FT_UINT32, BASE_HEX,
NULL, 0x0, "User bytes", HFILL }},
{ &hf_atp_segment_overlap,
@@ -1941,39 +1941,39 @@ proto_register_atalk(void)
static hf_register_info hf_asp[] = {
{ &hf_asp_func,
- { "asp function", "asp.function", FT_UINT8, BASE_DEC,
+ { "asp function", "asp.function", FT_UINT8, BASE_DEC,
VALS(asp_func_vals), 0, "asp function", HFILL }},
{ &hf_asp_error,
- { "asp error", "asp.error", FT_INT32, BASE_DEC,
+ { "asp error", "asp.error", FT_INT32, BASE_DEC,
VALS(asp_error_vals), 0, "return error code", HFILL }},
{ &hf_asp_version,
- { "Version", "asp.version", FT_UINT16, BASE_HEX,
+ { "Version", "asp.version", FT_UINT16, BASE_HEX,
NULL, 0, "asp version", HFILL }},
{ &hf_asp_attn_code,
- { "Attn code", "asp.attn_code", FT_UINT16, BASE_HEX,
+ { "Attn code", "asp.attn_code", FT_UINT16, BASE_HEX,
NULL, 0, "asp attention code", HFILL }},
{ &hf_asp_init_error,
- { "Error", "asp.init_error", FT_UINT16, BASE_DEC,
+ { "Error", "asp.init_error", FT_UINT16, BASE_DEC,
NULL, 0, "asp init error", HFILL }},
{ &hf_asp_session_id,
- { "Session ID", "asp.session_id", FT_UINT8, BASE_DEC,
+ { "Session ID", "asp.session_id", FT_UINT8, BASE_DEC,
NULL, 0, "asp session id", HFILL }},
{ &hf_asp_socket,
- { "Socket", "asp.socket", FT_UINT8, BASE_DEC,
+ { "Socket", "asp.socket", FT_UINT8, BASE_DEC,
NULL, 0, "asp socket", HFILL }},
{ &hf_asp_seq,
- { "Sequence", "asp.seq", FT_UINT16, BASE_DEC,
+ { "Sequence", "asp.seq", FT_UINT16, BASE_DEC,
NULL, 0, "asp sequence number", HFILL }},
{ &hf_asp_size,
- { "size", "asp.size", FT_UINT16, BASE_DEC,
+ { "size", "asp.size", FT_UINT16, BASE_DEC,
NULL, 0, "asp available size for reply", HFILL }},
{ &hf_asp_zero_value,
@@ -2078,7 +2078,7 @@ proto_register_atalk(void)
"Address value", HFILL }},
};
-
+
static hf_register_info hf_zip[] = {
{ &hf_zip_function,
{ "Function", "zip.function", FT_UINT8, BASE_DEC, VALS(zip_function_vals), 0x0,
@@ -2150,7 +2150,7 @@ proto_register_atalk(void)
"Multicast address", HFILL }},
};
-
+
static gint *ett[] = {
&ett_llap,
&ett_ddp,
@@ -2168,7 +2168,7 @@ proto_register_atalk(void)
&ett_asp_addr,
&ett_asp_addr_line,
&ett_asp_directory,
-
+
&ett_nbp,
&ett_nbp_info,
&ett_nbp_node,
@@ -2178,8 +2178,8 @@ proto_register_atalk(void)
&ett_zip,
&ett_zip_flags,
- &ett_zip_zones_list,
- &ett_zip_network_list,
+ &ett_zip_zones_list,
+ &ett_zip_network_list,
};
module_t *atp_module;
diff --git a/packet-atalk.h b/packet-atalk.h
index 24bec82..add0e83 100644
--- a/packet-atalk.h
+++ b/packet-atalk.h
@@ -1,18 +1,18 @@
/* packet-atalk.h
* Definitions for Appletalk packet disassembly (DDP, currently).
*
- * $Id: packet-atalk.h,v 1.8 2002/04/24 06:03:33 guy Exp $
+ * $Id: packet-atalk.h,v 1.9 2002/08/28 21:00:07 jmayer Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/packet-atm.c b/packet-atm.c
index 88cd160..aac07e2 100644
--- a/packet-atm.c
+++ b/packet-atm.c
@@ -1,22 +1,22 @@
/* packet-atm.c
* Routines for ATM packet disassembly
*
- * $Id: packet-atm.c,v 1.48 2002/08/02 23:35:47 jmayer Exp $
+ * $Id: packet-atm.c,v 1.49 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -179,7 +179,7 @@ dissect_le_client(tvbuff_t *tvb, proto_tree *tree)
}
static void
-dissect_lan_destination(tvbuff_t *tvb, int offset, const char *type, proto_tree *tree)
+dissect_lan_destination(tvbuff_t *tvb, int offset, const char *type, proto_tree *tree)
{
proto_item *td;
proto_tree *dest_tree;
diff --git a/packet-atm.h b/packet-atm.h
index 27c69b3..d10bb78 100644
--- a/packet-atm.h
+++ b/packet-atm.h
@@ -1,21 +1,21 @@
/* packet-atm.h
*
- * $Id: packet-atm.h,v 1.8 2002/08/02 23:35:47 jmayer Exp $
+ * $Id: packet-atm.h,v 1.9 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/packet-auto_rp.c b/packet-auto_rp.c
index 3a38c86..6aa61ee 100644
--- a/packet-auto_rp.c
+++ b/packet-auto_rp.c
@@ -4,22 +4,22 @@
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-auto_rp.c,v 1.21 2002/08/02 23:35:47 jmayer Exp $
+ * $Id: packet-auto_rp.c,v 1.22 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -119,7 +119,7 @@ static void dissect_auto_rp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Auto-RP");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
-
+
ver_type = tvb_get_guint8(tvb, 0);
rp_count = tvb_get_guint8(tvb, 1);
if (check_col(pinfo->cinfo, COL_INFO))
@@ -288,7 +288,7 @@ static int do_auto_rp_map(tvbuff_t *tvb, int offset, proto_tree *auto_rp_tree)
offset++;
proto_tree_add_ipv4(grp_tree, hf_auto_rp_group_prefix, tvb, offset, 4, group_addr);
offset += 4;
-
+
}
return offset;
diff --git a/packet-bacapp.c b/packet-bacapp.c
index 6eb2e5b..b9f6965 100644
--- a/packet-bacapp.c
+++ b/packet-bacapp.c
@@ -2,7 +2,7 @@
* Routines for BACnet (APDU) dissection
* Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund
*
- * $Id: packet-bacapp.c,v 1.12 2002/08/02 23:35:47 jmayer Exp $
+ * $Id: packet-bacapp.c,v 1.13 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -19,7 +19,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -84,7 +84,7 @@ dissect_bacapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
bacapp_tree = proto_item_add_subtree(ti, ett_bacapp);
- proto_tree_add_uint_format(bacapp_tree, hf_bacapp_type, tvb,
+ proto_tree_add_uint_format(bacapp_tree, hf_bacapp_type, tvb,
offset, 1, bacapp_type, "APDU Type: %u (%s)", bacapp_type,
bacapp_type_name(bacapp_type));
offset ++;
diff --git a/packet-bacnet.c b/packet-bacnet.c
index 80f7c6c..ea9ff4c 100644
--- a/packet-bacnet.c
+++ b/packet-bacnet.c
@@ -2,7 +2,7 @@
* Routines for BACnet (NPDU) dissection
* Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund
*
- * $Id: packet-bacnet.c,v 1.13 2002/08/02 23:35:47 jmayer Exp $
+ * $Id: packet-bacnet.c,v 1.14 2002/08/28 21:00:07 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -110,7 +110,7 @@ static const true_false_string control_dest_high = {
"DNET, DLEN and Hop Count present. If DLEN=0: broadcast, dest. address field absent.",
"DNET, DLEN, DADR and Hop Count absent."
};
-
+
static const true_false_string control_src_high = {
"SNET, SLEN and SADR present, SLEN=0 invalid, SLEN specifies length of SADR",
"SNET, SLEN and SADR absent"
@@ -185,10 +185,10 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint8 j;
tvbuff_t *next_tvb;
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "BACnet-NPDU");
- if (check_col(pinfo->cinfo, COL_INFO))
+ if (check_col(pinfo->cinfo, COL_INFO))
col_set_str(pinfo->cinfo, COL_INFO, "Building Automation and Control Network NPDU");
offset = 0;
@@ -210,31 +210,31 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
bacnet_tree = proto_item_add_subtree(ti, ett_bacnet);
- proto_tree_add_uint_format(bacnet_tree, hf_bacnet_version, tvb,
+ proto_tree_add_uint_format(bacnet_tree, hf_bacnet_version, tvb,
offset, 1,
bacnet_version,"Version: 0x%02x (%s)",bacnet_version,
(bacnet_version == 0x01)?"ASHRAE 135-1995":"unknown");
offset ++;
- ct = proto_tree_add_uint_format(bacnet_tree, hf_bacnet_control,
+ ct = proto_tree_add_uint_format(bacnet_tree, hf_bacnet_control,
tvb, offset, 1,
bacnet_control,"Control: 0x%02x",bacnet_control);
- control_tree = proto_item_add_subtree(ct,
+ control_tree = proto_item_add_subtree(ct,
ett_bacnet_control);
- proto_tree_add_boolean(control_tree, hf_bacnet_control_net,
+ proto_tree_add_boolean(control_tree, hf_bacnet_control_net,
tvb, offset, 1, bacnet_control);
- proto_tree_add_boolean(control_tree, hf_bacnet_control_res1, tvb,
+ proto_tree_add_boolean(control_tree, hf_bacnet_control_res1, tvb,
offset, 1, bacnet_control);
- proto_tree_add_boolean(control_tree, hf_bacnet_control_dest, tvb,
+ proto_tree_add_boolean(control_tree, hf_bacnet_control_dest, tvb,
offset, 1, bacnet_control);
- proto_tree_add_boolean(control_tree, hf_bacnet_control_res2, tvb,
+ proto_tree_add_boolean(control_tree, hf_bacnet_control_res2, tvb,
offset, 1, bacnet_control);
- proto_tree_add_boolean(control_tree, hf_bacnet_control_src, tvb,
+ proto_tree_add_boolean(control_tree, hf_bacnet_control_src, tvb,
offset, 1, bacnet_control);
- proto_tree_add_boolean(control_tree, hf_bacnet_control_expect, tvb,
+ proto_tree_add_boolean(control_tree, hf_bacnet_control_expect, tvb,
offset, 1, bacnet_control);
- proto_tree_add_boolean(control_tree, hf_bacnet_control_prio_high,
+ proto_tree_add_boolean(control_tree, hf_bacnet_control_prio_high,
tvb, offset, 1, bacnet_control);
- proto_tree_add_boolean(control_tree, hf_bacnet_control_prio_low,
+ proto_tree_add_boolean(control_tree, hf_bacnet_control_prio_low,
tvb, offset, 1, bacnet_control);
offset ++;
if (bacnet_control & BAC_CONTROL_DEST) { /* DNET, DLEN, DADR */
@@ -245,8 +245,8 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* DLEN = 0 is broadcast on dest.network */
if( bacnet_dlen == 0) {
/* append to hf_bacnet_dlen: broadcast */
- proto_tree_add_uint_format(bacnet_tree,
- hf_bacnet_dlen, tvb, offset, 1, bacnet_dlen,
+ proto_tree_add_uint_format(bacnet_tree,
+ hf_bacnet_dlen, tvb, offset, 1, bacnet_dlen,
"Destination MAC Layer Address Length: %d indicates Broadcast on Destination Network",
bacnet_dlen);
offset ++;
@@ -256,8 +256,8 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb, offset, 1, bacnet_dlen);
offset ++;
/* Ethernet MAC */
- proto_tree_add_item(bacnet_tree,
- hf_bacnet_dadr_eth, tvb, offset,
+ proto_tree_add_item(bacnet_tree,
+ hf_bacnet_dadr_eth, tvb, offset,
bacnet_dlen, FALSE);
offset += bacnet_dlen;
} else if (bacnet_dlen<7) {
@@ -265,13 +265,13 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb, offset, 1, bacnet_dlen);
offset ++;
/* Other MAC formats should be included here */
- proto_tree_add_item(bacnet_tree,
- hf_bacnet_dadr_tmp, tvb, offset,
+ proto_tree_add_item(bacnet_tree,
+ hf_bacnet_dadr_tmp, tvb, offset,
bacnet_dlen, FALSE);
offset += bacnet_dlen;
} else {
- proto_tree_add_uint_format(bacnet_tree,
- hf_bacnet_dlen, tvb, offset, 1, bacnet_dlen,
+ proto_tree_add_uint_format(bacnet_tree,
+ hf_bacnet_dlen, tvb, offset, 1, bacnet_dlen,
"Destination MAC Layer Address Length: %d invalid!",
bacnet_dlen);
}
@@ -284,7 +284,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
bacnet_slen = tvb_get_guint8(tvb, offset);
if( bacnet_slen == 0) { /* SLEN = 0 invalid */
proto_tree_add_uint_format(bacnet_tree,
- hf_bacnet_slen, tvb, offset, 1, bacnet_slen,
+ hf_bacnet_slen, tvb, offset, 1, bacnet_slen,
"Source MAC Layer Address Length: %d invalid!",
bacnet_slen);
offset ++;
@@ -294,8 +294,8 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb, offset, 1, bacnet_slen);
offset ++;
/* Ethernet MAC */
- proto_tree_add_item(bacnet_tree,
- hf_bacnet_sadr_eth, tvb, offset,
+ proto_tree_add_item(bacnet_tree,
+ hf_bacnet_sadr_eth, tvb, offset,
bacnet_slen, FALSE);
offset += bacnet_slen;
} else if (bacnet_slen<6) { /* LON,ARCNET,MS/TP MAC */
@@ -304,13 +304,13 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb, offset, 1, bacnet_slen);
offset ++;
/* Other MAC formats should be included here */
- proto_tree_add_item(bacnet_tree,
- hf_bacnet_sadr_tmp, tvb, offset,
+ proto_tree_add_item(bacnet_tree,
+ hf_bacnet_sadr_tmp, tvb, offset,
bacnet_slen, FALSE);
offset += bacnet_slen;
} else {
proto_tree_add_uint_format(bacnet_tree,
- hf_bacnet_slen, tvb, offset, 1, bacnet_slen,
+ hf_bacnet_slen, tvb, offset, 1, bacnet_slen,
"Source MAC Layer Address Length: %d invalid!",
bacnet_slen);
offset ++;
@@ -322,7 +322,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset ++;
}
/* Network Layer Message Type */
- if (bacnet_control & BAC_CONTROL_NET) {
+ if (bacnet_control & BAC_CONTROL_NET) {
bacnet_mesgtyp = tvb_get_guint8(tvb, offset);
proto_tree_add_uint_format(bacnet_tree,
hf_bacnet_mesgtyp, tvb, offset, 1, bacnet_mesgtyp,
@@ -330,9 +330,9 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
bacnet_mesgtyp_name(bacnet_mesgtyp));
offset ++;
}
- /* Vendor ID
- * The standard says: "If Bit 7 of the control octet is 1 and
- * the Message Type field contains a value in the range
+ /* Vendor ID
+ * The standard says: "If Bit 7 of the control octet is 1 and
+ * the Message Type field contains a value in the range
* X'80' - X'FF', then a Vendor ID field shall be present (...)."
* We should not go any further in dissecting the packet if it's
* not present, but we don't know about that: No length field...
@@ -354,9 +354,9 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Reason, DNET (in Reject-Message-To-Network) */
if (bacnet_mesgtyp == BAC_NET_REJ) {
bacnet_rejectreason = tvb_get_guint8(tvb, offset);
- proto_tree_add_uint_format(bacnet_tree,
+ proto_tree_add_uint_format(bacnet_tree,
hf_bacnet_rejectreason,
- tvb, offset, 1,
+ tvb, offset, 1,
bacnet_rejectreason, "Rejection Reason: %d (%s)",
bacnet_rejectreason,
bacnet_rejectreason_name(bacnet_rejectreason));
@@ -366,7 +366,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 2;
}
/* N*DNET (in Router-Busy-To-Network,Router-Available-To-Network) */
- if ((bacnet_mesgtyp == BAC_NET_R_BUSY) ||
+ if ((bacnet_mesgtyp == BAC_NET_R_BUSY) ||
(bacnet_mesgtyp == BAC_NET_R_AVA) || (bacnet_mesgtyp == BAC_NET_IAM_R) ) {
while(tvb_reported_length_remaining(tvb, offset) > 1 ) {
proto_tree_add_item(bacnet_tree, hf_bacnet_dnet,
@@ -375,7 +375,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
}
/* Initialize-Routing-Table */
- if ( (bacnet_mesgtyp == BAC_NET_INIT_RTAB) ||
+ if ( (bacnet_mesgtyp == BAC_NET_INIT_RTAB) ||
(bacnet_mesgtyp == BAC_NET_INIT_RTAB_ACK) ) {
bacnet_rportnum = tvb_get_guint8(tvb, offset);
/* number of ports */
@@ -403,7 +403,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset ++;
}
}
-
+
}
proto_item_set_len(ti, offset);
}
@@ -435,49 +435,49 @@ proto_register_bacnet(void)
"BACnet Control", HFILL }
},
{ &hf_bacnet_control_net,
- { "NSDU contains",
+ { "NSDU contains",
"bacnet.control_net",
FT_BOOLEAN, 8, TFS(&control_net_set_high),
BAC_CONTROL_NET, "BACnet Control", HFILL }
},
{ &hf_bacnet_control_res1,
- { "Reserved",
+ { "Reserved",
"bacnet.control_res1",
FT_BOOLEAN, 8, TFS(&control_res_high),
BAC_CONTROL_RES1, "BACnet Control", HFILL }
},
{ &hf_bacnet_control_dest,
- { "Destination Specifier",
+ { "Destination Specifier",
"bacnet.control_dest",
FT_BOOLEAN, 8, TFS(&control_dest_high),
BAC_CONTROL_DEST, "BACnet Control", HFILL }
},
{ &hf_bacnet_control_res2,
- { "Reserved",
+ { "Reserved",
"bacnet.control_res2",
FT_BOOLEAN, 8, TFS(&control_res_high),
BAC_CONTROL_RES2, "BACnet Control", HFILL }
},
{ &hf_bacnet_control_src,
- { "Source specifier",
+ { "Source specifier",
"bacnet.control_src",
FT_BOOLEAN, 8, TFS(&control_src_high),
BAC_CONTROL_SRC, "BACnet Control", HFILL }
},
{ &hf_bacnet_control_expect,
- { "Expecting Reply",
+ { "Expecting Reply",
"bacnet.control_expect",
FT_BOOLEAN, 8, TFS(&control_expect_high),
BAC_CONTROL_EXPECT, "BACnet Control", HFILL }
},
{ &hf_bacnet_control_prio_high,
- { "Priority",
+ { "Priority",
"bacnet.control_prio_high",
FT_BOOLEAN, 8, TFS(&control_prio_high_high),
BAC_CONTROL_PRIO_HIGH, "BACnet Control", HFILL }
},
{ &hf_bacnet_control_prio_low,
- { "Priority",
+ { "Priority",
"bacnet.control_prio_low",
FT_BOOLEAN, 8, TFS(&control_prio_low_high),
BAC_CONTROL_PRIO_LOW, "BACnet Control", HFILL }
diff --git a/packet-beep.c b/packet-beep.c
index 1cf841b..59b9d1c 100644
--- a/packet-beep.c
+++ b/packet-beep.c
@@ -1,7 +1,7 @@
/* packet-beep.c
* Routines for BEEP packet disassembly
*
- * $Id: packet-beep.c,v 1.10 2002/08/02 23:35:47 jmayer Exp $
+ * $Id: packet-be