cosmos 4.2.4-java → 4.3.0-java

data/demo/Rakefile

@@ -72,10 +72,12 @@ def create_crc_file(official)
   puts "Created config/data/crc.txt with #{count} CRCs"
 end
 
+desc 'Updates the config/data/crc.txt file with USER_MODIFIED (unofficial)'
 task :crc do
   create_crc_file(false)
 end
 
+desc 'Updates the config/data/crc.txt file (official)'
 task :crc_official do
   create_crc_file(true)
 end

data/demo/config/dart/Gemfile

@@ -50,5 +50,5 @@ gem 'childprocess'
 if RUBY_ENGINE == 'ruby'
   gem 'pg', '~> 1.0'
 else
- gem 'activerecord-jdbcpostgresql-adapter', :github => 'jruby/activerecord-jdbc-adapter'
+ gem 'activerecord-jdbcpostgresql-adapter', '~> 51.1'
 end

data/demo/config/data/crc.txt

@@ -54,7 +54,7 @@
 "config/targets/INST/tools/table_manager/McConfigTable_def.txt" 0x5B6FA631
 "config/targets/INST/tools/data_viewer/data_viewer2.txt" 0x7FFA3A8A
 "config/targets/INST/tools/data_viewer/data_viewer.txt" 0xB25E2644
-"config/targets/INST/cmd_tlm/inst_tlm.txt" 0x008F9C71
+"config/targets/INST/cmd_tlm/inst_tlm.txt" 0x83356727
 "config/targets/INST/cmd_tlm/_ccsds_tlm.txt" 0xE833D935
 "config/targets/INST/cmd_tlm/inst_cmds.txt" 0x7E5C780F
 "config/targets/INST/cmd_tlm/_ccsds_cmd.txt" 0x7F5572F3
@@ -82,8 +82,9 @@
 "config/data/hselectoff.gif" 0x8A0C192E
 "config/data/groundon.gif" 0x97D9A501
 "config/data/vswitchon.gif" 0xD747AC45
-"config/system/system.txt" 0x024C5A9D
-"config/system/system2.txt" 0x6CC6BC88
+"config/system/system_alt_ports.txt" 0xB5D194B0
+"config/system/system.txt" 0x84099B85
+"config/system/system2.txt" 0x52BFC433
 "config/tools/launcher/launcher2.css" 0x69DA47AB
 "config/tools/launcher/launcher.txt" 0x7060F202
 "config/tools/launcher/launcher2.txt" 0x697956FC
@@ -107,6 +108,7 @@
 "config/tools/tlm_extractor/_adcs_time.txt" 0x3DAD5094
 "config/tools/tlm_extractor/tlm_extractor2.txt" 0x5C780BD2
 "config/tools/cmd_tlm_server/cmd_tlm_server2.txt" 0x2534CD8E
+"config/tools/cmd_tlm_server/cmd_tlm_server_chain.txt" 0x0A7ED710
 "config/tools/cmd_tlm_server/cmd_tlm_server.txt" 0xEE1CB154
 "config/tools/tlm_grapher/README.txt" 0x93B2C07E
 "config/tools/opengl_builder/README.txt" 0x93B2C07E
@@ -127,7 +129,7 @@
 "config/tools/handbook_creator/default_toc.xsl" 0x4122A040
 "config/tools/handbook_creator/handbook_creator.txt" 0xAA806C94
 "config/tools/script_runner/script_runner.txt" 0x1EECD803
-"config/dart/Gemfile" 0x69694DA8
+"config/dart/Gemfile" 0x294591DB
 "tools/TlmExtractor.bat" 0x2B98E027
 "tools/Launcher" 0xFD4E356C
 "tools/CmdSequence" 0x4A13C82C
@@ -262,9 +264,10 @@
 "tools/CmdExtractor" 0x96E82AC3
 "tools/OpenGLBuilder" 0x585EA691
 "tools/CmdSender.bat" 0x2B98E027
