Fix up ifdefs so that we can build both sockets based version and

older tty version at the same time. We use that older version outside
the testbed.