Bug 709915 - Change name of RIL socket from rilb2g to rilproxy. r=cjones

ipc/ril/Ril.cpp

@@ -70,6 +70,10 @@
 using namespace base;
 using namespace std;
 
+// Network port to connect to for adb forwarded sockets when doing
+// desktop development.
+const uint32_t RIL_TEST_PORT = 6200;
+
 namespace mozilla {
 namespace ipc {
 
@@ -83,6 +87,7 @@ struct RilClient : public RefCounted<RilClient>,
                 , mMutex("RilClient.mMutex")
                 , mBlockedOnWrite(false)
                 , mCurrentRilRawData(NULL)
+                , mIOLoop(MessageLoopForIO::current())
     { }
     virtual ~RilClient() { }
 
@@ -110,6 +115,17 @@ static RefPtr<RilConsumer> sConsumer;
 // This code runs on the IO thread.
 //
 
+class RilReconnectTask : public Task {
+    virtual void Run();
+};
+
+void RilReconnectTask::Run() {
+    if (sClient->OpenSocket()) {
+        return;
+    }
+    sClient->mIOLoop->PostDelayedTask(FROM_HERE, new RilReconnectTask(), 1000);
+}
+
 class RilWriteTask : public Task {
     virtual void Run();
 };
@@ -124,10 +140,8 @@ ConnectToRil(Monitor* aMonitor, bool* aSuccess)
     MOZ_ASSERT(!sClient);
 
     sClient = new RilClient();
-    if (!(*aSuccess = sClient->OpenSocket())) {
-        sClient = nsnull;
-    }
-
+    sClient->mIOLoop->PostTask(FROM_HERE, new RilReconnectTask());
+    *aSuccess = true;
     {
         MonitorAutoLock lock(*aMonitor);
         lock.Notify();
@@ -156,11 +170,11 @@ RilClient::OpenSocket()
     socklen_t alen;
 
     hp = gethostbyname("localhost");
-    if (hp == 0) return -1;
+    if (hp == 0) return false;
 
     memset(&addr, 0, sizeof(addr));
     addr.sin_family = hp->h_addrtype;
-    addr.sin_port = htons(6200);
+    addr.sin_port = htons(RIL_TEST_PORT);
     memcpy(&addr.sin_addr, hp->h_addr, hp->h_length);
     mSocket.mFd = socket(hp->h_addrtype, SOCK_STREAM, 0);
     alen = sizeof(addr);
@@ -168,7 +182,7 @@ RilClient::OpenSocket()
 
     if (mSocket.mFd < 0) {
         LOG("Cannot create socket for RIL!\n");
-        return -1;
+        return false;
     }
 
     if (connect(mSocket.mFd, (struct sockaddr *) &addr, alen) < 0) {
@@ -176,7 +190,6 @@ RilClient::OpenSocket()
         close(mSocket.mFd);
         return false;
     }
-    LOG("Socket open for RIL\n");
 
     // Set close-on-exec bit.
     int flags = fcntl(mSocket.mFd, F_GETFD);
@@ -193,7 +206,6 @@ RilClient::OpenSocket()
     if (-1 == fcntl(mSocket.mFd, F_SETFL, O_NONBLOCK)) {
         return false;
     }
-    mIOLoop = MessageLoopForIO::current();
     if (!mIOLoop->WatchFileDescriptor(mSocket.mFd,
                                       true,
                                       MessageLoopForIO::WATCH_READ,
@@ -201,6 +213,7 @@ RilClient::OpenSocket()
                                       this)) {
         return false;
     }
+    LOG("Socket open for RIL\n");
     return true;
 }
 
@@ -223,6 +236,13 @@ RilClient::OnFileCanReadWithoutBlocking(int fd)
             int ret = read(fd, mIncoming->mData, 1024);
             if (ret <= 0) {
                 LOG("Cannot read from network, error %d\n", ret);
+                // At this point, assume that we can't actually access
+                // the socket anymore, and start a reconnect loop.
+                mIncoming.forget();
+                mReadWatcher.StopWatchingFileDescriptor();
+                mWriteWatcher.StopWatchingFileDescriptor();
+                close(mSocket.mFd);
+                mIOLoop->PostTask(FROM_HERE, new RilReconnectTask());
                 return;
             }
             mIncoming->mSize = ret;