Skip to content

Commit 3102bb1

Browse files
author
Mika Leppänen
committed
Removed pbuf operations that were commented out
1 parent a2df462 commit 3102bb1

File tree

11 files changed

+0
-82
lines changed

11 files changed

+0
-82
lines changed

‎features/netsocket/ppp/source/chap-new.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,10 @@ static void chap_timeout(void *arg) {
237237
}
238238

239239
p = ppp_memory_buffer_allocate(pcb->netif->memory_manager, (u16_t)(pcb->chap_server.challenge_pktlen), PPP_BUF_HEAP);
240-
//p = pbuf_alloc(PBUF_RAW, (u16_t)(pcb->chap_server.challenge_pktlen), PPP_CTRL_PBUF_TYPE);
241240
if(NULL == p)
242241
return;
243242
if(p->tot_len != p->len) {
244243
ppp_memory_buffer_free(p);
245-
//pbuf_free(p);
246244
return;
247245
}
248246
MEMCPY(p->payload, pcb->chap_server.challenge, pcb->chap_server.challenge_pktlen);
@@ -348,12 +346,10 @@ static void chap_handle_response(ppp_pcb *pcb, int id,
348346
mlen = strlen(message);
349347
len = CHAP_HDRLEN + mlen;
350348
p = ppp_memory_buffer_allocate(pcb->netif->memory_manager, (u16_t)(PPP_HDRLEN +len), PPP_BUF_HEAP);
351-
//p = pbuf_alloc(PBUF_RAW, (u16_t)(PPP_HDRLEN +len), PPP_CTRL_PBUF_TYPE);
352349
if(NULL == p)
353350
return;
354351
if(p->tot_len != p->len) {
355352
ppp_memory_buffer_free(p);
356-
//pbuf_free(p);
357353
return;
358354
}
359355

@@ -446,12 +442,10 @@ static void chap_respond(ppp_pcb *pcb, int id,
446442
char secret[MAXSECRETLEN+1];
447443

448444
p = ppp_memory_buffer_allocate(pcb->netif->memory_manager, (u16_t)(RESP_MAX_PKTLEN), PPP_BUF_HEAP);
449-
//p = pbuf_alloc(PBUF_RAW, (u16_t)(RESP_MAX_PKTLEN), PPP_CTRL_PBUF_TYPE);
450445
if(NULL == p)
451446
return;
452447
if(p->tot_len != p->len) {
453448
ppp_memory_buffer_free(p);
454-
//pbuf_free(p);
455449
return;
456450
}
457451

‎features/netsocket/ppp/source/eap.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,10 @@ static void eap_send_failure(ppp_pcb *pcb) {
252252
u_char *outp;
253253

254254
p = ppp_memory_buffer_allocate(pcb->netif->memory_manager, (u16_t)(PPP_HDRLEN + EAP_HEADERLEN), PPP_BUF_HEAP);
255-
//p = pbuf_alloc(PBUF_RAW, (u16_t)(PPP_HDRLEN + EAP_HEADERLEN), PPP_CTRL_PBUF_TYPE);
256255
if(NULL == p)
257256
return;
258257
if(p->tot_len != p->len) {
259258
ppp_memory_buffer_free(p);
260-
//pbuf_free(p);
261259
return;
262260
}
263261

@@ -285,12 +283,10 @@ static void eap_send_success(ppp_pcb *pcb) {
285283
u_char *outp;
286284

287285
p = ppp_memory_buffer_allocate(pcb->netif->memory_manager, (u16_t)(PPP_HDRLEN + EAP_HEADERLEN), PPP_BUF_HEAP);
288-
//p = pbuf_alloc(PBUF_RAW, (u16_t)(PPP_HDRLEN + EAP_HEADERLEN), PPP_CTRL_PBUF_TYPE);
289286
if(NULL == p)
290287
return;
291288
if(p->tot_len != p->len) {
292289
ppp_memory_buffer_free(p);
293-
//pbuf_free(p);
294290
return;
295291
}
296292

@@ -688,12 +684,10 @@ static void eap_send_request(ppp_pcb *pcb) {
688684
}
689685

690686
p = ppp_memory_buffer_allocate(pcb->netif->memory_manager, (u16_t)(PPP_CTRL_PBUF_MAX_SIZE), PPP_BUF_HEAP);
691-
//p = pbuf_alloc(PBUF_RAW, (u16_t)(PPP_CTRL_PBUF_MAX_SIZE), PPP_CTRL_PBUF_TYPE);
692687
if(NULL == p)
693688
return;
694689
if(p->tot_len != p->len) {
695690
ppp_memory_buffer_free(p);
696-
//pbuf_free(p);
697691
return;
698692
}
699693

@@ -1025,12 +1019,10 @@ static void eap_send_response(ppp_pcb *pcb, u_char id, u_char typenum, const u_c
10251019

10261020
msglen = EAP_HEADERLEN + sizeof (u_char) + lenstr;
10271021
p = ppp_memory_buffer_allocate(pcb->netif->memory_manager, (u16_t)(PPP_HDRLEN + msglen), PPP_BUF_HEAP);
1028-
//p = pbuf_alloc(PBUF_RAW, (u16_t)(PPP_HDRLEN + msglen), PPP_CTRL_PBUF_TYPE);
10291022
if(NULL == p)
10301023
return;
10311024
if(p->tot_len != p->len) {
10321025
ppp_memory_buffer_free(p);
1033-
//pbuf_free(p);
10341026
return;
10351027
}
10361028

@@ -1061,12 +1053,10 @@ static void eap_chap_response(ppp_pcb *pcb, u_char id, u_char *hash, const char
10611053
msglen = EAP_HEADERLEN + 2 * sizeof (u_char) + MD5_SIGNATURE_SIZE +
10621054
namelen;
10631055
p = ppp_memory_buffer_allocate(pcb->netif->memory_manager, (u16_t)(PPP_HDRLEN + msglen), PPP_BUF_HEAP);
1064-
//p = pbuf_alloc(PBUF_RAW, (u16_t)(PPP_HDRLEN + msglen), PPP_CTRL_PBUF_TYPE);
10651056
if(NULL == p)
10661057
return;
10671058
if(p->tot_len != p->len) {
10681059
ppp_memory_buffer_free(p);
1069-
//pbuf_free(p);
10701060
return;
10711061
}
10721062

@@ -1108,12 +1098,10 @@ int lenstr;
11081098

11091099
msglen = EAP_HEADERLEN + 2 * sizeof (u_char) + lenstr;
11101100
p = ppp_memory_buffer_allocate(pcb->netif->memory_manager, (u16_t)(PPP_HDRLEN + msglen), PPP_BUF_HEAP);
1111-
//p = pbuf_alloc(PBUF_RAW, (u16_t)(PPP_HDRLEN + msglen), PPP_CTRL_PBUF_TYPE);
11121101
if(NULL == p)
11131102
return;
11141103
if(p->tot_len != p->len) {
11151104
ppp_memory_buffer_free(p);
1116-
//pbuf_free(p);
11171105
return;
11181106
}
11191107

@@ -1152,12 +1140,10 @@ u_char *str;
11521140
msglen = EAP_HEADERLEN + 2 * sizeof (u_char) + sizeof (u32_t) +
11531141
SHA_DIGESTSIZE;
11541142
p = ppp_memory_buffer_allocate(pcb->netif->memory_manager, (u16_t)(PPP_HDRLEN + msglen), PPP_BUF_HEAP);
1155-
//p = pbuf_alloc(PBUF_RAW, (u16_t)(PPP_HDRLEN + msglen), PPP_CTRL_PBUF_TYPE);
11561143
if(NULL == p)
11571144
return;
11581145
if(p->tot_len != p->len) {
11591146
ppp_memory_buffer_free(p);
1160-
//pbuf_free(p);
11611147
return;
11621148
}
11631149

@@ -1185,12 +1171,10 @@ static void eap_send_nak(ppp_pcb *pcb, u_char id, u_char type) {
11851171

11861172
msglen = EAP_HEADERLEN + 2 * sizeof (u_char);
11871173
p = ppp_memory_buffer_allocate(pcb->netif->memory_manager, (u16_t)(PPP_HDRLEN + msglen), PPP_BUF_HEAP);
1188-
//p = pbuf_alloc(PBUF_RAW, (u16_t)(PPP_HDRLEN + msglen), PPP_CTRL_PBUF_TYPE);
11891174
if(NULL == p)
11901175
return;
11911176
if(p->tot_len != p->len) {
11921177
ppp_memory_buffer_free(p);
1193-
//pbuf_free(p);
11941178
return;
11951179
}
11961180

‎features/netsocket/ppp/source/fsm.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -736,12 +736,10 @@ static void fsm_sconfreq(fsm *f, int retransmit) {
736736
cilen = 0;
737737

738738
p = ppp_memory_buffer_allocate(pcb->netif->memory_manager, cilen + HEADERLEN + PPP_HDRLEN, PPP_BUF_HEAP);
739-
//p = pbuf_alloc(PBUF_RAW, (u16_t)(cilen + HEADERLEN + PPP_HDRLEN), PPP_CTRL_PBUF_TYPE);
740739
if(NULL == p)
741740
return;
742741
if(p->tot_len != p->len) {
743742
ppp_memory_buffer_free(p);
744-
//pbuf_free(p);
745743
return;
746744
}
747745

@@ -782,13 +780,11 @@ void fsm_sdata(fsm *f, u_char code, u_char id, const u_char *data, int datalen)
782780
outlen = datalen + HEADERLEN;
783781

784782
p = ppp_memory_buffer_allocate(pcb->netif->memory_manager, (u16_t)(outlen + PPP_HDRLEN), PPP_BUF_HEAP);
785-
//p = pbuf_alloc(PBUF_RAW, (u16_t)(outlen + PPP_HDRLEN), PPP_CTRL_PBUF_TYPE);
786783

787784
if(NULL == p)
788785
return;
789786
if(p->tot_len != p->len) {
790787
ppp_memory_buffer_free(p);
791-
//pbuf_free(p);
792788
return;
793789
}
794790
outp = (u_char*)p->payload;

‎features/netsocket/ppp/source/lcp.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1846,12 +1846,10 @@ static int lcp_reqci(fsm *f, u_char *inp, int *lenp, int reject_if_disagree) {
18461846
next = inp;
18471847

18481848
nakp = ppp_memory_buffer_allocate(pcb->netif->memory_manager, PPP_CTRL_PBUF_MAX_SIZE, PPP_BUF_HEAP);
1849-
//nakp = pbuf_alloc(PBUF_RAW, (u16_t)(PPP_CTRL_PBUF_MAX_SIZE), PPP_CTRL_PBUF_TYPE);
18501849
if(NULL == nakp)
18511850
return 0;
18521851
if(nakp->tot_len != nakp->len) {
18531852
ppp_memory_buffer_free(nakp);
1854-
//pbuf_free(nakp);
18551853
return 0;
18561854
}
18571855

@@ -2285,7 +2283,6 @@ static int lcp_reqci(fsm *f, u_char *inp, int *lenp, int reject_if_disagree) {
22852283
}
22862284

22872285
ppp_memory_buffer_free(nakp);
2288-
//pbuf_free(nakp);
22892286
LCPDEBUG(("lcp_reqci: returning CONF%s.", CODENAME(rc)));
22902287
return (rc); /* Return final code */
22912288
}

‎features/netsocket/ppp/source/mppe.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ mppe_compress(ppp_pcb *pcb, ppp_mppe_state *state, struct pbuf **pb, u16_t proto
200200
* the whole packet before encryption.
201201
*/
202202
np = ppp_memory_buffer_allocate(pcb->netif->memory_manager, MPPE_OVHD + sizeof(protocol) + (*pb)->tot_len, PPP_BUF_HEAP);
203-
//np = pbuf_alloc(PBUF_RAW, MPPE_OVHD + sizeof(protocol) + (*pb)->tot_len, PBUF_RAM);
204203
if (!np) {
205204
return ERR_MEM;
206205
}
@@ -210,7 +209,6 @@ mppe_compress(ppp_pcb *pcb, ppp_mppe_state *state, struct pbuf **pb, u16_t proto
210209

211210
if ((err = pbuf_copy(np, *pb)) != ERR_OK) {
212211
ppp_memory_buffer_free(np);
213-
//pbuf_free(np);
214212
return err;
215213
}
216214

‎features/netsocket/ppp/source/ppp.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,6 @@ static err_t ppp_netif_output(struct netif *netif, struct pbuf *pb, u16_t protoc
553553
/* if VJ compressor returned a new allocated pbuf, free it */
554554
if (fpb) {
555555
ppp_memory_buffer_free(fpb);
556-
//pbuf_free(fpb);
557556
}
558557
/* mppe_compress() returns a new allocated pbuf, indicate we should free
559558
* our duplicated pbuf later */
@@ -578,7 +577,6 @@ static err_t ppp_netif_output(struct netif *netif, struct pbuf *pb, u16_t protoc
578577
err:
579578
if (fpb) {
580579
ppp_memory_buffer_free(fpb);
581-
//pbuf_free(fpb);
582580
}
583581
return err;
584582
}
@@ -955,7 +953,6 @@ void ppp_input(ppp_pcb *pcb, struct pbuf *pb) {
955953

956954
out:
957955
ppp_memory_buffer_free(pb);
958-
//pbuf_free(pb);
959956
}
960957

961958
/*

‎features/netsocket/ppp/source/pppoe.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,11 @@ static err_t pppoe_write(ppp_pcb *ppp, void *ctx, struct pbuf *p) {
207207
pbuf_remove_header(p, 2);
208208

209209
ph = ppp_memory_buffer_allocate(ppp->netif->memory_manager, (u16_t)(PPPOE_HEADERLEN), PPP_BUF_HEAP);
210-
//ph = pbuf_alloc(PBUF_LINK, (u16_t)(PPPOE_HEADERLEN), PBUF_RAM);
211210
if(!ph) {
212211
LINK_STATS_INC(link.memerr);
213212
LINK_STATS_INC(link.proterr);
214213
MIB2_STATS_NETIF_INC(ppp->netif, ifoutdiscards);
215214
ppp_memory_buffer_free(p);
216-
//pbuf_free(p);
217215
return ERR_MEM;
218216
}
219217

@@ -250,7 +248,6 @@ static err_t pppoe_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short
250248

251249
/* @todo: try to use pbuf_header() here! */
252250
pb = ppp_memory_buffer_allocate(ppp->netif->memory_manager, PPPOE_HEADERLEN + sizeof(protocol), PPP_BUF_HEAP);
253-
//pb = pbuf_alloc(PBUF_LINK, PPPOE_HEADERLEN + sizeof(protocol), PBUF_RAM);
254251
if(!pb) {
255252
LINK_STATS_INC(link.memerr);
256253
LINK_STATS_INC(link.proterr);
@@ -388,7 +385,6 @@ pppoe_disc_input(struct netif *netif, struct pbuf *pb)
388385
/* don't do anything if there is not a single PPPoE instance */
389386
if (pppoe_softc_list == NULL) {
390387
ppp_memory_buffer_free(pb);
391-
//pbuf_free(pb);
392388
return;
393389
}
394390

@@ -642,7 +638,6 @@ breakbreak:;
642638

643639
done:
644640
ppp_memory_buffer_free(pb);
645-
//pbuf_free(pb);
646641
return;
647642
}
648643

@@ -713,7 +708,6 @@ pppoe_data_input(struct netif *netif, struct pbuf *pb)
713708

714709
drop:
715710
ppp_memory_buffer_free(pb);
716-
//pbuf_free(pb);
717711
}
718712

719713
static err_t
@@ -729,7 +723,6 @@ pppoe_output(struct pppoe_softc *sc, struct pbuf *pb)
729723
PPPDEBUG(LOG_ERR, ("pppoe: %c%c%"U16_F": pppoe_output: could not allocate room for Ethernet header\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num));
730724
LINK_STATS_INC(link.lenerr);
731725
ppp_memory_buffer_free(pb);
732-
//pbuf_free(pb);
733726
return ERR_BUF;
734727
}
735728
ethhdr = (struct eth_hdr *)pb->payload;
@@ -747,7 +740,6 @@ pppoe_output(struct pppoe_softc *sc, struct pbuf *pb)
747740
res = sc->sc_ethif->linkoutput(sc->sc_ethif, pb);
748741

749742
ppp_memory_buffer_free(pb);
750-
//pbuf_free(pb);
751743

752744
return res;
753745
}
@@ -779,7 +771,6 @@ pppoe_send_padi(struct pppoe_softc *sc)
779771

780772
/* allocate a buffer */
781773
pb = ppp_memory_buffer_allocate(ppp->netif->memory_manager, (u16_t)(PPPOE_HEADERLEN + len), PPP_BUF_HEAP);
782-
//pb = pbuf_alloc(PBUF_LINK, (u16_t)(PPPOE_HEADERLEN + len), PBUF_RAM);
783774
if (!pb) {
784775
return ERR_MEM;
785776
}
@@ -1001,7 +992,6 @@ pppoe_send_padr(struct pppoe_softc *sc)
1001992
PPP_ASSERT("sizeof(struct eth_hdr) + PPPOE_HEADERLEN + len <= 0xffff",
1002993
sizeof(struct eth_hdr) + PPPOE_HEADERLEN + len <= 0xffff);
1003994
pb = ppp_memory_buffer_allocate(ppp->netif->memory_manager, (u16_t)(PPPOE_HEADERLEN + len), PPP_BUF_HEAP);
1004-
//pb = pbuf_alloc(PBUF_LINK, (u16_t)(PPPOE_HEADERLEN + len), PBUF_RAM);
1005995
if (!pb) {
1006996
return ERR_MEM;
1007997
}
@@ -1042,7 +1032,6 @@ pppoe_send_padt(struct netif *outgoing_if, u_int session, const u8_t *dest)
10421032
u8_t *p;
10431033

10441034
pb = ppp_memory_buffer_allocate(ppp->netif->memory_manager, (u16_t)(PPPOE_HEADERLEN), PPP_BUF_HEAP);
1045-
//pb = pbuf_alloc(PBUF_LINK, (u16_t)(PPPOE_HEADERLEN), PBUF_RAM);
10461035
if (!pb) {
10471036
return ERR_MEM;
10481037
}
@@ -1052,7 +1041,6 @@ pppoe_send_padt(struct netif *outgoing_if, u_int session, const u8_t *dest)
10521041
PPPDEBUG(LOG_ERR, ("pppoe: pppoe_send_padt: could not allocate room for PPPoE header\n"));
10531042
LINK_STATS_INC(link.lenerr);
10541043
ppp_memory_buffer_free(pb);
1055-
//pbuf_free(pb);
10561044
return ERR_BUF;
10571045
}
10581046
ethhdr = (struct eth_hdr *)pb->payload;
@@ -1066,7 +1054,6 @@ pppoe_send_padt(struct netif *outgoing_if, u_int session, const u8_t *dest)
10661054
res = outgoing_if->linkoutput(outgoing_if, pb);
10671055

10681056
ppp_memory_buffer_free(pb);
1069-
//pbuf_free(pb);
10701057

10711058
return res;
10721059
}
@@ -1086,7 +1073,6 @@ pppoe_send_pado(struct pppoe_softc *sc)
10861073
/* include hunique */
10871074
len += 2 + 2 + sc->sc_hunique_len;
10881075
pb = ppp_memory_buffer_allocate(ppp->netif->memory_manager, (u16_t)(PPPOE_HEADERLEN + len), PPP_BUF_HEAP);
1089-
//pb = pbuf_alloc(PBUF_LINK, (u16_t)(PPPOE_HEADERLEN + len), PBUF_RAM);
10901076
if (!pb) {
10911077
return ERR_MEM;
10921078
}
@@ -1120,7 +1106,6 @@ pppoe_send_pads(struct pppoe_softc *sc)
11201106
len += l1;
11211107
}
11221108
pb = ppp_memory_buffer_allocate(ppp->netif->memory_manager, (u16_t)(PPPOE_HEADERLEN + len), PPP_BUF_HEAP);
1123-
//pb = pbuf_alloc(PBUF_LINK, (u16_t)(PPPOE_HEADERLEN + len), PBUF_RAM);
11241109
if (!pb) {
11251110
return ERR_MEM;
11261111
}
@@ -1156,7 +1141,6 @@ pppoe_xmit(struct pppoe_softc *sc, struct pbuf *pb)
11561141
PPPDEBUG(LOG_ERR, ("pppoe: %c%c%"U16_F": pppoe_xmit: could not allocate room for PPPoE header\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num));
11571142
LINK_STATS_INC(link.lenerr);
11581143
ppp_memory_buffer_free(pb);
1159-
//pbuf_free(pb);
11601144
return ERR_BUF;
11611145
}
11621146

0 commit comments

Comments
 (0)