Diff: ip6/udptcp6.c

Revision:

172:9bc3c7b2cca1

Parent:

138:5ff0c7069300

--- a/ip6/udptcp6.c	Sat Dec 12 20:10:02 2020 +0000
+++ b/ip6/udptcp6.c	Wed Dec 16 17:33:22 2020 +0000
@@ -33,7 +33,7 @@
 {    
     if (!action) return;
     
-      Ip6AddressFromDest (ActionGetDestPart(action), pDstIp);
+      Ip6AddrFromDest    (ActionGetDestPart(action), pDstIp);
     SlaacAddressFromScope(scope,                     pSrcIp);
         
     switch (pro)
@@ -79,9 +79,9 @@
     tracePacketProtocol = TCP;
     calculatedChecksum = calculateChecksum(TCP, pSrcIp, pDstIp, sizeRx, pPacketRx);
     
-    int action = TcpHandleReceivedPacket(trace, sizeRx, pPacketRx, pSizeTx, pPacketTx, IPV6, remArIndex, scope);
+    int action = TcpHandleReceivedPacket(trace, sizeRx, pPacketRx, pSizeTx, pPacketTx, ETH_IPV6, remArIndex, scope);
     
-    Ip6AddressCopy(pDstIp, pSrcIp);
+    Ip6AddrCopy(pDstIp, pSrcIp);
     
     finalisePacket(TCP, action, scope, pPacketTx, *pSizeTx, pSrcIp, pDstIp);
         
@@ -96,7 +96,7 @@
         
     int action = UdpHandleReceivedPacket(trace, sizeRx, pPacketRx, pSizeTx, pPacketTx);
         
-    Ip6AddressCopy(pDstIp, pSrcIp);
+    Ip6AddrCopy(pDstIp, pSrcIp);
     
     finalisePacket(UDP, action, scope, pPacketTx, *pSizeTx, pSrcIp, pDstIp);
         
@@ -105,8 +105,8 @@
 int Tcp6PollForPacketToSend(void* pPacket, int* pSize, char* pSrcIp, char* pDstIp)
 {
     int remArIndex = -1;
-    int locIpScope = SCOPE_LOCAL;
-    int action = TcpPollForPacketToSend(pSize, pPacket, IPV6, &remArIndex, &locIpScope);
+    int locIpScope = SCOPE_LINK_LOCAL;
+    int action = TcpPollForPacketToSend(pSize, pPacket, ETH_IPV6, &remArIndex, &locIpScope);
     if (action && remArIndex >= 0) Ar6IndexToIp(remArIndex, pDstIp);
     
 
@@ -117,9 +117,9 @@
 }
 int Udp6PollForPacketToSend(void* pPacket, int* pSize, char* pSrcIp, char* pDstIp)
 {        
-    int action = UdpPollForPacketToSend(IPV6, pSize, pPacket);
+    int action = UdpPollForPacketToSend(ETH_IPV6, pSize, pPacket);
     
-    int scope = SCOPE_LOCAL;
+    int scope = SCOPE_LINK_LOCAL;
 
     finalisePacket(UDP, action, scope, pPacket, *pSize, pSrcIp, pDstIp);