r9548: Select connection-spec based on connection type