-"procedures/cosmos_api_test.rb" 0x40001906
+"procedures/cosmos_api_test.rb" 0x9D13FFA3
 "procedures/example_test.rb" 0xEB8B8E79
 "procedures/test.rb" 0xCE4DA55A
 "procedures/replay_test.rb" 0xBB4D6A36
 "procedures/plot_test.rb" 0xF311D562
 "procedures/run_example_test.rb" 0x0F244140
+"procedures/local_screen_example.rb" 0x677D2019

data/demo/config/system/system.txt

@@ -14,18 +14,33 @@ LISTEN_HOST CTS_API 127.0.0.1
 LISTEN_HOST TLMVIEWER_API 127.0.0.1
 LISTEN_HOST CTS_PREIDENTIFIED 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
 LISTEN_HOST CTS_CMD_ROUTER 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST REPLAY_API 127.0.0.1
+LISTEN_HOST REPLAY_PREIDENTIFIED 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST REPLAY_CMD_ROUTER 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST DART_STREAM 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST DART_DECOM 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
 
 # Connect Hosts - Ip addresses or hostnames to connect to when running the tools
 CONNECT_HOST CTS_API 127.0.0.1
 CONNECT_HOST TLMVIEWER_API 127.0.0.1
 CONNECT_HOST CTS_PREIDENTIFIED 127.0.0.1
 CONNECT_HOST CTS_CMD_ROUTER 127.0.0.1
+CONNECT_HOST REPLAY_API 127.0.0.1
+CONNECT_HOST REPLAY_PREIDENTIFIED 127.0.0.1
+CONNECT_HOST REPLAY_CMD_ROUTER 127.0.0.1
+CONNECT_HOST DART_STREAM 127.0.0.1
+CONNECT_HOST DART_DECOM 127.0.0.1
 
 # Ethernet Ports
 PORT CTS_API 7777
 PORT TLMVIEWER_API 7778
 PORT CTS_PREIDENTIFIED 7779
 PORT CTS_CMD_ROUTER 7780
+PORT REPLAY_API 7877
+PORT REPLAY_PREIDENTIFIED 7879
+PORT REPLAY_CMD_ROUTER 7880
+PORT DART_STREAM 8777
+PORT DART_DECOM 8779
 
 # Default Packet Log Writer and Reader
 DEFAULT_PACKET_LOG_WRITER packet_log_writer.rb
@@ -38,6 +53,9 @@ PATH SAVED_CONFIG ./outputs/saved_config
 PATH TABLES ./outputs/tables
 PATH HANDBOOKS ./outputs/handbooks
 PATH PROCEDURES ./procedures
+PATH SEQUENCES ./outputs/sequences
+PATH DART_DATA ./outputs/dart/data
+PATH DART_LOGS ./outputs/dart/logs
 
 ALLOW_ACCESS ALL
 
@@ -49,3 +67,13 @@ ENABLE_SOUND
 META_INIT config/data/meta_init.txt
 
 ADD_MD5_FILE lib/user_version.rb
+
+# Banner examples
+# Create a banner using an existing COSMOS color (Cosmos::GREEN in this case)
+# CLASSIFICATION UNCLASSIFIED green
+
+# Create a banner using a Qt::Color that doesn't exist in COSMOS
+# CLASSIFICATION "Ball Aerospace COSMOS" teal
+
+# Create a banner using a RGB color values
+# CLASSIFICATION Secret 255 114 0

data/demo/config/system/system2.txt

@@ -12,18 +12,33 @@ LISTEN_HOST CTS_API 127.0.0.1
 LISTEN_HOST TLMVIEWER_API 127.0.0.1
 LISTEN_HOST CTS_PREIDENTIFIED 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
 LISTEN_HOST CTS_CMD_ROUTER 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST REPLAY_API 127.0.0.1
+LISTEN_HOST REPLAY_PREIDENTIFIED 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST REPLAY_CMD_ROUTER 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST DART_STREAM 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST DART_DECOM 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
 
 # Connect Hosts - Ip addresses or hostnames to connect to when running the tools
 CONNECT_HOST CTS_API 127.0.0.1
 CONNECT_HOST TLMVIEWER_API 127.0.0.1
 CONNECT_HOST CTS_PREIDENTIFIED 127.0.0.1
 CONNECT_HOST CTS_CMD_ROUTER 127.0.0.1
