aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2016-01-27Added dissector for Paging and Service Information (186) IE.Branislav Makan1-1/+52
Change-Id: I175b48373f881238f938dd62c0d7f32c7c973387 Reviewed-on: https://code.wireshark.org/review/13550 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-27Use find_or_create_conversation().AndersBroman2-23/+8
Change-Id: I4344a0ebdd6eb4c8cf2a54d3bd48056ecadef4a2 Reviewed-on: https://code.wireshark.org/review/13551 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-27wslua: do not free TVB for data sourcesPeter Wu1-2/+2
Bug: 12050 Change-Id: If094f78f683776ba2ea3ddd848ec9018cba064b8 Reviewed-on: https://code.wireshark.org/review/13554 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-27ssl: enable "decryption" without keys for NULL ciphersPeter Wu1-9/+39
NULL ciphers have their content in plaintext which can be dissected. When the keys are available, decryption and MAC validation works as usual. When the master secret cannot be found, continue anyway in case of NULL ciphers. Change-Id: I1ba6de6333fad58cabc757544490cddca7d82e26 Ping-Bug: 4652 Reviewed-on: https://code.wireshark.org/review/13536 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-27Remove the deprecated column types so users don't think they still exist.Michael Mann4-240/+199
Bug: 11559 Change-Id: I51836dc9a4fa399835c7bdabcba577ebd40327ad Reviewed-on: https://code.wireshark.org/review/13538 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-27vuze-dht: show network coordinates instead of binary dataДмитрий Цветцих1-5/+63
Vuze used Vivaldi. It is decentralized network coordinate system. Vivaldi contains 3 coordinates of an Euclidean space + 1 coordinate of predicted error. Change-Id: I8c4b4d64534675d1dfb9d35a03a61d2336fc0e6d Reviewed-on: https://code.wireshark.org/review/13547 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-27CIP: Add support for all defined segment typesD. Ulis2-58/+546
Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26wslua: fix memleak on error path of Tvb:bytes()Peter Wu1-5/+6
Delay allocation of a GByteArray to avoid a memleak on errors. Change-Id: I2b2ae6d33407500e81a4f45b86ef82720d3443a4 Reviewed-on: https://code.wireshark.org/review/13553 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-01-26PDCP LTE: upgrade dissector to v13.0.0Pascal Quantin4-27/+120
Change-Id: Iae4a38ac7b80978d1ad02168e79c0fe0bffd8d2e Reviewed-on: https://code.wireshark.org/review/13549 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-26color_filter(.h): Fix The following parameters of ... are not documentedAlexis La Goutte1-0/+4
Part 2 (oups forget to save before commit) Change-Id: I186596d6c6e3838fc86794638f50f115b270d230 Reviewed-on: https://code.wireshark.org/review/13548 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26cell_broadcast(.h): fix api referenceAlexis La Goutte1-0/+1
The following parameters of dissect_umts_cell_broadcast_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) are not documented: parameter 'data' Change-Id: I4cd2a41f62ca99fc7aaa5d95049abd5662e50940 Reviewed-on: https://code.wireshark.org/review/13544 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-26color_filter(.h): Fix The following parameters of ... are not documented:Alexis La Goutte1-0/+5
parameter 'err_msg' or parameter 'add_cb' Change-Id: Iea43833de7bbb12ce16c3363d26f70a2859e092c Reviewed-on: https://code.wireshark.org/review/13543 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-26api ref (wmem_interval_tree): fix end of file while inside a groupAlexis La Goutte1-0/+3
Change-Id: I68fbe85a8a7e3f0181fc84151fa8f58c459fd46a Reviewed-on: https://code.wireshark.org/review/13542 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-25dns,spdy,ssl-utils: fix export PDUPeter Wu3-21/+15
Dissectors registered with SSL must be registered for Export PDU to work properly. Otherwise the dissector name could be NULL, resulting in a capture file that cannot properly be dissected. Add an assertion to ssl-utils to catch this situation. Note that this results in an "wmem_alloc: assertion failed: (allocator->in_scope)" report because these functions are possibly called in the protocol handoff routines... Can be fixed later. The DNS dissector is fixed by merging the UDP/TCP dissectors into a single dns handle which recognizes TCP and then assumes the length prefix if TCP. Change-Id: If73b9b09a4682d66fb8fa026c42a3475648f9bf1 Reviewed-on: https://code.wireshark.org/review/13194 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-25ssl: fix RSA key matching with Client certsPeter Wu1-1/+1
Avoid a RSA private key lookup for client certificates, the RSA private key is only valid for the server certificate. The lookup based on the client cert resulted in overwriting the server match. Bug: 12042 Change-Id: I60aa79f8f2b941bfde032e20ab11446ae4e6c81b Reviewed-on: https://code.wireshark.org/review/13530 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-01-25TDMoP Dont register UDP port 0 or Ethertype 0.AndersBroman1-4/+12
Change-Id: I7e724a6390fbe75993c8663c8c43937a40d8250d Reviewed-on: https://code.wireshark.org/review/13528 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-25Fix missing validation (crash) for certain prefsPeter Wu1-11/+33
The gui.layout_type preference is part of the Layout submodule (which is part of the gui module. The Layout submodule has a special apply callback that validates its prefs. These validations were never called though because the prefix is "gui" and as a result that module would be marked as changed. Fix this crash by calling the validation function on the submodules instead holding the pref, not its parent. Change-Id: I2a49dce93fdc7fab4ab3dc52dad90288c2d17434 Reviewed-on: https://code.wireshark.org/review/13154 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-01-25[skinny] pinfo->fd-num changed to pinfo->numAndersBroman1-2/+2
Change-Id: Icf512fb1d4a211632fc307434f9036b68bb0b8cb Reviewed-on: https://code.wireshark.org/review/13527 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-25MAC LTE: upgrade dissector to v13.0.0Pascal Quantin2-97/+424
Change-Id: I1a0e575acc83b88d595111809ca03e4bdf479619 Reviewed-on: https://code.wireshark.org/review/13516 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-25Move the proto data stuff out of frame_data.[ch].Guy Harris119-176/+411
It's not tied to the frame_data structure any more, so it belongs by itself. Clean up some #includes while we're at it; in particular, frame_data.h doesn't use anything related to tvbuffs, so don't have it gratuitiously include tvbuff.h. Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c Reviewed-on: https://code.wireshark.org/review/13518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24Fix reassembly test broken by gbc5a037Pascal Quantin1-2/+2
Change-Id: I8bcde5fd5039b77eccd9327cb7f0558b4fdedc36 Reviewed-on: https://code.wireshark.org/review/13515 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-24[Automatic update for 2016-01-24]Gerald Combs2-7/+282
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Iaac61b4a2f446b99d4600ae8ae56405ae6fb21da Reviewed-on: https://code.wireshark.org/review/13512 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-24More pinfo->fd->abs_ts to pinfo->abs_ts.Guy Harris1-4/+4
Change-Id: I15a187fd0e85ba41431ebbcf88168fca79b624cd Reviewed-on: https://code.wireshark.org/review/13511 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24More pinfo->fd->num to pinfo->num.Guy Harris1-28/+28
Change-Id: Ic56b1e9be4886be9985c4b7082fbd330dbf297df Reviewed-on: https://code.wireshark.org/review/13510 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24Add the packet number to the packet_info structure, and use it.Guy Harris273-1589/+1590
That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24Allow hex and octal values to be used in rangesAdam Goldman1-2/+2
Change-Id: I896b945067c4325a29c41c23ad39486e356d9434 Reviewed-on: https://code.wireshark.org/review/13474 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-24Set width of hex output according to bitmaskKevin Bracey3-70/+60
Output from BASE_HEX et al has always been zero-padded to according to the field type - 8 digits for FT_UINT32, etc. When the field has a bitmask, this is definitely not appropriate - the field type is used to indicate the size of the bitfield container, and tells us nothing about the size of this field. Instead, determine the actual size of the field by inspecting the bitmask, and output the corresponding number of hex digits. Change-Id: I10ec4e93e1e40e8b1354d5368cc8945cf671a617 Reviewed-on: https://code.wireshark.org/review/13225 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-23ANSI A: get rid of a global bufferPascal Quantin1-29/+26
Change-Id: Iba66af0b3dca683c3f9cf5497ddda46469cd4695 Reviewed-on: https://code.wireshark.org/review/13506 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-23More structure assignments for nstime_t.Guy Harris2-4/+2
Change-Id: I4d320b50d7d74b6fc423014c9611a60d49c6be02 Reviewed-on: https://code.wireshark.org/review/13503 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23Set the pinfo time stamps based on the frame_data time stamps.Guy Harris1-2/+2
That takes into account any time-shifting that's been done. Change-Id: Ib4c01e7b055f5ac2f1111bcbe946c6094dcb70ae Reviewed-on: https://code.wireshark.org/review/13502 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23More pinfo->fd->abs_ts to pinfo->abs_ts.Guy Harris3-3/+3
Change-Id: I70db0a345cc4c5c57c454371deb4f92f9ac4b9ac Reviewed-on: https://code.wireshark.org/review/13501 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23Add more fields to packet_info structure and use them.Guy Harris95-314/+325
Add fields for the absolute time stamp (and another field for a presence flag for the absolute time stamp) and the packet encapsulation for the packet. This lets us remove the field for the packet encapsulation in the frame_data structure; do so. Change-Id: Ifb910a9a192414e2a53086f3f7b97f39ed36aa39 Reviewed-on: https://code.wireshark.org/review/13499 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23Use structure assignment for nstime_t.Guy Harris1-2/+1
Change-Id: Iab049e7708642a306764d80839bf0d5139889212 Reviewed-on: https://code.wireshark.org/review/13498 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23Avoid inhaling fumes. Do not use near open flame.Guy Harris1-1/+1
Change-Id: I9040745b2878a9ba8a0677e19af6702c2a766ce2 Reviewed-on: https://code.wireshark.org/review/13496 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23Fix handling of the byte order magic number.Guy Harris1-28/+26
Just treat it as an array of bytes. When checking for whether it's a pcapng file, also determine whether it's big-endian or little-endian. Note that reading it in *host* byte order will tell you whether it's in your byte order or byte-swapped; you have to know your byte order to know whether that means little-endian or big-endian. Have a #define for the byte-order magic number size, as all byte order magic number values must be that size, and use that as the size of the magic-number arrays. Also use a #define for the SHB block type magic number. Get rid of a now-unused expert info. (If the magic number isn't something we recognize, we don't treat the file as a pcap file, so it can never be "unknown".) Change-Id: Ic74cceac17d1490eb70a28f67cb4dbb512e031ac Reviewed-on: https://code.wireshark.org/review/13494 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23Get rid of now-unused expert info.Guy Harris1-10/+0
(If the magic number isn't something we recognize, we don't treat the file as a pcap file, so it can never be "unknown".) Change-Id: I7e8bac1ebd2cbfd6d603035428274a1098ff7544 Reviewed-on: https://code.wireshark.org/review/13491 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23Fix handling of the magic number.Guy Harris1-23/+44
Just treat it as an array of bytes. When checking for whether it's a pcap file, also determine whether it's big-endian or little-endian. Note that reading it in *host* byte order will tell you whether it's in your byte order or byte-swapped; you have to know your byte order to know whether that means little-endian or big-endian. Have a #define for the magic number size, as all magic number values must be that size, and use that as the size of the magic-number arrays. Handle nanosecond timestamp resolution while we're at it. Change-Id: I4d83579d919ae9f15888afca14317631d413ca51 Reviewed-on: https://code.wireshark.org/review/13490 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-22That warning is bogus; squelch it with an otherwise-unnecessary cast.Guy Harris1-3/+10
The compiler being used for the 64-bit OS X build is buggy; throw in an otherwise-unnecessary cast to squelch its bogus warning. Change-Id: Ie2104ba861493870191530ca391a089ca3951929 Reviewed-on: https://code.wireshark.org/review/13489 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-22Try to fix compiler warnings.Guy Harris1-3/+3
Parenthesize differently and, while we're at it, don't use the useless gsize data type - C has had size_t since C89, use it. gsize's only purpose is to use in APIs defined to take gsize arguments. Change-Id: I7d68273e7e0f0e71947d3505cb283bfa216fce03 Reviewed-on: https://code.wireshark.org/review/13488 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-22Fix DIAG_OFF() and DIAG_ON() calls.Guy Harris1-2/+2
DIAG_O{FF,N} take a warning flag name *without* the "W". Change-Id: I00558e42804b9f2ec4e80fae7c739541880381ca Reviewed-on: https://code.wireshark.org/review/13487 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-22[iso14443] dissect two more components of the ATQBMartin Kaiser1-6/+24
Change-Id: I4fc1962a391549e880dcdf52dfa13a94d3568ea8 Reviewed-on: https://code.wireshark.org/review/13483 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-01-22GSM A DTAP: fix display of calling/called party BCD number in parent treePascal Quantin1-24/+22
Change-Id: I0a492d1c304c285b831f553158777843ad195c2d Reviewed-on: https://code.wireshark.org/review/13481 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-22GSM A DTAP: get rid of a global bufferPascal Quantin1-23/+21
Change-Id: Icdd58960ca2673ea19b1005c47f3b06f1165caa2 Reviewed-on: https://code.wireshark.org/review/13482 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-22ISAKMP: Try to really fix implicit conversion warning on OSX 64 bit.João Valverde1-2/+2
Change-Id: I2cfb58fdd076a474946c3a51e522307f103d9319 Reviewed-on: https://code.wireshark.org/review/13480 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-22ISAKMP: Fix implicit conversion to shorter type.João Valverde1-1/+2
Change-Id: I6b3c20d3aa1ade39739cad560d9f27242a9c8a4a Reviewed-on: https://code.wireshark.org/review/13479 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-22CIP: Add support for Get Attributes AllMichael Mann6-223/+473
Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-22ISAKMP: Optimize loopsJoão Valverde1-58/+26
Change-Id: I2e7ae0c3d8cba4255dd725db39a02be8ecce94d8 Reviewed-on: https://code.wireshark.org/review/13469 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-22NFSv4.1 bugfixesTrond Myklebust1-1/+14
nfs: Fix up the SEQUENCE status flags The SEQUENCE status flags are being displayed incorrectly (after the NFSv4 operations) due to being attached to the COMPOUND tree instead of the SEQUENCE op's tree. nfs/flexfiles: Ensure that we account for the layout_flags in the offset nfs/flexfiles: Add a dissector for the optional layoutget "stats collect hint" field Change-Id: I8744254aa9f65a0b33510f2352875b01804149c2 Fixes: d892c32cc2d0 ("Eliminate proto_tree_add_text from packet-nfs.c") Fixes: 79b88aacb6d1 ("nfs: Cleanup of FlexFiles Layout Type") Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Reviewed-on: https://code.wireshark.org/review/13477 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-21GSM SMS: add dissection of Special SMS Message Indication IEPascal Quantin1-1/+75
Change-Id: I154c3b4c4ef7dd3a243c9df003df01807b45c095 Reviewed-on: https://code.wireshark.org/review/13475 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-21Qt: Add some window title variablesStig Bjørlykke1-2/+2
Add some variables to be used in custom window title. %P = profile name %V = version info Change-Id: I049717432a4d3523b541bb4f6f882c75abc38ddb Reviewed-on: https://code.wireshark.org/review/13419 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>