sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-20 03:55:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'holger/strings'

Browse Source
This commit is contained in:
Michael Brown
2007-08-23 21:51:57 +01:00
parent 01b755704a f92096d180
commit 746d0f8feb
14 changed files with 353 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/net/ipv4.c
View File

@@ -39,10 +39,9 @@ static LIST_HEAD ( frag_buffers );
* @v gateway Gateway address (or @c INADDR_NONE for no gateway)
* @ret miniroute Routing table entry, or NULL
*/
static struct ipv4_miniroute * add_ipv4_miniroute ( struct net_device *netdev,
struct in_addr address,
struct in_addr netmask,
struct in_addr gateway ) {
static struct ipv4_miniroute * __malloc
add_ipv4_miniroute ( struct net_device *netdev, struct in_addr address,
struct in_addr netmask, struct in_addr gateway ) {
struct ipv4_miniroute *miniroute;
DBG ( "IPv4 add %s", inet_ntoa ( address ) );

9
src/net/ipv6.c
View File

@@ -52,11 +52,10 @@ static LIST_HEAD ( miniroutes );
* @v gateway Gateway address (or ::0 for no gateway)
* @ret miniroute Routing table entry, or NULL
*/
static struct ipv6_miniroute * add_ipv6_miniroute ( struct net_device *netdev,
struct in6_addr prefix,
int prefix_len,
struct in6_addr address,
struct in6_addr gateway ) {
static struct ipv6_miniroute * __malloc
add_ipv6_miniroute ( struct net_device *netdev, struct in6_addr prefix,
int prefix_len, struct in6_addr address,
struct in6_addr gateway ) {
struct ipv6_miniroute *miniroute;
miniroute = malloc ( sizeof ( *miniroute ) );

2
src/net/tls.c
View File

@@ -1044,7 +1044,7 @@ static void tls_hmac ( struct tls_session *tls __unused,
* @ret plaintext_len Length of plaintext record
* @ret plaintext Allocated plaintext record
*/
static void * tls_assemble_stream ( struct tls_session *tls,
static void * __malloc tls_assemble_stream ( struct tls_session *tls,
const void *data, size_t len,
void *digest, size_t *plaintext_len ) {
size_t mac_len = tls->tx_cipherspec.digest->digestsize;