+CONNECT_HOST REPLAY_API 127.0.0.1
+CONNECT_HOST REPLAY_PREIDENTIFIED 127.0.0.1
+CONNECT_HOST REPLAY_CMD_ROUTER 127.0.0.1
+CONNECT_HOST DART_STREAM 127.0.0.1
+CONNECT_HOST DART_DECOM 127.0.0.1
 
 # Ethernet Ports
-PORT CTS_API 8777
-PORT TLMVIEWER_API 8778
-PORT CTS_PREIDENTIFIED 8779
+PORT CTS_API 7777
+PORT TLMVIEWER_API 7778
+PORT CTS_PREIDENTIFIED 7779
 PORT CTS_CMD_ROUTER 7780
+PORT REPLAY_API 7877
+PORT REPLAY_PREIDENTIFIED 7879
+PORT REPLAY_CMD_ROUTER 7880
+PORT DART_STREAM 8777
+PORT DART_DECOM 8779
 
 # Default Packet Log Writer and Reader
 DEFAULT_PACKET_LOG_WRITER packet_log_writer.rb
@@ -36,6 +51,9 @@ PATH SAVED_CONFIG ./outputs/saved_config
 PATH TABLES ./outputs/tables
 PATH HANDBOOKS ./outputs/handbooks
 PATH PROCEDURES ./procedures
+PATH SEQUENCES ./outputs/sequences
+PATH DART_DATA ./outputs/dart/data
+PATH DART_LOGS ./outputs/dart/logs
 
 ALLOW_ACCESS ALL
 

data/demo/config/system/system_alt_ports.txt

@@ -0,0 +1,69 @@
+# Declare Targets that make up the system
+# DECLARE_TARGET target_name [substitute_name]
+
+# AUTO_DECLARE_TARGETS
+DECLARE_TARGET INST
+DECLARE_TARGET INST INST2
+DECLARE_TARGET EXAMPLE
+DECLARE_TARGET TEMPLATED
+DECLARE_TARGET DART
+DECLARE_TARGET SYSTEM
+
+# Listen Hosts - Ip addresses or hostnames to listen on when running the tools
+LISTEN_HOST CTS_API 127.0.0.1
+LISTEN_HOST TLMVIEWER_API 127.0.0.1
+LISTEN_HOST CTS_PREIDENTIFIED 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST CTS_CMD_ROUTER 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST REPLAY_API 127.0.0.1
+LISTEN_HOST REPLAY_PREIDENTIFIED 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST REPLAY_CMD_ROUTER 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST DART_STREAM 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST DART_DECOM 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+
+# Connect Hosts - Ip addresses or hostnames to connect to when running the tools
+CONNECT_HOST CTS_API 127.0.0.1
+CONNECT_HOST TLMVIEWER_API 127.0.0.1
+CONNECT_HOST CTS_PREIDENTIFIED 127.0.0.1
+CONNECT_HOST CTS_CMD_ROUTER 127.0.0.1
+CONNECT_HOST REPLAY_API 127.0.0.1
+CONNECT_HOST REPLAY_PREIDENTIFIED 127.0.0.1
+CONNECT_HOST REPLAY_CMD_ROUTER 127.0.0.1
+CONNECT_HOST DART_STREAM 127.0.0.1
+CONNECT_HOST DART_DECOM 127.0.0.1
+
+# Ethernet Ports
+PORT CTS_API 9777
+PORT TLMVIEWER_API 9778
+PORT CTS_PREIDENTIFIED 9779
+PORT CTS_CMD_ROUTER 9780
+PORT REPLAY_API 9877
+PORT REPLAY_PREIDENTIFIED 9879
+PORT REPLAY_CMD_ROUTER 9880
+PORT DART_STREAM 10777
+PORT DART_DECOM 10779
+
+# Default Packet Log Writer and Reader
+DEFAULT_PACKET_LOG_WRITER packet_log_writer.rb
+DEFAULT_PACKET_LOG_READER packet_log_reader.rb
+
+# Paths
+PATH LOGS ./outputs/logs
+PATH TMP ./outputs/tmp
+PATH SAVED_CONFIG ./outputs/saved_config
+PATH TABLES ./outputs/tables
+PATH HANDBOOKS ./outputs/handbooks
+PATH PROCEDURES ./procedures
+PATH SEQUENCES ./outputs/sequences
+PATH DART_DATA ./outputs/dart/data
+PATH DART_LOGS ./outputs/dart/logs
+
+ALLOW_ACCESS ALL
+
+ENABLE_SOUND
+# DISABLE_DNS
+# STALENESS_SECONDS 30
+
+# Initialize the metadata dialog using values from the following file:
+META_INIT config/data/meta_init.txt
+
+ADD_MD5_FILE lib/user_version.rb

