• Patch: Elm ME+ 2.5 PLalpha54 -> Elm ME+ 2.5 PLalpha60 [6/13] (4/5)

    From Kari Hurtta@21:1/5 to All on Thu Nov 24 20:27:31 2022
    [continued from previous message]

    enum connect_result r = connect_none;
    char * addrstring = NULL;

    ! if (cur_socket != -1) {
    !
    ! DPRINT(Debug,12,(&Debug,
    ! "connect_remote_account: %d: closing socket (%d)\n",
    ! idx,
    ! cur_socket));
    !
    ! close(cur_socket);
    ! cur_socket = -1;
    ! }

    if (bglist)
    ! r = bgconnect_got_connection(bglist,ra,&cur_socket,got,&last_error,bgcan,
    bgwait_space_or_completed,&addrstring,
    &connect_mode_addrdelay,0,NULL);

    --- 4571,4581 ----
    enum connect_result r = connect_none;
    char * addrstring = NULL;

    ! connect_socket_reset(&cur_socket,idx);

    if (bglist)
    ! r = bgconnect_got_connection(bglist,ra,&cur_socket,got,NULL /* service type */,
    ! &last_error,bgcan,
    bgwait_space_or_completed,&addrstring,
    &connect_mode_addrdelay,0,NULL);

    ***************
    *** 3554,3578 ****
    idx,se->addr_count));

    /* Copy all information */
    !
    ! if (!se->addr_list[idx].address.dummy) {
    ! DPRINT(Debug,12,(&Debug,
    ! "connect_remote_account: %d: No address\n",idx));
    ! continue;
    ! }
    !
    ! if (! ra_set_address_from_se_address(ra,& (se->addr_list[idx]),
    ! se->official_name)) {
    ! DPRINT(Debug,12,(&Debug,
    ! "connect_remote_account: %d: bad address\n",idx));
    continue;
    ! }
    !
    ! if (! ra->hostaddr.sa)
    ! panic("CONNECTION PANIC",__FILE__,__LINE__,
    ! "connect_remote_account",
    ! "No address"