Fix whitespace errors in ppp.c and radius.c

diff --git a/ppp.c b/ppp.c
index 5dccf0d..e21c103 100644 (file)
--- a/ppp.c
+++ b/ppp.c
@@ -79,7 +79,7 @@ void processpap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
        if (session[s].ppp.phase != Authenticate)
        {
-               LOG(2, s, t, "PAP ignored in %s phase\n", ppp_phase(session[s].ppp.phase));
+               LOG(2, s, t, "PAP ignored in %s phase\n", ppp_phase(session[s].ppp.phase));
                return;
        }
 
@@ -194,7 +194,7 @@ void processchap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
        if (session[s].ppp.phase != Authenticate)
        {
-               LOG(2, s, t, "CHAP ignored in %s phase\n", ppp_phase(session[s].ppp.phase));
+               LOG(2, s, t, "CHAP ignored in %s phase\n", ppp_phase(session[s].ppp.phase));
                return;
        }
 
@@ -400,7 +400,7 @@ void lcp_open(sessionidt s, tunnelidt t)
                        sessionidt first_ses = bundle[session[s].bundle].members[0];
                        LOG(3, s, t, "MPPP: Skipping IPCP negotiation for session:%d, first session of bundle is:%d\n",s,first_ses);
                        ipcp_open(s, t);
-                }
+               }
        }
 }
 
@@ -440,7 +440,7 @@ static uint8_t *ppp_conf_nak(sessionidt s, uint8_t *buf, size_t blen, uint16_t m
        uint8_t **response, uint8_t *queued, uint8_t *packet, uint8_t *option,
        uint8_t *value, size_t vlen)
 {
-       int *nak_sent;
+       int *nak_sent;
        switch (mtype)
        {
        case PPPLCP:    nak_sent = &sess_local[s].lcp.nak_sent;    break;
@@ -451,7 +451,7 @@ static uint8_t *ppp_conf_nak(sessionidt s, uint8_t *buf, size_t blen, uint16_t m
 
        if (*response && **response != ConfigNak)
        {
-               if (*nak_sent < config->ppp_max_failure) // reject queued
+               if (*nak_sent < config->ppp_max_failure) // reject queued
                        return queued;
 
                return ppp_conf_rej(s, buf, blen, mtype, response, 0, packet, option);
@@ -459,7 +459,7 @@ static uint8_t *ppp_conf_nak(sessionidt s, uint8_t *buf, size_t blen, uint16_t m
 
        if (!*response)
        {
-               if (*nak_sent >= config->ppp_max_failure)
+               if (*nak_sent >= config->ppp_max_failure)
                        return ppp_conf_rej(s, buf, blen, mtype, response, 0, packet, option);
 
                queued = *response = makeppp(buf, blen, packet, 2, s, session[s].tunnel, mtype, 0, 0, 0);
@@ -577,13 +577,13 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                switch (session[s].ppp.lcp)
                {
                case RequestSent:
-                       initialise_restart_count(s, lcp);
+                       initialise_restart_count(s, lcp);
                        change_state(s, lcp, AckReceived);
                        break;
 
                case AckReceived:
                case Opened:
-                       LOG(2, s, t, "LCP: ConfigAck in state %s?  Sending ConfigReq\n", ppp_state(session[s].ppp.lcp));
+                       LOG(2, s, t, "LCP: ConfigAck in state %s?  Sending ConfigReq\n", ppp_state(session[s].ppp.lcp));
                        if (session[s].ppp.lcp == Opened)
                                lcp_restart(s);
 
@@ -596,7 +596,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                default:
-                       LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp));
+                       LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp));
                }
        }
        else if (*p == ConfigReq)
@@ -680,7 +680,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                                                        config->radius_authtypes != config->radius_authprefer)
                                                {
                                                        // alternate type
-                                                       alen = add_lcp_auth(authproto, sizeof(authproto), config->radius_authtypes & ~config->radius_authprefer);
+                                                       alen = add_lcp_auth(authproto, sizeof(authproto), config->radius_authtypes & ~config->radius_authprefer);
                                                        if (alen < 2) break;
                                                        q = ppp_conf_nak(s, b, sizeof(b), PPPLCP, &response, q, p, o, authproto + 2, alen - 2);
                                                }
