FCL/sf/os/ossrv: comparison genericopenlibs/openenvcore/backend/src/syscall/handlenms.cpp

equal deleted inserted replaced

-:09fa7c3c5079
+:a117ad66e027
 			return MapError(err, *aErrno);
 			}
 		}
 	RHostResolver hr;
-	/* Get the default RConnection instance and use it if configured.
+	/* Get the default RConnection instance and use it */
-	   NOTE: This RConnection, if configured, would be created using the
-	   socket server on backend. The same server has to be used here */
 	RConnection& defConnection = Backend()->GetDefaultConnection();
 	if(defConnection.SubSessionHandle() != 0)
 	    {
 	    err = hr.Open(ss, AF_INET, IPPROTO_UDP,defConnection);
 	    }
 	else
 	    {
-		err = hr.Open(ss, AF_INET, IPPROTO_UDP);
+		err = ECONNABORTED;
 	    }
 	if (err == KErrNone)
 		{
 		TBuf<128> hostname;
 				{
 				err = ENAMETOOLONG;
 				}
 			}
-		}
 		hr.Close();
+		}
 	return MapError(err, *aErrno);
 	}
 EXPORT_C int _getprotobyname_r(int* aErrno, const char* name, TProtocolDesc* pProtoInf)
 	{
 }
 	if (err == KErrNone)
 		{
 		RHostResolver r;
-		/* Get the default RConnection instance and use it if configured.
+		/* Get the default RConnection instance and use it */
-		   NOTE: This RConnection, if configured, would be created using the
-		   socket server on backend. The same server has to be used here */
 		RConnection& defConnection = Backend()->GetDefaultConnection();
 		if(defConnection.SubSessionHandle() != 0)
 		    {
 			err=r.Open(ss, format, IPPROTO_UDP, defConnection);
 		    }
 		else
 		    {
-			err=r.Open(ss, format, IPPROTO_UDP);
+err = -ECONNABORTED; // needs to be negative for logic below to return NO_RECOVERY to caller
 		    }
 		if (err == KErrNone)
 			{
 			struct sockaddr buf;
 break;
 }
 }
 err = r.Next(entry);
 }
+if (err == -5121) // KErrDndAddrNotFound, equivalent to a KErrNotFound?
+{
+err = HOST_NOT_FOUND;
+}
 }
 		             if (err == KErrNone)
 		                {
 		                record = entry();
 		                retval = mapNameRecord(rp, record, length, format);
 			return retval;
 			}
 		}
 RHostResolver r;
-/* Get the default RConnection instance and use it if configured.
+/* Get the default RConnection instance and use it */
-NOTE: This RConnection, if configured, would be created using the
-socket server on backend. The same server has to be used here */
 RConnection& defConnection = Backend()->GetDefaultConnection();
 if (defConnection.SubSessionHandle() != 0)
 {
 err = r.Open(ss, AF_INET, IPPROTO_UDP, defConnection);
 }
 else
 {
-err = r.Open(ss, AF_INET, IPPROTO_UDP);
+err = -ECONNABORTED; // needs to be negative for logic below to return NO_RECOVERY to caller
 }
 if (err == KErrNone)
 {
 TNameRecord record;
 if (addr.Family() == KAfInet)
 {
 break;
 }
-if (addr.Family() == KAfInet6 && (addr.IsV4Compat() || addr.IsV4Mapped()))
+if (addr.Family() == KAfInet6 && addr.IsV4Mapped())
 {
 addr.ConvertToV4();
 entry().iAddr = addr;
 break;
 }
 }
 err = r.Next(entry);
+}
+if (err == -5120) // KErrDndNameNotFound, equivalent to a KErrNotFound
+{
+err = HOST_NOT_FOUND;
 }
 }
 if (err == KErrNone)
 {
 		return -1;
 		}
 	return 0;
 	}
+EXPORT_C int _unsetdefaultif_r(int* /*aErrno*/)
+{
+return Backend()->unsetdefaultif(EFalse);
+}
 /*
 * Helper function to create an addrinfo node and fill it.
 * @param	aRec		 	The name details to be used to fill the addrinfo node
 * @param	aHints			The hints to be used
 			}
 		}
 	//Open the host resolver
 	RHostResolver resolver;
-	/* Get the default RConnection instance and use it if configured.
+	/* Get the default RConnection instance and use it */
-	   NOTE: This RConnection, if configured, would be created using the
-	   socket server on backend. The same server has to be used here */
 	RConnection& defConnection = Backend()->GetDefaultConnection();