data/demo/config/targets/INST/cmd_tlm/inst_tlm.txt

@@ -35,6 +35,7 @@ TELEMETRY INST HEALTH_STATUS BIG_ENDIAN "Health and status from the <%= @target_
   APPEND_ITEM COLLECT_TYPE 16 UINT "Most recent collect type"
     STATE NORMAL  0
     STATE SPECIAL 1
+    STATE ERROR ANY
   APPEND_ARRAY_ITEM ARY2       64 FLOAT 640 "Double array"
     UNITS CELCIUS C
   APPEND_ITEM ASCIICMD 2048 STRING "Most recent ASCIICMD string"

data/demo/config/tools/cmd_tlm_server/cmd_tlm_server_chain.txt

@@ -0,0 +1,18 @@
+# Using this file WITH LOCALHOST requires changing the ports in system.txt
+# Otherwise don't change the ports!
+
+TITLE 'COSMOS Command and Telemetry Server - Chain Configuration'
+
+# Don't log on the chained server
+PACKET_LOG_WRITER DEFAULT packet_log_writer.rb nil false
+
+# Replace localhost below with the IP Address of the master CmdTlmServer
+# Update the target list below to the full list of targets in your system
+# To make this child unable to send commands change the first 7779 to nil
+INTERFACE CHAININT tcpip_client_interface.rb localhost 7779 7779 10 5 PREIDENTIFIED
+  TARGET INST
+  TARGET INST2
+  TARGET EXAMPLE
+  TARGET TEMPLATED
+  TARGET SYSTEM
+  TARGET DART

data/demo/procedures/cosmos_api_test.rb

@@ -146,9 +146,12 @@ send_raw("INT1", "\x00\x00")
 send_raw("INT1", "\x00\x00", "\x00\x00")
 
 # get_cmd_list
-expected_list = [["ABORT", "Aborts a collect on the instrument"], ["ARYCMD", "Command with array parameter"], ["ASCIICMD", "Enumerated ASCII command"], ["CLEAR", "Clears counters on the instrument"], ["COLLECT", "Starts a collect on the instrument"], ["FLTCMD", "Command with float parameters"], ["SETPARAMS", "Sets numbered parameters"], ["SLRPNLDEPLOY", "Deploy solar array panels"], ["SLRPNLRESET", "Reset solar array panels"]]
+expected_list = [["ABORT", "Aborts a collect on the INST instrument"], ["ARYCMD", "Command with array parameter"], ["ASCIICMD", "Enumerated ASCII command"], ["CLEAR", "Clears counters on the INST instrument"], ["COLLECT", "Starts a collect on the INST target"], ["FLTCMD", "Command with float parameters"], ["SETPARAMS", "Sets numbered parameters"], ["SLRPNLDEPLOY", "Deploy solar array panels"], ["SLRPNLRESET", "Reset solar array panels"]]
 list = get_cmd_list("INST")
-raise "Fail" if list != expected_list
+puts list.inspect
+if list != expected_list
+  raise "Fail"
+end
 
 # get_cmd_list should fail
 get_cmd_list()
@@ -156,19 +159,20 @@ get_cmd_list("BOB")
 get_cmd_list("BOB", "TED")
 
 # get_cmd_param_list
