proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 16:04:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "lib: add ringbuf socket read function"

Browse Source 
This reverts commit d9d7af1a52.
This commit is contained in:
Quentin Young 2021-04-26 18:42:19 -04:00
parent fe2e3bae6a
commit 6c55ee964e
2 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/ringbuf.c
View File

@ -131,38 +131,3 @@ void ringbuf_wipe(struct ringbuf *buf)
memset(buf->data, 0x00, buf->size);
ringbuf_reset(buf);
}
ssize_t ringbuf_read(struct ringbuf *buf, int sock)
{
size_t to_read = ringbuf_space(buf);
size_t bytes_to_end = buf->size - buf->end;
ssize_t bytes_read;
struct iovec iov[2] = {};
/* Calculate amount of read blocks. */
if (to_read > bytes_to_end) {
iov[0].iov_base = buf->data + buf->end;
iov[0].iov_len = bytes_to_end;
iov[1].iov_base = buf->data;
iov[1].iov_len = to_read - bytes_to_end;
} else {
iov[0].iov_base = buf->data + buf->end;
iov[0].iov_len = to_read;
}
/* Do the system call. */
bytes_read = readv(sock, iov, 2);
if (bytes_read <= 0)
return bytes_read;
/* Calculate the new end. */
if ((size_t)bytes_read > bytes_to_end)
buf->end = bytes_read - bytes_to_end;
else
buf->end += bytes_read;
/* Set emptiness state. */
buf->empty = (buf->start == buf->end) && (buf->empty && !bytes_read);
return bytes_read;
}

11
lib/ringbuf.h
View File

@ -126,17 +126,6 @@ void ringbuf_reset(struct ringbuf *buf);
*/
void ringbuf_wipe(struct ringbuf *buf);
/**
* Perform a socket/file `read()` in to the ring buffer.
*
* \param buf the ring buffer pointer.
* \param sock the file descriptor.
* \returns the number of bytes read, `0` on connection close or `-1` with
* `errno` pointing the error (see `readv()` man page for more
* information.)
*/
ssize_t ringbuf_read(struct ringbuf *buf, int sock);
#ifdef __cplusplus
}
#endif