@@ -787,7 +787,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                case Stopped:
-                       initialise_restart_count(s, lcp);
+                       initialise_restart_count(s, lcp);
                        sendlcp(s, t);
                        if (*response == ConfigAck)
                                change_state(s, lcp, AckSent);
@@ -809,7 +809,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                case Opened:
-                       lcp_restart(s);
+                       lcp_restart(s);
                        sendlcp(s, t);
                        /* fallthrough */
 
@@ -826,7 +826,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                default:
-                       LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp));
+                       LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp));
                        return;
                }
 
@@ -896,7 +896,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                                        else
                                        {
                                                LOG(2, s, t, "LCP: remote rejected auth negotiation\n");
-                                               authtype = 0; // shutdown
+                                               authtype = 0; // shutdown
                                        }
 
                                        break;
@@ -962,7 +962,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                                break;
 
                                default:
-                                       LOG(2, s, t, "LCP: remote sent %s for type %u?\n", ppp_code(*p), type);
+                                       LOG(2, s, t, "LCP: remote sent %s for type %u?\n", ppp_code(*p), type);
                                        sessionshutdown(s, "Unable to negotiate LCP.", CDN_ADMIN_DISC, TERM_USER_ERROR);
                                        return;
                        }
@@ -983,7 +983,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                {
                case Closed:
                case Stopped:
-                       {
+                       {
                                uint8_t *response = makeppp(b, sizeof(b), p, 2, s, t, PPPLCP, 0, 0, 0);
                                if (!response) return;
                                *response = TerminateAck;
@@ -998,22 +998,22 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
                case RequestSent:
                case AckSent:
-                       initialise_restart_count(s, lcp);
+                       initialise_restart_count(s, lcp);
                        sendlcp(s, t);
                        break;
 
                case AckReceived:
-                       LOG(2, s, t, "LCP: ConfigNak in state %s?  Sending ConfigReq\n", ppp_state(session[s].ppp.lcp));
+                       LOG(2, s, t, "LCP: ConfigNak in state %s?  Sending ConfigReq\n", ppp_state(session[s].ppp.lcp));
                        sendlcp(s, t);
                        break;
 
                case Opened:
-                       lcp_restart(s);
+                       lcp_restart(s);
                        sendlcp(s, t);
                        break;
 
                default:
-                       LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp));
+                       LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp));
                        return;
                }
        }
@@ -1028,16 +1028,16 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                case RequestSent:
                case AckReceived:
                case AckSent:
-                       break;
+                       break;
 
                case Opened:
-                       lcp_restart(s);
-                       zero_restart_count(s, lcp);
+                       lcp_restart(s);
+                       zero_restart_count(s, lcp);
                        change_state(s, lcp, Closing);
                        break;
 
                default:
-                       LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp));
+                       LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp));
                        return;
                }
 