-expected_list = [["CCSDSVER", 0, nil, "CCSDS primary header version number", nil, nil, false],
-  ["CCSDSTYPE", 1, nil, "CCSDS primary header packet type", nil, nil, false],
-  ["CCSDSSHF", 0, nil, "CCSDS primary header secondary header flag", nil, nil, false],
-  ["CCSDSAPID", 999, nil, "CCSDS primary header application id", nil, nil, false],
-  ["CCSDSSEQFLAGS", 3, nil, "CCSDS primary header sequence flags", nil, nil, false],
-  ["CCSDSSEQCNT", 0, nil, "CCSDS primary header sequence count", nil, nil, false],
-  ["CCSDSLENGTH", 12, nil, "CCSDS primary header packet length", nil, nil, false],
-  ["PKTID", 1, nil, "Packet id", nil, nil, false],
-  ["TYPE", 0, {"NORMAL"=>0, "SPECIAL"=>1}, "Collect type", nil, nil, true],
-  ["DURATION", 1.0, nil, "Collect duration", nil, nil, false],
-  ["OPCODE", "0xAB", nil, "Collect opcode", nil, nil, false],
-  ["TEMP", 0.0, nil, "Collect temperature", "Celcius", "C", false]]
+expected_list = [["CCSDSVER", 0, nil, "CCSDS primary header version number", nil, nil, false, "UINT"],
+  ["CCSDSTYPE", 1, nil, "CCSDS primary header packet type", nil, nil, false, "UINT"],
+  ["CCSDSSHF", 0, nil, "CCSDS primary header secondary header flag", nil, nil, false, "UINT"],
+  ["CCSDSAPID", 999, nil, "CCSDS primary header application id", nil, nil, false, "UINT"],
+  ["CCSDSSEQFLAGS", 3, nil, "CCSDS primary header sequence flags", nil, nil, false, "UINT"],
+  ["CCSDSSEQCNT", 0, nil, "CCSDS primary header sequence count", nil, nil, false, "UINT"],
+  ["CCSDSLENGTH", 12, nil, "CCSDS primary header packet length", nil, nil, false, "UINT"],
+  ["PKTID", 1, nil, "Packet id", nil, nil, false, "UINT"],
+  ["TYPE", 0, {"NORMAL"=>0, "SPECIAL"=>1}, "Collect type", nil, nil, true, "UINT"],
+  ["DURATION", 1.0, nil, "Collect duration", nil, nil, false, "FLOAT"],
+  ["OPCODE", "0xAB", nil, "Collect opcode", nil, nil, false, "UINT"],
+  ["TEMP", 0.0, nil, "Collect temperature", "Celcius", "C", false, "FLOAT"]]
 list = get_cmd_param_list("INST", "COLLECT")
+puts list.inspect(100)
 if list != expected_list
   raise "Fail"
 end

data/demo/procedures/local_screen_example.rb

@@ -0,0 +1,51 @@
+temp = 0
+screen = local_screen('Title') do
+'
+  SCREEN AUTO AUTO 0.1 FIXED
+
+  VERTICAL
+    TITLE "Local Variable and Target Display"
+
+    VERTICALBOX
+      LABELVALUE LOCAL LOCAL temp
+      LABELVALUE INST ADCS POSX
+      LABELVALUE INST ADCS TIMEFORMATTED WITH_UNITS 30
+    END
+  END
+'
+end
+
+disable_instrumentation do
+  5000000.times do
+    temp += 1
+  end
+end
+
+screen.close
+
+temp2 = 5000000
+screen_def =
+'
+  SCREEN AUTO AUTO 0.1 FIXED
+  STAY_ON_TOP
+
+  VERTICAL
+    TITLE "Local Variable and Target Display #2"
+
+    VERTICALBOX
+      LABELVALUE LOCAL LOCAL temp2
+      LABELVALUE INST ADCS POSY
+      LABELVALUE INST ADCS TIMEFORMATTED WITH_UNITS 30
+    END
+  END
+'
+
+local_screen('Title2', screen_def, 100, 200)
+
+disable_instrumentation do
+  5000000.times do
+    temp2 -= 1
+  end
+end
+
+close_local_screens()

data/ext/cosmos/ext/cosmos_io/cosmos_io.c

