Skip to content

Commit ef95ea7

Browse files
committed
Track the wolfIP struct ll rename and pin wolfIP to its v1.0 release
1 parent f7520fb commit ef95ea7

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

fullstack/freertos-wolfip-wolfssl-https/setup.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ if [ ! -d "wolfssl" ]; then
3030
fi
3131

3232
if [ ! -d "wolfip" ]; then
33-
git clone --depth=1 https://github.com/wolfSSL/wolfip.git
33+
# pinned: wolfSSL is what this repo demonstrates, so wolfIP churn should not
34+
# decide whether the example builds
35+
git clone --depth=1 --branch v1.0 https://github.com/wolfSSL/wolfip.git
3436
cd wolfip
3537
make
3638
cd ..

fullstack/freertos-wolfip-wolfssl-https/src/wolfip_freertos.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static TaskHandle_t g_network_task = NULL;
5959
static int tap_fd = -1;
6060

6161
/* TUN/TAP device functions */
62-
static int tap_init(struct ll *dev, const char *ifname) {
62+
static int tap_init(struct wolfIP_ll_dev *dev, const char *ifname) {
6363
struct ifreq ifr;
6464
int sock_fd;
6565

@@ -114,7 +114,7 @@ static int tap_init(struct ll *dev, const char *ifname) {
114114
return 0;
115115
}
116116

117-
static int tap_poll(struct ll *ll, void *buf, uint32_t len) {
117+
static int tap_poll(struct wolfIP_ll_dev *ll, void *buf, uint32_t len) {
118118
struct pollfd pfd;
119119
int ret;
120120

@@ -140,7 +140,7 @@ static int tap_poll(struct ll *ll, void *buf, uint32_t len) {
140140
return ret;
141141
}
142142

143-
static int tap_send(struct ll *ll, void *buf, uint32_t len) {
143+
static int tap_send(struct wolfIP_ll_dev *ll, void *buf, uint32_t len) {
144144
return write(tap_fd, buf, len);
145145
}
146146

@@ -160,7 +160,7 @@ static void wolfIP_NetworkTask(void *pvParameters) {
160160
}
161161

162162
int wolfIP_FreeRTOS_Init(void) {
163-
struct ll *tapdev;
163+
struct wolfIP_ll_dev *tapdev;
164164

165165
/* Initialize wolfIP */
166166
wolfIP_init_static(&g_wolfip);

0 commit comments

Comments
 (0)