@@ -1052,7 +1052,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
        }
        else if (*p == ProtocolRej)
        {
-               uint16_t proto = 0;
+               uint16_t proto = 0;
 
                if (l > 4)
                {
@@ -1182,24 +1182,24 @@ static void setepdis(epdist *ep1, epdist ep2)
 
 static bundleidt new_bundle()
 {
-        bundleidt i;
-        for (i = 1; i < MAXBUNDLE; i++)
-        {
-                if (bundle[i].state == BUNDLEFREE)
-                {
-                        LOG(4, 0, 0, "MPPP: Assigning bundle ID %d\n", i);
-                        bundle[i].num_of_links = 1;
-                        bundle[i].last_check = time_now;        // Initialize last_check value
-                        bundle[i].state = BUNDLEOPEN;
-                        bundle[i].current_ses = -1;     // This is to enforce the first session 0 to be used at first
+       bundleidt i;
+       for (i = 1; i < MAXBUNDLE; i++)
+       {
+               if (bundle[i].state == BUNDLEFREE)
+               {
+                       LOG(4, 0, 0, "MPPP: Assigning bundle ID %d\n", i);
+                       bundle[i].num_of_links = 1;
+                       bundle[i].last_check = time_now;        // Initialize last_check value
+                       bundle[i].state = BUNDLEOPEN;
+                       bundle[i].current_ses = -1;     // This is to enforce the first session 0 to be used at first
                        memset(&frag[i], 0, sizeof(fragmentationt));
-                        if (i > config->cluster_highest_bundleid)
-                                config->cluster_highest_bundleid = i;
-                        return i;
-                }
-        }
-        LOG(0, 0, 0, "MPPP: Can't find a free bundle! There shouldn't be this many in use!\n");
-        return 0;
+                       if (i > config->cluster_highest_bundleid)
+                               config->cluster_highest_bundleid = i;
+                       return i;
+               }
+       }
+       LOG(0, 0, 0, "MPPP: Can't find a free bundle! There shouldn't be this many in use!\n");
+       return 0;
 }
 
 static void ipcp_open(sessionidt s, tunnelidt t)
@@ -1256,7 +1256,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
        if (session[s].ppp.phase < Network)
        {
-               LOG(2, s, t, "IPCP %s ignored in %s phase\n", ppp_code(*p), ppp_phase(session[s].ppp.phase));
+               LOG(2, s, t, "IPCP %s ignored in %s phase\n", ppp_code(*p), ppp_phase(session[s].ppp.phase));
                return;
        }
 
@@ -1267,13 +1267,13 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                switch (session[s].ppp.ipcp)
                {
                case RequestSent:
-                       initialise_restart_count(s, ipcp);
+                       initialise_restart_count(s, ipcp);
                        change_state(s, ipcp, AckReceived);
                        break;
 
                case AckReceived:
                case Opened:
-                       LOG(2, s, t, "IPCP: ConfigAck in state %s?  Sending ConfigReq\n", ppp_state(session[s].ppp.ipcp));
+                       LOG(2, s, t, "IPCP: ConfigAck in state %s?  Sending ConfigReq\n", ppp_state(session[s].ppp.ipcp));
                        sendipcp(s, t);
                        change_state(s, ipcp, RequestSent);
                        break;
@@ -1283,7 +1283,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                default:
-                       LOG(2, s, t, "IPCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipcp));
+                       LOG(2, s, t, "IPCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipcp));
                }
        }
        else if (*p == ConfigReq)
@@ -1381,7 +1381,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                case Stopped:
-                       initialise_restart_count(s, ipcp);
+                       initialise_restart_count(s, ipcp);
                        sendipcp(s, t);
                        if (*response == ConfigAck)
                                change_state(s, ipcp, AckSent);
@@ -1403,7 +1403,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                case Opened:
-                       initialise_restart_count(s, ipcp);
+                       initialise_restart_count(s, ipcp);
                        sendipcp(s, t);
                        /* fallthrough */
 
@@ -1416,7 +1416,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                default:
-                       LOG(2, s, t, "IPCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipcp));
+                       LOG(2, s, t, "IPCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipcp));
                        return;
                }
 
@@ -1434,15 +1434,15 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                case RequestSent:
                case AckReceived:
                case AckSent:
-                       break;
+                       break;
 
                case Opened:
-                       zero_restart_count(s, ipcp);
+                       zero_restart_count(s, ipcp);
                        change_state(s, ipcp, Closing);
                        break;
 
                default:
-                       LOG(2, s, t, "IPCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipcp));
+                       LOG(2, s, t, "IPCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipcp));
                        return;
                }
 
@@ -1498,7 +1498,7 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
        if (session[s].ppp.phase < Network)
        {
-               LOG(2, s, t, "IPV6CP %s ignored in %s phase\n", ppp_code(*p), ppp_phase(session[s].ppp.phase));
+               LOG(2, s, t, "IPV6CP %s ignored in %s phase\n", ppp_code(*p), ppp_phase(session[s].ppp.phase));
                return;
        }
 
@@ -1515,13 +1515,13 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                switch (session[s].ppp.ipv6cp)
                {
                case RequestSent:
-                       initialise_restart_count(s, ipv6cp);
+                       initialise_restart_count(s, ipv6cp);
                        change_state(s, ipv6cp, AckReceived);
                        break;
 
                case AckReceived:
                case Opened:
-                       LOG(2, s, t, "IPV6CP: ConfigAck in state %s?  Sending ConfigReq\n", ppp_state(session[s].ppp.ipv6cp));
+                       LOG(2, s, t, "IPV6CP: ConfigAck in state %s?  Sending ConfigReq\n", ppp_state(session[s].ppp.ipv6cp));
                        sendipv6cp(s, t);
                        change_state(s, ipv6cp, RequestSent);
                        break;
@@ -1531,7 +1531,7 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                default:
-                       LOG(2, s, t, "IPV6CP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipv6cp));
+                       LOG(2, s, t, "IPV6CP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipv6cp));
                }
        }
        else if (*p == ConfigReq)
@@ -1602,7 +1602,7 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                case Stopped:
-                       initialise_restart_count(s, ipv6cp);
+                       initialise_restart_count(s, ipv6cp);
                        sendipv6cp(s, t);
                        if (*response == ConfigAck)
                                change_state(s, ipv6cp, AckSent);
@@ -1624,7 +1624,7 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                case Opened:
-                       initialise_restart_count(s, ipv6cp);
+                       initialise_restart_count(s, ipv6cp);
                        sendipv6cp(s, t);
                        /* fallthrough */
 
@@ -1637,7 +1637,7 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                default:
-                       LOG(2, s, t, "IPV6CP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipv6cp));
+                       LOG(2, s, t, "IPV6CP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipv6cp));
                        return;
                }
 
@@ -1655,15 +1655,15 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                case RequestSent:
                case AckReceived:
                case AckSent:
-                       break;
+                       break;
 
                case Opened:
-                       zero_restart_count(s, ipv6cp);
+                       zero_restart_count(s, ipv6cp);
                        change_state(s, ipv6cp, Closing);
                        break;
 
                default:
-                       LOG(2, s, t, "IPV6CP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipv6cp));
+                       LOG(2, s, t, "IPV6CP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ipv6cp));
                        return;
                }
 
@@ -1686,11 +1686,11 @@ static void update_sessions_in_stat(sessionidt s, uint16_t l)
        if (!b)
        {
                increment_counter(&session[s].cin, &session[s].cin_wrap, l);
-               session[s].cin_delta += l;
-                       session[s].pin++;
+               session[s].cin_delta += l;
+               session[s].pin++;
 
-               sess_local[s].cin += l;
-               sess_local[s].pin++;
+               sess_local[s].cin += l;
+               sess_local[s].pin++;
        }
        else
        {
@@ -1701,11 +1701,11 @@ static void update_sessions_in_stat(sessionidt s, uint16_t l)
                        l = frag[b].fragment[i].length;
                        s = frag[b].fragment[i].sid;
                        increment_counter(&session[s].cin, &session[s].cin_wrap, l);
-                       session[s].cin_delta += l;
-                               session[s].pin++;
+                       session[s].cin_delta += l;
+                       session[s].pin++;
 
-                       sess_local[s].cin += l;
-                       sess_local[s].pin++;
+                       sess_local[s].cin += l;
+                       sess_local[s].pin++;
                        if (i == end)
                                return;
                        i = (i + 1) & MAXFRAGNUM_MASK;
@@ -1811,58 +1811,58 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 // process Multilink PPP packet received
 void processmpin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 {
-        bundleidt b = session[s].bundle;
+       bundleidt b = session[s].bundle;
        bundlet * this_bundle = &bundle[b];
        uint32_t frag_offset, M_offset;
        uint16_t frag_index, M_index;
        fragmentationt *this_fragmentation = &frag[b];
        uint8_t begin_frame = (*p & MP_BEGIN);
-        uint8_t end_frame = (*p & MP_END);
-        uint32_t seq_num;
+       uint8_t end_frame = (*p & MP_END);
+       uint32_t seq_num;
        uint8_t flags = *p;
        uint16_t begin_index, end_index;
 
        // Perform length checking
-        if(l > MAXFRAGLEN)
-        {
-               LOG(2, s, t, "MPPP: discarding fragment larger than MAXFRAGLEN\n");
-               return;
-        }
-
-        if(!b)
-        {
-                LOG(2, s, t, "MPPP: Invalid bundle id: 0\n");
-                return;
-        }
+       if(l > MAXFRAGLEN)
+       {
+               LOG(2, s, t, "MPPP: discarding fragment larger than MAXFRAGLEN\n");
+               return;
+       }
+
+       if(!b)
+       {
+               LOG(2, s, t, "MPPP: Invalid bundle id: 0\n");
+               return;
+       }
        // FIXME !! session[s].mssf means that the receiver wants to receive frames in mssf not means the receiver will send frames in mssf
-        /* if(session[s].mssf)
-        {
-                // Get 12 bit for seq number
-                seq_num = ntohs((*(uint16_t *) p) & 0xFF0F);
-                p += 2;
-                l -= 2;
-                // After this point the pointer should be advanced 2 bytes
-                LOG(3, s, t, "MPPP: 12 bits, sequence number: %d\n",seq_num);
-        }
-        else */
-        {
-                // Get 24 bit for seq number
-                seq_num = ntohl((*(uint32_t *) p) & 0xFFFFFF00);
-                p += 4;
-                l -= 4;
-                // After this point the pointer should be advanced 4 bytes
-                LOG(4, s, t, "MPPP: 24 bits sequence number:%d\n",seq_num);
-        }
+       /* if(session[s].mssf)
+       {
+               // Get 12 bit for seq number
+               seq_num = ntohs((*(uint16_t *) p) & 0xFF0F);
+               p += 2;
+               l -= 2;
+               // After this point the pointer should be advanced 2 bytes
+               LOG(3, s, t, "MPPP: 12 bits, sequence number: %d\n",seq_num);
+       }
+       else */
+       {
+               // Get 24 bit for seq number
+               seq_num = ntohl((*(uint32_t *) p) & 0xFFFFFF00);
+               p += 4;
+               l -= 4;
+               // After this point the pointer should be advanced 4 bytes
+               LOG(4, s, t, "MPPP: 24 bits sequence number:%d\n",seq_num);
+       }
 
        // calculate this fragment's offset from the begin seq in the bundle
        frag_offset = (seq_num + this_bundle->max_seq - this_fragmentation->start_seq) & (this_bundle->max_seq-1);
 
        // discard this fragment if frag_offset is bigger that the fragmentation buffer size
        if (frag_offset >= MAXFRAGNUM)
-        {
-               LOG(3, s, t, "MPPP: Index out of range, received more than MAXFRAGNUM fragment (lost frag) seq:%d, begin_seq:%d, bundle:%d, max:%d\n",seq_num, this_fragmentation->start_seq, b, this_bundle->max_seq);
-                return;
-        }
+       {
+               LOG(3, s, t, "MPPP: Index out of range, received more than MAXFRAGNUM fragment (lost frag) seq:%d, begin_seq:%d, bundle:%d, max:%d\n",seq_num, this_fragmentation->start_seq, b, this_bundle->max_seq);
+               return;
+       }
        
        // update M
        sess_local[s].last_seq = seq_num;
@@ -1894,7 +1894,7 @@ void processmpin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
        if (begin_frame && end_frame)
        {
                // process and reset fragmentation
-                LOG(4, s, t, "MPPP: Both bits are set (Begin and End).\n");
+               LOG(4, s, t, "MPPP: Both bits are set (Begin and End).\n");
                this_fragmentation->fragment[frag_index].length = l;
                this_fragmentation->fragment[frag_index].sid = s;
                this_fragmentation->fragment[frag_index].flags = flags;
@@ -1914,7 +1914,7 @@ void processmpin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                this_frag->sid = s;
                this_frag->flags = flags;
                this_frag->seq = seq_num;
-                memcpy(this_frag->data, p, l);
+               memcpy(this_frag->data, p, l);
 
                // try to assemble the frame that has the received fragment as a member         
                // get the beginning of this frame
@@ -1946,33 +1946,33 @@ void processmpin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                uint16_t cur_len = 4;   // This is set to 4 to leave 4 bytes for function processipin
                uint32_t i;
 
-                       LOG(4, s, t, "MPPP: processing fragments from %d to %d\n", begin_index, end_index);
-                       // Push to the receive buffer
+               LOG(4, s, t, "MPPP: processing fragments from %d to %d\n", begin_index, end_index);
+               // Push to the receive buffer
                                        
                for (i = begin_index;; i = (i + 1) & MAXFRAGNUM_MASK)
-                {
+               {
                        this_frag = &this_fragmentation->fragment[i];
-                        if(cur_len + this_frag->length > MAXETHER)
-                        {
-                                LOG(2, s, t, "MPPP: discarding reassembled frames larger than MAXETHER\n");                            
-                                break;
-                        }
-                        memcpy(this_fragmentation->reassembled_frame+cur_len, this_frag->data, this_frag->length);
+                       if(cur_len + this_frag->length > MAXETHER)
+                       {
+                               LOG(2, s, t, "MPPP: discarding reassembled frames larger than MAXETHER\n");                             
+                               break;
+                       }
+                       memcpy(this_fragmentation->reassembled_frame+cur_len, this_frag->data, this_frag->length);
                        LOG(5, s, t, "MPPP: processing frame at %d, with len %d\n", i, this_frag->length);
-                        cur_len += this_frag->length;
+                       cur_len += this_frag->length;
                        if (i == end_index)
                        {
                                this_fragmentation->re_frame_len = cur_len;
                                this_fragmentation->re_frame_begin_index = begin_index;
-                               this_fragmentation->re_frame_end_index = end_index;
-                               // Process the resassembled frame
-                               LOG(5, s, t, "MPPP: Process the reassembled frame, len=%d\n",cur_len);
-                               processmpframe(s, t, this_fragmentation->reassembled_frame, this_fragmentation->re_frame_len, 1);
+                               this_fragmentation->re_frame_end_index = end_index;
+                               // Process the resassembled frame
+                               LOG(5, s, t, "MPPP: Process the reassembled frame, len=%d\n",cur_len);
+                               processmpframe(s, t, this_fragmentation->reassembled_frame, this_fragmentation->re_frame_len, 1);
                                break;
                        }
-                }
-                // Set reassembled frame length to zero after processing it
-                this_fragmentation->re_frame_len = 0;
+               }
+               // Set reassembled frame length to zero after processing it
+               this_fragmentation->re_frame_len = 0;
                for (i = begin_index;; i = (i + 1) & MAXFRAGNUM_MASK)
                {
                        this_fragmentation->fragment[i].length = 0;      // Indicates that this fragment has been consumed
@@ -1984,14 +1984,14 @@ void processmpin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
        //discard fragments received before the recently assembled frame
        begin_index = this_fragmentation->start_index;
        this_fragmentation->start_index = (end_index + 1) & MAXFRAGNUM_MASK;
-        this_fragmentation->start_seq = (this_fragmentation->fragment[end_index].seq + 1) & (this_bundle->max_seq-1);
+       this_fragmentation->start_seq = (this_fragmentation->fragment[end_index].seq + 1) & (this_bundle->max_seq-1);
        //clear length and flags of the discarded fragments
        while (begin_index != this_fragmentation->start_index)
-        {
-                this_fragmentation->fragment[begin_index].flags = 0;
+       {
+               this_fragmentation->fragment[begin_index].flags = 0;
                this_fragmentation->fragment[begin_index].length = 0;
-                begin_index = (begin_index + 1) & MAXFRAGNUM_MASK;
-        }
+               begin_index = (begin_index + 1) & MAXFRAGNUM_MASK;
+       }
 
        LOG(4, s, t, "MPPP after assembling: M index is =%d, start index is = %d, start seq=%d\n",M_index, this_fragmentation->start_index, this_fragmentation->start_seq);     
        return;
@@ -2141,7 +2141,7 @@ void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
        if (session[s].ppp.phase < Network)
        {
-               LOG(2, s, t, "CCP %s ignored in %s phase\n", ppp_code(*p), ppp_phase(session[s].ppp.phase));
+               LOG(2, s, t, "CCP %s ignored in %s phase\n", ppp_code(*p), ppp_phase(session[s].ppp.phase));
                return;
        }
 
@@ -2157,13 +2157,13 @@ void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                switch (session[s].ppp.ccp)
                {
                case RequestSent:
-                       initialise_restart_count(s, ccp);
+                       initialise_restart_count(s, ccp);
                        change_state(s, ccp, AckReceived);
                        break;
 
                case AckReceived:
                case Opened:
-                       LOG(2, s, t, "CCP: ConfigAck in state %s?  Sending ConfigReq\n", ppp_state(session[s].ppp.ccp));
+                       LOG(2, s, t, "CCP: ConfigAck in state %s?  Sending ConfigReq\n", ppp_state(session[s].ppp.ccp));
                        sendccp(s, t);
                        change_state(s, ccp, RequestSent);
                        break;
@@ -2174,7 +2174,7 @@ void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                default:
-                       LOG(2, s, t, "CCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ccp));
+                       LOG(2, s, t, "CCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ccp));
                }
        }
        else if (*p == ConfigReq)
@@ -2197,7 +2197,7 @@ void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                case Stopped:
-                       initialise_restart_count(s, ccp);
+                       initialise_restart_count(s, ccp);
                        sendccp(s, t);
                        if (*q == ConfigAck)
                                change_state(s, ccp, AckSent);
@@ -2219,7 +2219,7 @@ void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                case Opened:
-                       initialise_restart_count(s, ccp);
+                       initialise_restart_count(s, ccp);
                        sendccp(s, t);
                        /* fallthrough */
 
@@ -2232,7 +2232,7 @@ void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        break;
 
                default:
-                       LOG(2, s, t, "CCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ccp));
+                       LOG(2, s, t, "CCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.ccp));
                        return;
                }
 
@@ -2418,10 +2418,10 @@ void sendlcp(sessionidt s, tunnelidt t)
        uint8_t b[500], *q, *l;
        int authtype = sess_local[s].lcp_authtype;
 
-        if (!(q = makeppp(b, sizeof(b), NULL, 0, s, t, PPPLCP, 0, 0, 0)))
+       if (!(q = makeppp(b, sizeof(b), NULL, 0, s, t, PPPLCP, 0, 0, 0)))
                return;
 
-        LOG(3, s, t, "LCP: send ConfigReq%s%s%s including MP options\n",
+       LOG(3, s, t, "LCP: send ConfigReq%s%s%s including MP options\n",
            authtype ? " (" : "",
            authtype ? (authtype == AUTHCHAP ? "CHAP" : "PAP") : "",
            authtype ? ")" : "");
@@ -2448,14 +2448,14 @@ void sendlcp(sessionidt s, tunnelidt t)
                l += 4;
        }
 
-        if (sess_local[s].mp_mrru)
-        {
+       if (sess_local[s].mp_mrru)
+       {
                *l++ = 17; *l++ = 4; // Multilink Max-Receive-Reconstructed-Unit (length 4)
                *(uint16_t *) l = htons(sess_local[s].mp_mrru); l += 2;
        }
 
-        if (sess_local[s].mp_epdis)
-        {
+       if (sess_local[s].mp_epdis)
+       {
                *l++ = 19; *l++ = 7;    // Multilink Endpoint Discriminator (length 7)
                *l++ = IPADDR;  // Endpoint Discriminator class
                *(uint32_t *) l = htonl(sess_local[s].mp_epdis);

diff --git a/radius.c b/radius.c
index 4e67e63..faf1791 100644 (file)
--- a/radius.c
+++ b/radius.c
@@ -348,7 +348,7 @@ void radiussend(uint16_t r, uint8_t state)
 
                                if (state == RADIUSSTOP && radius[r].term_cause)
                                {
-                                       *p = 49; // acct-terminate-cause
+                                       *p = 49; // acct-terminate-cause
                                        p[1] = 6;
                                        *(uint32_t *) (p + 2) = htonl(radius[r].term_cause);
                                        p += p[1];
@@ -379,12 +379,12 @@ void radiussend(uint16_t r, uint8_t state)
                *(uint32_t *) (p + 2) = htonl(s);
                p += p[1];
 
-               *p = 6;         // Service-Type
+               *p = 6;         // Service-Type
                p[1] = 6;
                *(uint32_t *) (p + 2) = htonl((state == RADIUSJUSTAUTH ? 8 : 2)); // Authenticate only or Framed-User respectevily
                p += p[1];
                   
-               *p = 7;         // Framed-Protocol
+               *p = 7;         // Framed-Protocol
                p[1] = htonl((state == RADIUSJUSTAUTH ? 0 : 6));
                *(uint32_t *) (p + 2) = htonl((state == RADIUSJUSTAUTH ? 0 : 1)); // PPP
                p += p[1];
@@ -486,7 +486,7 @@ static void handle_avpair(sessionidt s, uint8_t *avp, int len)
        }
        else
        {
-               value = tmp;
+               value = tmp;
                len = 0;
        }
 
@@ -646,7 +646,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                                else if (vendor == 529 && attrib >= 135 && attrib <= 136) // Ascend
                                                {
                                                        // handle old-format ascend DNS attributes below
-                                                       p += 6;
+                                                       p += 6;
                                                }
                                                else
                                                {
@@ -658,7 +658,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                        if (*p == 8)
                                        {
                                                // Framed-IP-Address
-                                               if (p[1] < 6) continue;
+                                               if (p[1] < 6) continue;
                                                session[s].ip = ntohl(*(uint32_t *) (p + 2));
                                                session[s].ip_pool_index = -1;
                                                LOG(3, s, session[s].tunnel, "   Radius reply contains IP address %s\n",
@@ -670,7 +670,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                        else if (*p == 135)
                                        {
                                                // DNS address
-                                               if (p[1] < 6) continue;
+                                               if (p[1] < 6) continue;
                                                session[s].dns1 = ntohl(*(uint32_t *) (p + 2));
                                                LOG(3, s, session[s].tunnel, "   Radius reply contains primary DNS address %s\n",
                                                        fmtaddr(htonl(session[s].dns1), 0));
@@ -678,7 +678,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                        else if (*p == 136)
                                        {
                                                // DNS address
-                                               if (p[1] < 6) continue;
+                                               if (p[1] < 6) continue;
                                                session[s].dns2 = ntohl(*(uint32_t *) (p + 2));
                                                LOG(3, s, session[s].tunnel, "   Radius reply contains secondary DNS address %s\n",
                                                        fmtaddr(htonl(session[s].dns2), 0));
@@ -732,8 +732,8 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                        }
                                        else if (*p == 11)
                                        {
-                                               // Filter-Id
-                                               char *filter = (char *) p + 2;
+                                               // Filter-Id
+                                               char *filter = (char *) p + 2;
                                                int l = p[1] - 2;
                                                char *suffix;
                                                int f;
@@ -769,17 +769,17 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                        }
                                        else if (*p == 27)
                                        {
-                                               // Session-Timeout
-                                               if (p[1] < 6) continue;
+                                               // Session-Timeout
+                                               if (p[1] < 6) continue;
                                                session[s].session_timeout = ntohl(*(uint32_t *)(p + 2));
                                                LOG(3, s, session[s].tunnel, "   Radius reply contains Session-Timeout = %u\n", session[s].session_timeout);
                                                if(!session[s].session_timeout && config->kill_timedout_sessions)
-                                                        sessionshutdown(s, "Session timeout is zero", CDN_ADMIN_DISC, 0);
+                                                       sessionshutdown(s, "Session timeout is zero", CDN_ADMIN_DISC, 0);
                                        }
                                        else if (*p == 28)
                                        {
-                                               // Idle-Timeout
-                                               if (p[1] < 6) continue;
+                                               // Idle-Timeout
+                                               if (p[1] < 6) continue;
                                                session[s].idle_timeout = ntohl(*(uint32_t *)(p + 2));
                                                LOG(3, s, session[s].tunnel, "   Radius reply contains Idle-Timeout = %u\n", session[s].idle_timeout);
                                        }
@@ -1094,7 +1094,7 @@ void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen, struc
        case CoARequest: // Change of Authorization
                if (error)
                {
-                       r_code = CoANAK;
+                       r_code = CoANAK;
                        break;
                }