projects
/
openvswitch
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c572b9a
)
Use make_openflow() function to simplify send_features_request().
author
Ben Pfaff
<blp@nicira.com>
Mon, 18 Aug 2008 20:57:14 +0000
(13:57 -0700)
committer
Ben Pfaff
<blp@nicira.com>
Thu, 4 Sep 2008 21:24:45 +0000
(14:24 -0700)
lib/learning-switch.c
patch
|
blob
|
history
diff --git
a/lib/learning-switch.c
b/lib/learning-switch.c
index f056b91610718e12aef3fc7e54c46c6db46485bd..d231e3863ad87b1f7b6e8b97a1a1e30481172b5b 100644
(file)
--- a/
lib/learning-switch.c
+++ b/
lib/learning-switch.c
@@
-159,25
+159,14
@@
send_features_request(struct lswitch *sw, struct rconn *rconn)
time_t now = time_now();
if (now >= sw->last_features_request + 1) {
struct buffer *b;
time_t now = time_now();
if (now >= sw->last_features_request + 1) {
struct buffer *b;
- struct ofp_header *ofr;
struct ofp_switch_config *osc;
/* Send OFPT_FEATURES_REQUEST. */
struct ofp_switch_config *osc;
/* Send OFPT_FEATURES_REQUEST. */
- b = buffer_new(0);
- ofr = buffer_put_uninit(b, sizeof *ofr);
- memset(ofr, 0, sizeof *ofr);
- ofr->type = OFPT_FEATURES_REQUEST;
- ofr->version = OFP_VERSION;
- ofr->length = htons(sizeof *ofr);
+ make_openflow(sizeof(struct ofp_header), OFPT_FEATURES_REQUEST, &b);
queue_tx(sw, rconn, b);
/* Send OFPT_SET_CONFIG. */
queue_tx(sw, rconn, b);
/* Send OFPT_SET_CONFIG. */
- b = buffer_new(0);
- osc = buffer_put_uninit(b, sizeof *osc);
- memset(osc, 0, sizeof *osc);
- osc->header.type = OFPT_SET_CONFIG;
- osc->header.version = OFP_VERSION;
- osc->header.length = htons(sizeof *osc);
+ osc = make_openflow(sizeof *osc, OFPT_SET_CONFIG, &b);
osc->flags = htons(OFPC_SEND_FLOW_EXP);
osc->miss_send_len = htons(OFP_DEFAULT_MISS_SEND_LEN);
queue_tx(sw, rconn, b);
osc->flags = htons(OFPC_SEND_FLOW_EXP);
osc->miss_send_len = htons(OFP_DEFAULT_MISS_SEND_LEN);
queue_tx(sw, rconn, b);