-	if(defConnection.SubSessionHandle() != 0)
+	if (defConnection.SubSessionHandle() != 0)
+	    {
 		err = resolver.Open(sockServ, KAfInet, KProtocolInetUdp, defConnection);
+	    }
 	else
-		err = resolver.Open(sockServ, KAfInet, KProtocolInetUdp);
+	    {
+err = ECONNABORTED;
+	    }
 	if (err != KErrNone)
 		{
 		MapError(err, *aErrno);
 		return EAI_SYSTEM;
 		}
 	//Create a list of addrinfo nodes from the result
 	*aRes = NULL;
 	struct addrinfo** curr = aRes;
-	  do
+	do
-	        {
+{
-	        nameRec = nameEntry();
+nameRec = nameEntry();
-	        TInetAddr inetAddr(nameRec.iAddr);
+TInetAddr inetAddr(nameRec.iAddr);
-	        //Create the node if the address is valid, and the family matches that of hints
-	        if(!inetAddr.IsUnspecified())
-	            {
+//Create the node if the address is valid, and the family matches that of hints
-	            if (inetAddr.Family() == KAfInet)
+if (!inetAddr.IsUnspecified())
-	                {
+{
-	                err = CreateAddrInfoNode(nameRec, aHints, curr);
+if (inetAddr.Family() == KAfInet)
-	                }
+{
-	            else if (inetAddr.Family() == KAfInet6)
+err = CreateAddrInfoNode(nameRec, aHints, curr);
-	                {
+if (err != 0)
-	                err = CreateAddrInfoNode(nameRec, aHints, curr);
+{
-	                if (err != 0)
+break;
-	                    break;
+}
-	                curr = &((*curr)->ai_next);
+curr = &((*curr)->ai_next);
-	                if (inetAddr.IsV4Mapped())
-	                    {
+inetAddr.ConvertToV4Mapped();
-	                    inetAddr.ConvertToV4();
+nameRec.iAddr = inetAddr;
-	                    nameRec.iAddr = inetAddr;
-	                    err = CreateAddrInfoNode(nameRec, aHints, curr);
+err = CreateAddrInfoNode(nameRec, aHints, curr);
+if (err != 0)
-	                    if(err != 0)
+{
-	                        break;
+break;
+}
-	                    if (err == 0)
-	                        {
+(*curr)->ai_flags |= AI_V4MAPPED;
-	                        (*curr)->ai_flags |= AI_V4MAPPED;
+curr = &((*curr)->ai_next);
-	                        curr = &((*curr)->ai_next);
+}
-	                        }
+else if (inetAddr.Family() == KAfInet6)
-	                    }
+{
-	                }
+err = CreateAddrInfoNode(nameRec, aHints, curr);
-	            }
+if (err != 0)
-	        err = resolver.Next(nameEntry); //Get the next record
+{
-	        if(err != KErrNone)
+break;
-	            {//No more records. Not an error, just stop iterating
+}
-	            err = KErrNone;
-	            break;
+curr = &((*curr)->ai_next);
-	            }
+if (inetAddr.IsV4Mapped())
-	        } while(err == KErrNone);
+{
+inetAddr.ConvertToV4();
+nameRec.iAddr = inetAddr;
+err = CreateAddrInfoNode(nameRec, aHints, curr);
+if (err != 0)
+{
+break;
+}
+(*curr)->ai_flags |= AI_V4CONVERTED;
+curr = &((*curr)->ai_next);
+}
+}
+}
+err = resolver.Next(nameEntry); //Get the next record
+if (err != KErrNone)
+{//No more records. Not an error, just stop iterating
+err = KErrNone;
+break;
+}
+} while(err == KErrNone);
 	//If no nodes are created even when the operation is succes, it's an error
 	if(err == 0 && *aRes == NULL)
 		err = -1;
 		*aRes = NULL;
 		}
 	if(err != 0 && err != EAI_MEMORY)
 err = EAI_FAIL;
 	resolver.Close();
 	return err;
 	}
 /*
 * Frees the addrinfo structure created in backend

changeset 63	a117ad66e027
parent 52	bf6a71c50e42
child 56	acd3cd4aaceb