git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop message about short Ethernet frames entirely.
[sliver-openvswitch.git]
/
secchan
/
status.c
diff --git
a/secchan/status.c
b/secchan/status.c
index
be4f86b
..
8b6224c
100644
(file)
--- a/
secchan/status.c
+++ b/
secchan/status.c
@@
-38,9
+38,9
@@
#include <errno.h>
#include <unistd.h>
#include "dynamic-string.h"
#include <errno.h>
#include <unistd.h>
#include "dynamic-string.h"
-#include "nicira-ext.h"
+#include "
openflow/
nicira-ext.h"
#include "ofpbuf.h"
#include "ofpbuf.h"
-#include "openflow.h"
+#include "openflow
/openflow
.h"
#include "rconn.h"
#include "timeval.h"
#include "vconn.h"
#include "rconn.h"
#include "timeval.h"
#include "vconn.h"
@@
-57,8
+57,8
@@
struct switch_status_category {
struct switch_status {
const struct settings *s;
time_t booted;
struct switch_status {
const struct settings *s;
time_t booted;
- struct switch_status_category
categories[8]
;
- int n_categories;
+ struct switch_status_category
*categories
;
+ int n_categories
, allocated_categories
;
};
struct status_reply {
};
struct status_reply {
@@
-190,12
+190,16
@@
switch_status_start(struct secchan *secchan, const struct settings *s,
void
switch_status_register_category(struct switch_status *ss,
const char *category,
void
switch_status_register_category(struct switch_status *ss,
const char *category,
- void (*cb)(struct status_reply *,
- void *aux),
+ void (*cb)(struct status_reply *, void *aux),
void *aux)
{
struct switch_status_category *c;
void *aux)
{
struct switch_status_category *c;
- assert(ss->n_categories < ARRAY_SIZE(ss->categories));
+ if (ss->n_categories >= ss->allocated_categories) {
+ ss->allocated_categories = 1 + ss->allocated_categories * 2;
+ ss->categories = xrealloc(ss->categories,
+ (sizeof *ss->categories
+ * ss->allocated_categories));
+ }
c = &ss->categories[ss->n_categories++];
c->cb = cb;
c->aux = aux;
c = &ss->categories[ss->n_categories++];
c->cb = cb;
c->aux = aux;