Let me make sure I have this right, you setup is as follows:
Clients/switch ------P1 ----Xserver ---- P2 ---- ADSL--->Internet
I have a similar situation in my office using Linux. This turn the Xserver into a firewall. But to get it to work properly you need to have a different IP address...