Merge branch 'topic/robin/extend-records' into topic/robin/logging-internals

Includes some fixes for using &log with record-extension.

src/Type.cc

@@ -900,6 +900,45 @@ void RecordType::Describe(ODesc* d) const
 		}
 	}
 
+const char* RecordType::AddFields(type_decl_list* others, attr_list* attr)
+	{
+	assert(types);
+
+	bool log = false;
+
+	if ( attr )
+		{
+		loop_over_list(*attr, j)
+			{
+			if ( (*attr)[j]->Tag() == ATTR_LOG )
+				log = true;
+			}
+		}
+	
+	loop_over_list(*others, i)
+		{
+		TypeDecl* td = (*others)[i];
+
+		if ( ! td->FindAttr(ATTR_DEFAULT) && ! td->FindAttr(ATTR_OPTIONAL) )
+			return "extension field must be &optional or have &default";
+
+		if ( log )
+			{
+			if ( ! td->attrs )
+				td->attrs = new Attributes(new attr_list, td->type);
+
+			td->attrs->AddAttr(new Attr(ATTR_LOG));
+			}
+
+		types->append(td);
+		}
+
+	delete others;
+
+	num_fields = types->length();
+	return 0;
+	}
+
 void RecordType::DescribeFields(ODesc* d) const
 	{
 	if ( d->IsReadable() )

src/Type.h

@@ -437,6 +437,10 @@ public:
 
 	int NumFields() const			{ return num_fields; }
 
+	// Returns 0 if all is ok, otherwise a pointer to an error message. Takes
+	// ownership of list.
+	const char* AddFields(type_decl_list* types, attr_list* attr);
+
 	void Describe(ODesc* d) const;
 	void DescribeFields(ODesc* d) const;
 

src/parse.y

@@ -862,7 +862,25 @@ decl:
 		'{' { parser_redef_enum($3); } enum_body '}' ';'
 			{ /* no action */ }
 
-	|	TOK_TYPE def_global_id ':' refined_type opt_attr ';'
+	|	TOK_REDEF TOK_RECORD global_id TOK_ADD_TO
+			'{' type_decl_list '}' opt_attr ';'
+			{
+			if ( ! $3->Type() )
+				$3->Error("unknown identifier");
+			else
+				{
+				RecordType* add_to = $3->Type()->AsRecordType();
+				if ( ! add_to )
+					$3->Error("not a record type");
+				else {
+					const char* error = add_to->AddFields($6, $8);
+					if ( error )
+    					$3->Error(error);
+				}
+			}
+    	}
+
+	|	TOK_TYPE global_id ':' refined_type opt_attr ';'
 			{
 			add_type($2, $4, $5, 0);
 			}

testing/btest/Baseline/logging.attr-extend/ssh.log

@@ -0,0 +1,2 @@
+# status	country	a1	b1	b2
+success	unknown	1	3	4

testing/btest/logging/attr-extend.bro

@@ -15,14 +15,14 @@ export {
 	};
 }
 
-redef Log += record {
-	a1: count &log;
-	a2: count;
+redef record Log += {
+	a1: count &log &optional;
+	a2: count &optional;
 };
 
-redef Log += record {
-	b1: count;
-	b2: count;
+redef record Log += {
+	b1: count &optional;
+	b2: count &optional;
 } &log;
 
 
@@ -32,6 +32,6 @@ event bro_init()
 
     local cid = [$orig_h=1.2.3.4, $orig_p=1234/tcp, $resp_h=2.3.4.5, $resp_p=80/tcp];
 
-	Log::write(SSH, [$t=network_time(), $id=cid, $status="success", a1=1, a2=2, a3=3, a4=4]);
+	Log::write(SSH, [$t=network_time(), $id=cid, $status="success", $a1=1, $a2=2, $b1=3, $b2=4]);
 }
 

testing/rec.bro

@@ -0,0 +1,17 @@
+# @TEST-EXEC: bro %INPUT >output
+# @TEST-EXEC: btest-diff output
+
+type Foo: record {
+        a: count;
+        b: count &optional;
+};
+
+redef record Foo += {
+        c: count &default=42;
+        d: count &optional;
+};
+
+global f: Foo = [$a=21];
+
+print f;
+

testing/rec2.bro

@@ -0,0 +1,17 @@
+# @TEST-EXEC: bro %INPUT >output
+# @TEST-EXEC: btest-diff output
+
+type Foo: record {
+        a: count;
+        b: count &optional;
+};
+
+redef record Foo += {
+        c: count &default=42;
+        d: string &optional;
+};
+
+global f: Foo = [$a=21, $d="XXX"];
+
+print f;
+

testing/wrong-rec.bro

@@ -0,0 +1,13 @@
+# @TEST-EXEC-FAIL: bro %INPUT >output 2>&1
+# @TEST-EXEC: btest-diff output
+
+type Foo: record {
+        a: count;
+        b: count &optional;
+};
+
+redef record Foo += {
+        c: count;
+        d: string &optional;
+};
+