mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-29 15:28:56 +00:00
Code Issues Releases Wiki Activity

pktbuf: Directly use pointers in pktbuf_save().

Browse Source 
In future patches, directly using a void * pointer in the
pktbuf_save() definition will simplify the code.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
This commit is contained in:
Ethan Jackson
2012-01-03 10:27:04 -08:00
parent c499c75db6
commit ec14ac2685
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ofproto/connmgr.c
View File

@@ -1210,7 +1210,8 @@ schedule_packet_in(struct ofconn *ofconn, struct ofputil_packet_in pin,
} else if (!ofconn->pktbuf) {
pin.buffer_id = UINT32_MAX;
} else {
pin.buffer_id = pktbuf_save(ofconn->pktbuf, pin.packet, flow->in_port);
pin.buffer_id = pktbuf_save(ofconn->pktbuf, pin.packet->data,
pin.packet->size, flow->in_port);
}
/* Figure out how much of the packet to send. */

15
ofproto/pktbuf.c
View File

@@ -92,8 +92,9 @@ make_id(unsigned int buffer_idx, unsigned int cookie)
}
/* Attempts to allocate an OpenFlow packet buffer id within 'pb'. The packet
* buffer will store a copy of 'buffer' and the port number 'in_port', which
* should be the datapath port number on which 'buffer' was received.
* buffer will store a copy of 'buffer_size' bytes in 'buffer' and the port
* number 'in_port', which should be the OpenFlow port number on which 'buffer'
* was received.
*
* If successful, returns the packet buffer id (a number other than
* UINT32_MAX). pktbuf_retrieve() can later be used to retrieve the buffer and
@@ -102,7 +103,8 @@ make_id(unsigned int buffer_idx, unsigned int cookie)
*
* The caller retains ownership of 'buffer'. */
uint32_t
pktbuf_save(struct pktbuf *pb, struct ofpbuf *buffer, uint16_t in_port)
pktbuf_save(struct pktbuf *pb, const void *buffer, size_t buffer_size,
uint16_t in_port)
{
struct packet *p = &pb->packets[pb->buffer_idx];
pb->buffer_idx = (pb->buffer_idx + 1) & PKTBUF_MASK;
@@ -117,9 +119,10 @@ pktbuf_save(struct pktbuf *pb, struct ofpbuf *buffer, uint16_t in_port)
if (++p->cookie >= COOKIE_MAX) {
p->cookie = 0;
}
p->buffer = ofpbuf_new_with_headroom(buffer->size,
sizeof(struct ofp_packet_in));
ofpbuf_put(p->buffer, buffer->data, buffer->size);
p->buffer = ofpbuf_clone_data_with_headroom(buffer, buffer_size,
sizeof(struct ofp_packet_in));
p->timeout = time_msec() + OVERWRITE_MSECS;
p->in_port = in_port;
return make_id(p - pb->packets, p->cookie);

4
ofproto/pktbuf.h
View File

@@ -17,6 +17,7 @@
#ifndef PKTBUF_H
#define PKTBUF_H 1
#include <stddef.h>
#include <stdint.h>
struct pktbuf;
@@ -26,7 +27,8 @@ int pktbuf_capacity(void);
struct pktbuf *pktbuf_create(void);
void pktbuf_destroy(struct pktbuf *);
uint32_t pktbuf_save(struct pktbuf *, struct ofpbuf *buffer, uint16_t in_port);
uint32_t pktbuf_save(struct pktbuf *, const void *buffer, size_t buffer_size,
uint16_t in_port);
uint32_t pktbuf_get_null(void);
int pktbuf_retrieve(struct pktbuf *, uint32_t id, struct ofpbuf **bufferp,
uint16_t *in_port);