From: Guus Sliepen Date: Fri, 26 Jul 2013 13:48:52 +0000 (+0200) Subject: Defer handling netname conflicts when accepting an invitation. X-Git-Tag: release-1.1pre8~11 X-Git-Url: https://www.tinc-vpn.org/git/browse?a=commitdiff_plain;h=a1f4f14c6c5e269c901e6e019418fb8f789cf96b;hp=a1f4f14c6c5e269c901e6e019418fb8f789cf96b;p=tinc Defer handling netname conflicts when accepting an invitation. In case no explicit netname of configuration directory is specified when accepting an invitation, the netname specified in the invitation data is used. However, this new netname is only known after making the connection to the server. If the new netname conflicts with an existing one at the client, we ask the user for a netname that doesn't conflict. However, we should first finish accepting the invitation, so we don't run into the problem that the server times out and cancels the invitation. So, we create a random netname and store the files there, and only after we finish accepting the invitation we ask the user for a better netname, and then just rename the temporary directory to the final name. ---