@@ -34,9 +34,10 @@ static ID id_method_read         = 0;
   * @param length_num_bytes [Integer] Number of bytes in the length field
   * @return [String] A String of "length field" number of bytes
   */
-static VALUE read_length_bytes(VALUE self, VALUE param_length_num_bytes)
+static VALUE read_length_bytes(int argc, VALUE* argv, VALUE self)
 {
-  int length_num_bytes = FIX2INT(param_length_num_bytes);
+  int length_num_bytes = 0;
+  int max_read_size = 0;
   unsigned char* string = NULL;
   long string_length = 0;
   unsigned short short_length = 0;
@@ -44,7 +45,27 @@ static VALUE read_length_bytes(VALUE self, VALUE param_length_num_bytes)
   volatile VALUE temp_string = Qnil;
   volatile VALUE temp_string_length = Qnil;
   volatile VALUE return_value = Qnil;
-
+  volatile VALUE param_length_num_bytes = Qnil;
+  volatile VALUE param_max_read_size = Qnil;
+  
+  switch (argc)
+  {
+    case 1:
+      param_length_num_bytes = argv[0];
+      param_max_read_size = Qnil;
+      break;
+    case 2:
+      param_length_num_bytes = argv[0];
+      param_max_read_size = argv[1];
+      break;
+    default:
+      /* Invalid number of arguments given */
+      rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
+      break;
+  };	
+  
+  length_num_bytes = FIX2INT(param_length_num_bytes);
+  
   /* Read bytes for string length */
   temp_string = rb_funcall(self, id_method_read, 1, param_length_num_bytes);
   if (NIL_P(temp_string) || (RSTRING_LEN(temp_string) != length_num_bytes))
@@ -94,6 +115,13 @@ static VALUE read_length_bytes(VALUE self, VALUE param_length_num_bytes)
       break;
   };
 
+  if (RTEST(param_max_read_size)) {
+    max_read_size = FIX2INT(param_max_read_size);
+    if (string_length > max_read_size) {
+      return Qnil;
+    }
+  }
+
   /* Read String */
   temp_string_length = UINT2NUM(string_length);
   return_value = rb_funcall(self, id_method_read, 1, temp_string_length);
@@ -113,5 +141,5 @@ void Init_cosmos_io (void)
   id_method_read = rb_intern("read");
 
   mCosmosIO = rb_define_module("CosmosIO");
-  rb_define_method(mCosmosIO, "read_length_bytes", read_length_bytes, 1);
+  rb_define_method(mCosmosIO, "read_length_bytes", read_length_bytes, -1);
 }

data/ext/cosmos/ext/packet/packet.c

@@ -44,6 +44,8 @@ static ID id_ivar_disabled = 0;
 static ID id_ivar_target_name = 0;
 static ID id_ivar_packet_name = 0;
 static ID id_ivar_description = 0;
+static ID id_ivar_stored = 0;
+static ID id_ivar_extra = 0;
 
 /* Wraps read_item_internal so that it can be called by rb_protect in protected_read_item_internal */
 static VALUE wrap_read_item_internal(VALUE args)
@@ -297,6 +299,8 @@ static VALUE packet_initialize(int argc, VALUE* argv, VALUE self) {
   rb_ivar_set(self, id_ivar_meta, Qnil);
   rb_ivar_set(self, id_ivar_hidden, Qfalse);
   rb_ivar_set(self, id_ivar_disabled, Qfalse);
+  rb_ivar_set(self, id_ivar_stored, Qfalse);
+  rb_ivar_set(self, id_ivar_extra, Qnil);
 
   return self;
 }
@@ -336,6 +340,8 @@ void Init_packet (void)
   id_ivar_target_name = rb_intern("@target_name");
   id_ivar_packet_name = rb_intern("@packet_name");
   id_ivar_description = rb_intern("@description");
+  id_ivar_stored = rb_intern("@stored");
+  id_ivar_extra = rb_intern("@extra");
 
   cPacket = rb_define_class_under(mCosmos, "Packet", cStructure);
   rb_define_method(cPacket, "initialize", packet_initialize, -1);