Change code base to Nicira's for-nox/0.4 branch
Remove monolithic OpenFlow switch. Add userspace datapath. Fix BUG#13: Revise check wildcards for in_port != out_port output validation. Fix BUG#30: Made use of get_jiffies_64 instead of jiffies. Fix BUG#31: Fix NetFPGA crash in case of test_delete test harness run. Fix BUG#32: Add stack depth limitation to avoid inifinite loop in log_backtrace. Fix BUG#33: Improve NetFPGA kernel extension and NetFPGA image to support MAC address rewrite features (two actions) on NetFPGA enabled OpenFlow switch. Fix BUG#34: Add NetFPGA kernel extension source codes to create distribution package with NetFPGA correctly. Fix BUG#38: Improve regression test for FLOW_MOD ACTION SET_DL_SRC and SET_DL_DST. Fix BUG#39: Correct misunderstanding of byte order ops for OFPAT_XXX.
This commit is contained in:
+23
-1
@@ -94,6 +94,12 @@ ds_put_char_multiple(struct ds *ds, char c, size_t n)
|
||||
memset(ds_put_uninit(ds, n), c, n);
|
||||
}
|
||||
|
||||
void
|
||||
ds_put_buffer(struct ds *ds, const char *s, size_t n)
|
||||
{
|
||||
memcpy(ds_put_uninit(ds, n), s, n);
|
||||
}
|
||||
|
||||
void
|
||||
ds_put_cstr(struct ds *ds, const char *s)
|
||||
{
|
||||
@@ -172,13 +178,29 @@ ds_put_strftime(struct ds *ds, const char *template, const struct tm *tm)
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
ds_get_line(struct ds *ds, FILE *file)
|
||||
{
|
||||
ds_clear(ds);
|
||||
for (;;) {
|
||||
int c = getc(file);
|
||||
if (c == EOF) {
|
||||
return ds->length ? 0 : EOF;
|
||||
} else if (c == '\n') {
|
||||
return 0;
|
||||
} else {
|
||||
ds_put_char(ds, c);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
char *
|
||||
ds_cstr(struct ds *ds)
|
||||
{
|
||||
if (!ds->string) {
|
||||
ds_reserve(ds, 0);
|
||||
ds->string[0] = '\0';
|
||||
}
|
||||
ds->string[ds->length] = '\0';
|
||||
return ds->string;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user